Merge branch 'gs_port' of https://github.com/dalehenrich/Grease into dalehenrich-gs_port

dalehenrich · dalehenrich · commit 4cc59727b080 · 2017-11-30T20:31:49.000-08:00
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st
@@ -137,7 +137,7 @@ baseline: spec
         group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
 
   spec
-    for: #'gemstone'
+    for: #( #'gemstone' )
     do: [ 
       spec
         project: 'GsCore'
@@ -160,13 +160,45 @@ baseline: spec
           with: [ spec loads: #('System-Digital-Signatures') ];
         project: 'SMTPMail'
           copyFrom: 'UTF8'
-          with: [ spec loads: #('SMTPMail') ].
+          with: [ spec loads: #('SMTPMail') ];
+        yourself.
       spec
         package: 'Grease-Core'
-          with: [ 
-              spec
-                requires: #('GsCore');
-                includes: #('Grease-GemStone-Core') ];
+          with: [ spec requires: #('GsCore') ];
+        package: 'Grease-GemStone-Core'
+          with: [ spec requires: #( 'GsCore' 'UTF8' ) ];
+        yourself.
+  ].
+  spec
+    for: #( #'gemstone64' )
+    do: [ 
+      spec
+        baseline: 'GsDevKit'
+          with: [ spec repository: 'github://GsDevKit/GsDevKit:master/repository' ];
+        project: 'UTF8'
+          copyFrom: 'GsDevKit'
+          with: [ spec loads: #('Utf8Encoding') ];
+        project: 'System-Digital-Signatures'
+          copyFrom: 'GsDevKit'
+          with: [ spec loads: #('System-Digital-Signatures') ];
+        project: 'SMTPMail'
+          copyFrom: 'GsDevKit'
+          with: [ spec loads: #('SMTPMail') ];
+        project: 'GsCore'
+          copyFrom: 'GsDevKit'
+          with: [ spec loads: #('GsCore' 'GsMonticello' 'GsSqueakCommon-Core') ];
+        yourself.
+      spec
+        package: 'Grease-GemStone-Core'
+          with: [ spec requires: #( 'UTF8' 'GsCore' ) ];
+        yourself.
+  ].
+  spec
+    for: #( #'gemstone' #'gemstone64')
+    do: [ 
+      spec
+        package: 'Grease-Core'
+          with: [ spec includes: #('Grease-GemStone-Core') ];
         package: 'Grease-Tests-Core'
           with: [ 
               spec
@@ -176,7 +208,7 @@ baseline: spec
           with: [ 
               spec
                 requires:
-                  #('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ];
+                  #('Grease-Core' 'System-Digital-Signatures' 'SMTPMail') ];
         package: 'Grease-Tests-GemStone-Core'
           with: [ spec requires: #('Grease-Tests-Core') ] ].
   spec
@@ -219,4 +251,4 @@ baseline: spec
     do: [ 
       spec
         package: 'Grease-Tests-GemStone-Core'
-        with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
+        with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
diff --git a/repository/Grease-GemStone-Core.package/GRUtf8GemStoneCodec.class/instance/decoderFor..st b/repository/Grease-GemStone-Core.package/GRUtf8GemStoneCodec.class/instance/decoderFor..st
diff --git a/repository/Grease-GemStone-Core.package/GRUtf8GemStoneCodec.class/instance/encoderFor..st b/repository/Grease-GemStone-Core.package/GRUtf8GemStoneCodec.class/instance/encoderFor..st
diff --git a/repository/Grease-GemStone200-Core.package/GRUtf8GemStoneCodec.extension/instance/decoderFor..st b/repository/Grease-GemStone200-Core.package/GRUtf8GemStoneCodec.extension/instance/decoderFor..st
@@ -0,0 +1,4 @@
+*Grease-GemStone200
+decoderFor: aWriteStream
+
+	^ GRUtf8CodecStream on: aWriteStream
diff --git a/repository/Grease-GemStone200-Core.package/GRUtf8GemStoneCodec.extension/instance/encoderFor..st b/repository/Grease-GemStone200-Core.package/GRUtf8GemStoneCodec.extension/instance/encoderFor..st
@@ -0,0 +1,4 @@
+*Grease-GemStone200
+encoderFor: aWriteStream
+
+	^ GRUtf8CodecStream on: aWriteStream
diff --git a/repository/Grease-GemStone230-Core.package/GRUtf8GemStoneCodec.extension/instance/decoderFor..st b/repository/Grease-GemStone230-Core.package/GRUtf8GemStoneCodec.extension/instance/decoderFor..st
@@ -0,0 +1,4 @@
+*Grease-GemStone230
+decoderFor: aWriteStream
+
+	^ GRUtf8CodecStream on: aWriteStream
diff --git a/repository/Grease-GemStone230-Core.package/GRUtf8GemStoneCodec.extension/instance/encoderFor..st b/repository/Grease-GemStone230-Core.package/GRUtf8GemStoneCodec.extension/instance/encoderFor..st
@@ -0,0 +1,4 @@
+*Grease-GemStone230
+encoderFor: aWriteStream
+
+	^ GRUtf8CodecStream on: aWriteStream
diff --git a/repository/Grease-GemStone240-Core.package/GRUtf8GemStoneCodec.extension/instance/decoderFor..st b/repository/Grease-GemStone240-Core.package/GRUtf8GemStoneCodec.extension/instance/decoderFor..st
@@ -0,0 +1,4 @@
+*Grease-GemStone240
+decoderFor: aWriteStream
+
+	^ GRUtf8CodecStream on: aWriteStream
diff --git a/repository/Grease-GemStone240-Core.package/GRUtf8GemStoneCodec.extension/instance/encoderFor..st b/repository/Grease-GemStone240-Core.package/GRUtf8GemStoneCodec.extension/instance/encoderFor..st
@@ -0,0 +1,4 @@
+*Grease-GemStone240
+encoderFor: aWriteStream
+
+	^ GRUtf8CodecStream on: aWriteStream
diff --git a/repository/Grease-GemStone300-Core.package/GRUtf8GemStoneCodec.extension/instance/decoderFor..st b/repository/Grease-GemStone300-Core.package/GRUtf8GemStoneCodec.extension/instance/decoderFor..st
@@ -0,0 +1,4 @@
+*Grease-GemStone300
+decoderFor: aWriteStream
+
+	^ GRUtf8CodecStream on: aWriteStream
diff --git a/repository/Grease-GemStone300-Core.package/GRUtf8GemStoneCodec.extension/instance/encoderFor..st b/repository/Grease-GemStone300-Core.package/GRUtf8GemStoneCodec.extension/instance/encoderFor..st
@@ -0,0 +1,4 @@
+*Grease-GemStone300
+encoderFor: aWriteStream
+
+	^ GRUtf8CodecStream on: aWriteStream
