Merge branch 'dev_dev' - PR #222

dalehenrich · Oct 13, 2015 · 7c35e2a · 7c35e2a
2 parents 598e988 + 65ffe39
commit 7c35e2a
Show file tree

Hide file tree

Showing 153 changed files with 766 additions and 383 deletions.
diff --git a/repository/BaselineOfTode.package/BaselineOfTode.class/instance/baseline..st b/repository/BaselineOfTode.package/BaselineOfTode.class/instance/baseline..st
@@ -6,7 +6,7 @@ baseline: spec
     do: [ 
       spec
         baseline: 'Ston'
-          with: [ spec repository: 'github://GsDevKit/ston:v0.9.?/repository' ];
+          with: [ spec repository: 'github://GsDevKit/ston:v0.9.4/repository' ];
         yourself.
       spec
         package: 'Topez-Common-Core' with: [ spec requires: #('Ston') ];
@@ -54,9 +54,15 @@ baseline: spec
                 postLoadDoIt: #'initializeTools';
                 requires: #('Topez-Server-Core') ];
         package: 'Tode-Client-Common'
-          with: [ spec requires: #('Topez-Common-Core' 'Topez-Pharo-Common') ];
+          with: [ 
+              spec
+                postLoadDoIt: #'pharo30InstallTodeClient';
+                requires: #('Topez-Common-Core' 'Topez-Pharo-Common') ];
         package: 'Topez-Client-GemStone'
-          with: [ spec requires: #('GemTools-ClientGCI' 'Tode-Client-Common') ];
+          with: [ 
+              spec
+                postLoadDoIt: #'pharo30InstallFullTodeClient';
+                requires: #('GemTools-ClientGCI' 'Tode-Client-Common') ];
         package: 'Tode-Client-Pharo'
           with: [ spec requires: #('Tode-Client-Common') ];
         package: 'Tode-Client-ServerBlocks'
@@ -72,6 +78,7 @@ baseline: spec
         group: 'GemStone Tests' with: #('Topez-ClientTravis-Tests');
         group: 'GemStone Dev'
           with: #('GemStone' 'Common Tests' 'GemStone Tests');
+        group: 'Common-Core' with: #('Topez-Common-Core');
         group: 'Pharo Dev' with: #('Pharo' 'Common Tests');
         yourself ].
   spec
@@ -96,13 +103,7 @@ baseline: spec
       spec
         package: 'Tode-Client-Roassal2'
           with: [ spec requires: #('Tode-Client-ServerBlocks') ];
-        package: 'TPZ-Talk'
-          with: [ 
-              spec
-                requires: #('Ston' 'Roassal2');
-                repository:
-                    'http://smalltalkhub.com/mc/PierreChanson/TPZ-Talk/main' ];
-        group: 'Visualize' with: #('TPZ-Talk' 'Tode-Client-Roassal2');
+        group: 'Visualize' with: #('Tode-Client-Roassal2' 'GemStone');
         yourself ].
   spec
     for: #'gemstone'

diff --git a/repository/BaselineOfTode.package/BaselineOfTode.class/instance/initializeTools.st b/repository/BaselineOfTode.package/BaselineOfTode.class/instance/initializeTools.st
@@ -1,3 +1,3 @@
-baseline
+initialization
 initializeTools
   Smalltalk at: #'TDStandardTool' ifPresent: [ :cls | cls initializeTools ]
diff --git a/...tory/BaselineOfTode.package/BaselineOfTode.class/instance/pharo30InstallFullTodeClient.st b/...tory/BaselineOfTode.package/BaselineOfTode.class/instance/pharo30InstallFullTodeClient.st
@@ -0,0 +1,44 @@
+initialization
+pharo30InstallFullTodeClient
+  | monoFontName windowProperties bounds |
+  Smalltalk at: #'TODE_CLIENT_INSTALLED' ifPresent: [ ^ self ].
+  Smalltalk os environment
+    at: 'GS_HOME'
+    ifAbsent: [ 
+      "Cannot initialize correctly if $GS_HOME is not defined correctly"
+      ^ self ].
+  self pharo30InstallTodeClient.
+  (Smalltalk at: #'World') perform: #'closeAllWindowsDiscardingChanges'.	"close all windows"
+  (Smalltalk at: #'PolymorphSystemSettings')
+    perform: #'desktopLogoFileName:'
+    with:
+      (((Smalltalk at: #'FileSystem') perform: #'workingDirectory')
+        / 'GemTalkSystemsLogo.png') pathString.
+  (Smalltalk at: #'TaskbarMorph') perform: #'showTaskbar:' with: false.
+  (Smalltalk at: #'NECPreferences') perform: #'enabled:' with: false.
+  Smalltalk at: #'TODE_CLIENT_INSTALLED' put: true.
+  (Smalltalk at: #'TDShell') perform: #'resetWorldMenu'.
+  (Smalltalk at: #'FreeTypeFontProvider') current perform: #'updateFromSystem'.
+  monoFontName := 'Courier New'.	"Windows"
+  (Smalltalk os perform: #'isUnix')
+    ifTrue: [ monoFontName := 'DejaVu Sans Mono' ]
+    ifFalse: [ 
+      (Smalltalk os perform: #'isMacOSX')
+        ifTrue: [ monoFontName := 'Monaco' ]
+        ifFalse: [ 
+          "Windows"
+          monoFontName := 'Consolas' ] ].
+  (Smalltalk at: #'StandardFonts')
+    defaultFont:
+      ((Smalltalk at: #'LogicalFont')
+        perform: #'familyName:pointSize:'
+        with: monoFontName
+        with: 8).
+  (Smalltalk at: #'StandardFonts')
+    perform: #'setAllStandardFontsTo:'
+    with: ((Smalltalk at: #'StandardFonts') perform: #'defaultFont').
+  windowProperties := (Smalltalk at: #'TDAbstractWindowProperties')
+    import: 'jigsaw-medium'.
+  windowProperties installOn: (Smalltalk at: #'TDTopezGemStoneClient').
+  bounds := (windowProperties perform: #'caculateWindowBounds') at: #'transcript'.
+  (Smalltalk at: #'TDShell') perform: #'resizeTranscript:' with: bounds
diff --git a/repository/BaselineOfTode.package/BaselineOfTode.class/instance/pharo30InstallTodeClient.st b/repository/BaselineOfTode.package/BaselineOfTode.class/instance/pharo30InstallTodeClient.st
@@ -0,0 +1,19 @@
+initialization
+pharo30InstallTodeClient
+  "setup paths"
+
+  Deprecation
+    perform: #'showWarning:' with: false;
+    perform: #'raiseWarning:' with: false.
+  (Smalltalk os environment
+    at: 'GS_HOME'
+    ifAbsent: [ 
+      "Cannot initialize correctly if $GS_HOME is not defined correctly"
+      ^ self ])
+    ifNotNil: [ :gs_home | (Smalltalk at: #'TDShell') perform: #'devKitRoot:' with: gs_home ].
+  (Smalltalk os environment at: 'GS_HOME' ifAbsent: [  ])
+    ifNotNil: [ :todeRoot | 
+      "support for GsDevKit_home"
+      (Smalltalk at: #'TDShell')
+        perform: #'todeRoot:'
+        with: todeRoot ]
diff --git a/repository/BaselineOfTode.package/BaselineOfTode.class/methodProperties.json b/repository/BaselineOfTode.package/BaselineOfTode.class/methodProperties.json
@@ -2,5 +2,7 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "dkh 06/26/2015 14:21",
-		"initializeTools" : "dkh 06/06/2013 11:59" } }
+		"baseline:" : "dkh 09/29/2015 17:22",
+		"initializeTools" : "dkh 06/06/2013 11:59",
+		"pharo30InstallFullTodeClient" : "dkh 10/10/2015 16:30",
+		"pharo30InstallTodeClient" : "dkh 10/10/2015 16:36" } }
diff --git a/repository/BaselineOfTode.package/monticello.meta/categories.st b/repository/BaselineOfTode.package/monticello.meta/categories.st
@@ -1 +1 @@
-SystemOrganization addCategory: #'BaselineOfTode'!
+SystemOrganization addCategory: #BaselineOfTode!