Skip to content

Commit ef3ca16

Browse files
committed
Merge pull request #2 from mtaborda/development
Merge from development into master
2 parents 2bbdd28 + 245e777 commit ef3ca16

23 files changed

+56
-82
lines changed

README.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -250,12 +250,17 @@ At the time we wrote this model, there were no implementation that we liked. The
250250
##What I need to use Chaltén?
251251
Download a fresh Pharo image (http://www.pharo.org) and in a workspace do-it this:
252252

253+
#In a 4.x image
253254
Metacello new
254-
configuration: 'Chalten';
255-
githubUser: 'mtaborda' project: 'chalten' commitish: 'master' path: 'repository';
255+
baseline: 'Chalten';
256+
githubUser: 'mtaborda' project: 'chalten' commitish: 'v4.1.0' path: 'repository';
256257
load
257258

258-
Or just install stable version from the configuration browser.
259+
#In a 5.x image
260+
Metacello new
261+
baseline: 'Chalten';
262+
githubUser: 'mtaborda' project: 'chalten' commitish: 'v5.0.0' path: 'repository';
263+
load
259264

260265
##Why is it called Chaltén?
261266
El Chaltén (http://www.elchalten.com/) is a village settled inside National Park Los Glaciares, in the heart of the patagonic southern mountains, at the foot of mythical Mt. Fitz Roy.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This class is used to load Chalten from github repository
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
baselines - private
2+
aconcagua: spec for: distribution
3+
4+
spec
5+
baseline: #Aconcagua
6+
with: [ spec
7+
loads: #(#Core);
8+
repository: ((repositories at: distribution) at: #aconcagua) ]

repository/BaselineOfChalten.package/BaselineOfChalten.class/instance/baseline..st

+11-5
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,20 @@ baseline: spec
33
<baseline>
44

55
spec for: #common do: [
6-
spec baseline: 'Aconcagua' with: [
7-
spec
8-
loads: #('Core');
9-
repository: 'github://mtaborda/aconcagua:master/repository' ].
6+
spec blessing: #baseline.
107
spec
118
package: 'Chalten-Core' with: [ spec requires: 'Aconcagua' ];
129
package: 'Chalten-Tests' with: [ spec requires: 'Chalten-Core' ].
1310
spec
1411
group: 'default' with: #('Core' 'Tests');
1512
group: 'Core' with: #('Chalten-Core');
16-
group: 'Tests' with: #('Chalten-Tests') ]
13+
group: 'Tests' with: #('Chalten-Tests').
14+
spec postLoadDoIt: #postLoadInitialization ].
15+
16+
spec for: #'pharo4.x' do: [
17+
spec repository: ((repositories at: #pharo40) at: #chalten).
18+
self aconcagua: spec for: #pharo40 ].
19+
20+
spec for: #'pharo5.x' do: [
21+
spec repository: ((repositories at: #pharo50) at: #chalten).
22+
self aconcagua: spec for: #pharo50 ]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
initialize - release
2+
initialize
3+
4+
super initialize.
5+
self initializeRepositories
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
initialize - release
2+
initializeRepositories
3+
4+
repositories := Dictionary new.
5+
repositories at: #pharo40 put: Dictionary new.
6+
(repositories at: #pharo40)
7+
at: #aconcagua put: #'github://mtaborda/aconcagua:v4.1.0/repository';
8+
at: #chalten put: #'github://mtaborda/chalten:v4.1.0/repository'.
9+
repositories at: #pharo50 put: Dictionary new.
10+
(repositories at: #pharo50)
11+
at: #aconcagua put: #'github://mtaborda/aconcagua:v5.0.0/repository';
12+
at: #chalten put: #'github://mtaborda/chalten:v5.0.0/repository'
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
initialize-release
1+
post load
22
postLoadInitialization
33

44
ChaltenEnvironmentBehavior initializeAfterLoad.
55
TimeUnitsGlobals initializeAfterLoad.
6-
CalendarDefinition allSubclassesDo: [ :each | each subclasses isEmpty
7-
ifTrue: [ each initializeAfterLoad ]].
6+
CalendarDefinition allSubclassesDo: [ :each | each subclasses
7+
ifEmpty: [ each initializeAfterLoad ]].
88
TimeOfDay initializeAfterLoad.
99
TimeZonesGlobals initializeAfterLoad

repository/BaselineOfChalten.package/BaselineOfChalten.class/methodProperties.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@
22
"class" : {
33
},
44
"instance" : {
5-
"baseline:" : "MaximilianoTaborda 5/13/2015 16:37" } }
5+
"aconcagua:for:" : "MaximilianoTaborda 11/6/2015 13:06",
6+
"baseline:" : "MaximilianoTaborda 11/6/2015 13:07",
7+
"initialize" : "MaximilianoTaborda 11/6/2015 12:59",
8+
"initializeRepositories" : "MaximilianoTaborda 5/28/2016 19:06",
9+
"postLoadInitialization" : "MaximilianoTaborda 11/6/2015 12:39" } }

repository/BaselineOfChalten.package/BaselineOfChalten.class/properties.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
],
55
"classvars" : [
66
],
7-
"commentStamp" : "",
7+
"commentStamp" : "MaximilianoTaborda 11/6/2015 13:09",
88
"instvars" : [
9-
],
9+
"repositories" ],
1010
"name" : "BaselineOfChalten",
1111
"pools" : [
1212
],
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
(name 'BaselineOfChalten-MaximilianoTaborda.4.0.1' message 'deleted old baselines' id '048bc477-189e-42e7-b923-3d2ed1571c5b' date '13 May 2015' time '10:51:33.319668 pm' author 'MaximilianoTaborda' ancestors ((name 'BaselineOfChalten-MaximilianoTaborda.4.0.0' message 'rename src to repository because that is the convention' id '6a35f5ff-478c-47e7-ba54-dbfe12f6e3bc' date '30 April 2015' time '10:32:32.615031 am' author 'MaximilianoTaborda' ancestors () stepChildren ())) stepChildren ())
1+
(name 'BaselineOfChalten-MaximilianoTaborda.5.0.0' message 'tag for pharo 5.x' id '4e4610d0-d994-45e8-ad81-963920b0d166' date '28 May 2016' time '7:09:06.331599 pm' author 'MaximilianoTaborda' ancestors ((name 'BaselineOfChalten-MaximilianoTaborda.5.0.0' message 'Baseline for pharo5.x images' id '56cff05b-ff72-43b0-92d6-68342dd7173a' date '6 November 2015' time '1:47:26.839122 pm' author 'MaximilianoTaborda' ancestors () stepChildren ())) stepChildren ())

repository/ConfigurationOfChalten.package/.filetree

-4
This file was deleted.

repository/ConfigurationOfChalten.package/ConfigurationOfChalten.class/README.md

-7
This file was deleted.

repository/ConfigurationOfChalten.package/ConfigurationOfChalten.class/instance/bleedingEdge..st

-5
This file was deleted.

repository/ConfigurationOfChalten.package/ConfigurationOfChalten.class/instance/development..st

-5
This file was deleted.

repository/ConfigurationOfChalten.package/ConfigurationOfChalten.class/instance/stable..st

-5
This file was deleted.

repository/ConfigurationOfChalten.package/ConfigurationOfChalten.class/instance/version400..st

-13
This file was deleted.

repository/ConfigurationOfChalten.package/ConfigurationOfChalten.class/methodProperties.json

-9
This file was deleted.

repository/ConfigurationOfChalten.package/ConfigurationOfChalten.class/properties.json

-14
This file was deleted.

repository/ConfigurationOfChalten.package/monticello.meta/categories.st

-1
This file was deleted.

repository/ConfigurationOfChalten.package/monticello.meta/initializers.st

Whitespace-only changes.

repository/ConfigurationOfChalten.package/monticello.meta/package

-1
This file was deleted.

repository/ConfigurationOfChalten.package/monticello.meta/version

-1
This file was deleted.

repository/ConfigurationOfChalten.package/properties.json

-2
This file was deleted.

0 commit comments

Comments
 (0)