pick up Issue #66 changes on dev branch

GsDevKit · Mar 9, 2015 · 4deb7e2 · 4deb7e2
2 parents 0502d2a + 1781dda
commit 4deb7e2
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/pharo/todeLoad.st b/pharo/todeLoad.st
@@ -1,15 +1,21 @@
 [ 
   "Master pharo todeLoad.st"
-  | gs_home metacello |
+  | gs_home |
   gs_home := Smalltalk os environment at: 'GS_HOME'.
-  metacello := Metacello new
+  Metacello new
+    baseline: 'Metacello';
+    repository: 'github://dalehenrich/metacello-work:master/repository';
+    get.
+  Metacello new
+    baseline: 'Metacello';
+    repository: 'github://dalehenrich/metacello-work:master/repository';
+    onConflict: [:ex | ex allow];
+    load.
+  Metacello new
     configuration: 'TodeClient';
     version: #release;
     repository: 'filetree://', gs_home, '/repository';
-    yourself.
-  metacello copy get. "cannot count on Pharo3.0 having latest Metacello loaded"
-  metacello 
-    onConflict: [:ex | ex disallow];
+    get;
     load ]
       on: Warning
       do: [:ex | Transcript cr; show: ex description ].

diff --git a/...ConfigurationOfTodeClient.package/ConfigurationOfTodeClient.class/instance/version100..st b/...ConfigurationOfTodeClient.package/ConfigurationOfTodeClient.class/instance/version100..st
@@ -18,6 +18,6 @@ version100: spec
 					with: [ 
 							spec
 								loads: 'GemStone Dev';
-								repository: 'github://dalehenrich/tode:v0.0.2/repository' ];
+								repository: 'github://dalehenrich/tode:v0.0.?/repository' ];
 				postLoadDoIt: #post30Load;
 				yourself ]
diff --git a/...ConfigurationOfTodeClient.package/ConfigurationOfTodeClient.class/instance/version200..st b/...ConfigurationOfTodeClient.package/ConfigurationOfTodeClient.class/instance/version200..st
@@ -4,7 +4,7 @@ version200: spec
 	spec
 		for: #'pharo3.x'
 		do: [ 
-			spec blessing: #development.	
+			spec blessing: #release.	
 			spec description: 'Changes in support of https://github.com/GsDevKit/gsDevKitHome/issues/32'.
 			spec repository: 'filetree://' , (FileSystem workingDirectory parent / 'repository') pathString.
 			spec
@@ -19,6 +19,6 @@ version200: spec
 					with: [ 
 							spec
 								loads: 'GemStone Dev';
-								repository: 'github://dalehenrich/tode:v0.0.2/repository' ];
+								repository: 'github://dalehenrich/tode:v0.?/repository' ];
 				postLoadDoIt: #post30Load;
 				yourself ]
diff --git a/tests/pharo/todeLoad.st b/tests/pharo/todeLoad.st
@@ -2,15 +2,21 @@
   "Tests pharo todeLoad.st"
   | gs_home metacello |
   gs_home := Smalltalk os environment at: 'GS_HOME'.
-  metacello := Metacello new
+  Metacello new
+    baseline: 'Metacello';
+    repository: 'github://dalehenrich/metacello-work:master/repository';
+    get.
+  Metacello new
+    baseline: 'Metacello';
+    repository: 'github://dalehenrich/metacello-work:master/repository';
+    onConflict: [:ex | ex allow];
+    load.
+  Metacello new
     configuration: 'TodeClient';
     version: #dev;
     repository: 'filetree://', gs_home, '/repository';
-    yourself.
-  metacello copy get. "cannot count on Pharo3.0 having latest Metacello loaded"
-  metacello 
-    onConflict: [:ex | ex disallow];
-    load ]
+    get;
+    load  ]
       on: Warning
       do: [:ex | Transcript cr; show: ex description ].