Merge pull request #20 from GsDevKit/issue_111

better all around solution for the gemstone kernel overrides for Issue #111
SeasideSt · Oct 9, 2020 · d5864a7 · d5864a7
2 parents 70f88a7 + 60b064c
commit d5864a7
Show file tree

Hide file tree

Showing 32 changed files with 36 additions and 174 deletions.
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st
@@ -79,7 +79,7 @@ baselineGemStone: spec
                 requires: #('Grease-GemStone-Core');
                 postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
   spec
-    for: #(#'gs3.3.x' #'gs3.4.x' #'gs3.5.x')
+    for: #(#'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x')
     do: [ 
       spec
         package: 'Grease-GemStone-Core'
@@ -89,17 +89,26 @@ baselineGemStone: spec
               spec
                 requires: #('Grease-GemStone-Core');
                 postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
+  spec
+    for: #( #'gs3.5.4.x' #'gs3.5.5.x')
+    do: [ 
+      spec
+        package: 'Grease-GemStone-Core'
+          with: [ spec includes: #('Grease-GemStone-Kernelv354') ];
+        package: 'Grease-GemStone-Kernelv354'
+          with: [ 
+              spec
+                requires: #('Grease-GemStone-Core') ] ].
   spec
     for: #( #'gs3.6.x')
     do: [ 
       spec
         package: 'Grease-GemStone-Core'
-          with: [ spec includes: #('Grease-GemStone360-Core') ];
-        package: 'Grease-GemStone360-Core'
+          with: [ spec includes: #('Grease-GemStone-Kernelv360') ];
+        package: 'Grease-GemStone-Kernelv360'
           with: [ 
               spec
-                requires: #('Grease-GemStone-Core');
-                postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
+                requires: #('Grease-GemStone-Core') ] ].
   spec
     for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x')
     do: [ 

diff --git a/repository/Grease-GemStone-Kernelv354.package/Class.extension/instance/comment.st b/repository/Grease-GemStone-Kernelv354.package/Class.extension/instance/comment.st
@@ -0,0 +1,9 @@
+*grease-gemstone-kernelv354
+comment
+  "override new 3.5.4 comment implementation (answers default GemStone class comment for 
+	class instead of nil) and restore pre-3.5.4 behavior (answer '' if no comment 
+	defined)"
+
+  "https://github.com/SeasideSt/Grease/issues/111"
+
+  ^ self commentForFileout ifNil: [ '' ]
diff --git a/...e.package/Class.extension/properties.json → ...4.package/Class.extension/properties.json b/...e.package/Class.extension/properties.json → ...4.package/Class.extension/properties.json
diff --git a/repository/Grease-GemStone-Kernelv360.package/Class.extension/instance/comment.st b/repository/Grease-GemStone-Kernelv360.package/Class.extension/instance/comment.st
@@ -0,0 +1,9 @@
+*grease-gemstone-kernelv360
+comment
+  "override new 3.6.0 comment implementation (answers default GemStone class comment for 
+	class instead of nil) and restore pre-3.6.0 behavior (answer '' if no comment 
+	defined)"
+
+  "https://github.com/SeasideSt/Grease/issues/111"
+
+  ^ self commentForFileout ifNil: [ '' ]
diff --git a/repository/Grease-GemStone-Kernelv360.package/Class.extension/properties.json b/repository/Grease-GemStone-Kernelv360.package/Class.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "Class" }
diff --git a/...ception.extension/instance/messageText.st → ...ception.extension/instance/messageText.st b/...ception.extension/instance/messageText.st → ...ception.extension/instance/messageText.st
@@ -1,5 +1,5 @@
-*grease-gemstone360-core
+*grease-gemstone-kernelv360
 messageText
 	"override new 3.6.0 messageText implementation to restore pre-3.6.0 behavior"
 	"https://github.com/SeasideSt/Grease/issues/111"
-  ^ gsDetails
+  ^ gsDetails
diff --git a/...ckage/Exception.extension/properties.json → ...ckage/Exception.extension/properties.json b/...ckage/Exception.extension/properties.json → ...ckage/Exception.extension/properties.json
diff --git a/repository/Grease-GemStone360-Core.package/.filetree b/repository/Grease-GemStone360-Core.package/.filetree
diff --git a/repository/Grease-GemStone360-Core.package/Class.extension/instance/comment.st b/repository/Grease-GemStone360-Core.package/Class.extension/instance/comment.st
diff --git a/repository/Grease-GemStone360-Core.package/Exception.extension/instance/greaseString.st b/repository/Grease-GemStone360-Core.package/Exception.extension/instance/greaseString.st
diff --git a/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/argumentCount.st b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/argumentCount.st
diff --git a/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/ifCurtailed..st b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/instance/ifCurtailed..st
diff --git a/...ease-GemStone360-Core.package/ExecBlock.extension/instance/valueWithPossibleArguments..st b/...ease-GemStone360-Core.package/ExecBlock.extension/instance/valueWithPossibleArguments..st
diff --git a/repository/Grease-GemStone360-Core.package/ExecBlock.extension/properties.json b/repository/Grease-GemStone360-Core.package/ExecBlock.extension/properties.json
diff --git a/...mStone360-Core.package/GRGemStonePlatform.extension/instance/gemstoneExceptionSelector.st b/...mStone360-Core.package/GRGemStonePlatform.extension/instance/gemstoneExceptionSelector.st
diff --git a/...rease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/generateHardBreak.st b/...rease-GemStone360-Core.package/GRGemStonePlatform.extension/instance/generateHardBreak.st
diff --git a/...0-Core.package/GRGemStonePlatform.extension/instance/handlesAlmostOutOfStackException..st b/...0-Core.package/GRGemStonePlatform.extension/instance/handlesAlmostOutOfStackException..st
diff --git a/...tone360-Core.package/GRGemStonePlatform.extension/instance/handlesBreakpointException..st b/...tone360-Core.package/GRGemStonePlatform.extension/instance/handlesBreakpointException..st
diff --git a/...e-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesHaltException..st b/...e-GemStone360-Core.package/GRGemStonePlatform.extension/instance/handlesHaltException..st
diff --git a/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/properties.json b/repository/Grease-GemStone360-Core.package/GRGemStonePlatform.extension/properties.json
diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/README.md b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/README.md
diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/class/initialize.st b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/class/initialize.st
diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/crlf.st b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/crlf.st
diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/invalidUtf8.st b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/invalidUtf8.st
diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/next..st b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/next..st
diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/nextPut..st b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/nextPut..st
diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/nextPutAll..st b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/instance/nextPutAll..st
diff --git a/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/properties.json b/repository/Grease-GemStone360-Core.package/GRUtf8CodecStream.class/properties.json
diff --git a/repository/Grease-GemStone360-Core.package/monticello.meta/categories.st b/repository/Grease-GemStone360-Core.package/monticello.meta/categories.st
diff --git a/repository/Grease-GemStone360-Core.package/monticello.meta/initializers.st b/repository/Grease-GemStone360-Core.package/monticello.meta/initializers.st
diff --git a/repository/Grease-GemStone360-Core.package/monticello.meta/package b/repository/Grease-GemStone360-Core.package/monticello.meta/package
diff --git a/repository/Grease-GemStone360-Core.package/properties.json b/repository/Grease-GemStone360-Core.package/properties.json