squeak: re-add BlockContext extensions via new Squeak6Compatibility p…

…ackage See #552 (comment)
Metacello · May 25, 2022 · 8d11206 · 8d11206
1 parent 1698d8d
commit 8d11206
Show file tree

Hide file tree

Showing 18 changed files with 85 additions and 4 deletions.
diff --git a/repository/BaselineOfMetacello.package/BaselineOfMetacello.class/instance/baseline..st b/repository/BaselineOfMetacello.package/BaselineOfMetacello.class/instance/baseline..st
@@ -275,7 +275,7 @@ baseline: spec
         package: 'Metacello-TestsMC' with: [ spec requires: #('Gofer Tests') ];
         package: 'Metacello-Platform'
           with: [
-            spec file: 'Metacello-Platform.squeak'; requires: #('Ston') ];
+            spec file: 'Metacello-Platform.squeak'; requires: #('Ston' 'squeak-compatibility') ];
         yourself ].
   spec
     for:
@@ -294,6 +294,14 @@ baseline: spec
         package: 'Metacello-Platform'
           with: [ spec requires: #('WebClient' 'SqueakSSL-Core') ];
         yourself ].
+  spec group: 'squeak-compatibility' with: #().
+  spec
+    for:
+      #(#'squeak4.x' #'squeak5.x')
+    do: [ 
+      spec
+        package: 'Metacello-Squeak6Compatibility';
+        group: 'squeak-compatibility' with: #('Metacello-Squeak6Compatibility') ].
   spec
     for: #'gemstone'
     do: [ 

diff --git a/repository/BaselineOfMetacello.package/BaselineOfMetacello.class/methodProperties.json b/repository/BaselineOfMetacello.package/BaselineOfMetacello.class/methodProperties.json
@@ -2,9 +2,10 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "tobe 5/15/2020 20:02",
+		"baseline:" : "ct 5/25/2022 13:05",
 		"filetree:" : "EstebanLorenzano 10/26/2017 11:42",
 		"gemstone10beta311PostLoadDoIt" : "dkh 07/24/2012 18:09",
+		"gemstoneMetacelloGemStonePlatform3xInit" : "tobe 7/3/2020 09:57:21",
 		"gofer:" : "EstebanLorenzano 10/26/2017 11:42",
 		"reprimeRegistryIssue197" : "dkh 09/30/2014 17:40",
 		"testResourcePostLoadDoIt" : "dkh 6/1/2012 09:18:17" } }
diff --git a/repository/BaselineOfMetacello.package/monticello.meta/categories.st b/repository/BaselineOfMetacello.package/monticello.meta/categories.st
@@ -1 +1 @@
-SystemOrganization addCategory: #'BaselineOfMetacello'!
+SystemOrganization addCategory: #BaselineOfMetacello!
diff --git a/repository/BaselineOfMetacello.package/monticello.meta/version b/repository/BaselineOfMetacello.package/monticello.meta/version
diff --git a/repository/Metacello-Squeak6Compatibility.package/.filetree b/repository/Metacello-Squeak6Compatibility.package/.filetree
@@ -0,0 +1,4 @@
+{
+	"noMethodMetaData" : true,
+	"separateMethodMetaAndSource" : false,
+	"useCypressPropertiesFile" : true }
diff --git a/...ueak6Compatibility.package/BlockContext.extension/instance/setAuthorInMetacelloConfig..st b/...ueak6Compatibility.package/BlockContext.extension/instance/setAuthorInMetacelloConfig..st
@@ -0,0 +1,4 @@
+*Metacello-Squeak6Compatibility-*metacello-platform
+setAuthorInMetacelloConfig: aMetacelloConfig
+
+	aMetacelloConfig setAuthorWithBlock: self
diff --git a/...ak6Compatibility.package/BlockContext.extension/instance/setBlessingInMetacelloConfig..st b/...ak6Compatibility.package/BlockContext.extension/instance/setBlessingInMetacelloConfig..st
@@ -0,0 +1,4 @@
+*Metacello-Squeak6Compatibility-*metacello-platform
+setBlessingInMetacelloConfig: aMetacelloConfig
+
+	aMetacelloConfig setBlessingWithBlock: self
diff --git a/...Compatibility.package/BlockContext.extension/instance/setDescriptionInMetacelloConfig..st b/...Compatibility.package/BlockContext.extension/instance/setDescriptionInMetacelloConfig..st
@@ -0,0 +1,4 @@
+*Metacello-Squeak6Compatibility-*metacello-platform
+setDescriptionInMetacelloConfig: aMetacelloConfig
+
+	aMetacelloConfig setDescriptionWithBlock: self
diff --git a/...ompatibility.package/BlockContext.extension/instance/setPackage.withInMetacelloConfig..st b/...ompatibility.package/BlockContext.extension/instance/setPackage.withInMetacelloConfig..st
@@ -0,0 +1,4 @@
+*Metacello-Squeak6Compatibility-*metacello-platform
+setPackage: aString withInMetacelloConfig: aMetacelloConfig
+
+	aMetacelloConfig setPackage: aString withBlock: self
diff --git a/...ompatibility.package/BlockContext.extension/instance/setProject.withInMetacelloConfig..st b/...ompatibility.package/BlockContext.extension/instance/setProject.withInMetacelloConfig..st
@@ -0,0 +1,4 @@
+*Metacello-Squeak6Compatibility-*metacello-platform
+setProject: aString withInMetacelloConfig: aMetacelloConfig
+
+	aMetacelloConfig setProject: aString withBlock: self
diff --git a/...k6Compatibility.package/BlockContext.extension/instance/setTimestampInMetacelloConfig..st b/...k6Compatibility.package/BlockContext.extension/instance/setTimestampInMetacelloConfig..st
@@ -0,0 +1,4 @@
+*Metacello-Squeak6Compatibility-*metacello-platform
+setTimestampInMetacelloConfig: aMetacelloConfig
+
+	aMetacelloConfig setTimestampWithBlock: self
diff --git a/...6Compatibility.package/BlockContext.extension/instance/valueSupplyingMetacelloAnswers..st b/...6Compatibility.package/BlockContext.extension/instance/valueSupplyingMetacelloAnswers..st
@@ -0,0 +1,27 @@
+*Metacello-Squeak6Compatibility-*metacello-platform
+valueSupplyingMetacelloAnswers: aListOfPairs
+	"evaluate the block using a list of questions / answers that might be called upon to
+	automatically respond to Object>>confirm: or FillInTheBlank requests"
+
+	^ [self value] 
+		on: ProvideAnswerNotification
+		do: 
+			[:notify | | answer caption |
+
+			caption := notify messageText withSeparatorsCompacted. "to remove new lines"
+			answer := aListOfPairs
+				detect: 
+					[:each | caption = each first or:
+						[(caption includesSubstring: each first caseSensitive: false) or:
+						[(each first match: caption) or:
+						[(String includesSelector: #matchesRegex:) and: 
+						[ [ caption matchesRegex: each first ] on: Error do: [:ignored | false ]]]]]]
+					ifNone: [nil].
+			answer
+				ifNotNil: [notify resume: answer second]
+				ifNil: 
+					[ | outerAnswer |
+					outerAnswer := ProvideAnswerNotification signal: notify messageText.
+					outerAnswer 
+						ifNil: [notify resume] 
+						ifNotNil: [notify resume: outerAnswer]]]
diff --git a/...itory/Metacello-Squeak6Compatibility.package/BlockContext.extension/methodProperties.json b/...itory/Metacello-Squeak6Compatibility.package/BlockContext.extension/methodProperties.json
@@ -0,0 +1,11 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"setAuthorInMetacelloConfig:" : "dkh 6/12/2012 10:18:46.076",
+		"setBlessingInMetacelloConfig:" : "dkh 6/12/2012 10:18:46.076",
+		"setDescriptionInMetacelloConfig:" : "dkh 6/12/2012 10:18:46.076",
+		"setPackage:withInMetacelloConfig:" : "dkh 6/12/2012 10:18:46.076",
+		"setProject:withInMetacelloConfig:" : "dkh 6/12/2012 10:18:46.076",
+		"setTimestampInMetacelloConfig:" : "dkh 6/12/2012 10:18:46.076",
+		"valueSupplyingMetacelloAnswers:" : "dkh 6/12/2012 10:18:46.076" } }
diff --git a/repository/Metacello-Squeak6Compatibility.package/BlockContext.extension/properties.json b/repository/Metacello-Squeak6Compatibility.package/BlockContext.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "BlockContext" }
diff --git a/repository/Metacello-Squeak6Compatibility.package/monticello.meta/initializers.st b/repository/Metacello-Squeak6Compatibility.package/monticello.meta/initializers.st
diff --git a/repository/Metacello-Squeak6Compatibility.package/monticello.meta/package b/repository/Metacello-Squeak6Compatibility.package/monticello.meta/package
@@ -0,0 +1 @@
+(name 'Metacello-Squeak6Compatibility')
diff --git a/repository/Metacello-Squeak6Compatibility.package/monticello.meta/version b/repository/Metacello-Squeak6Compatibility.package/monticello.meta/version
@@ -0,0 +1 @@
+(name 'Metacello-Squeak6Compatibility-ct.1' message 'Add compatibility extensions for BlockContext from Metacello-PlatformAs of Squeak 6.0, BlockContext is no longer available in the base system, so we need to provide these extensions in a separate package to avoid a #dependencyWarning during installation. See https://github.com/Metacello/metacello/pull/552.' id '14a7bad5-7faa-f746-a541-31b9e656f2c1' date '25 May 2022' time '1:09:46.088867 pm' author 'ct' ancestors () stepChildren ())

diff --git a/repository/Metacello-Squeak6Compatibility.package/properties.json b/repository/Metacello-Squeak6Compatibility.package/properties.json
@@ -0,0 +1,2 @@
+{
+	 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SystemOrganization addCategory: #'BaselineOfMetacello'!
		SystemOrganization addCategory: #BaselineOfMetacello!
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		(name 'Metacello-Squeak6Compatibility-ct.1' message 'Add compatibility extensions for BlockContext from Metacello-PlatformAs of Squeak 6.0, BlockContext is no longer available in the base system, so we need to provide these extensions in a separate package to avoid a #dependencyWarning during installation. See https://github.com/Metacello/metacello/pull/552.' id '14a7bad5-7faa-f746-a541-31b9e656f2c1' date '25 May 2022' time '1:09:46.088867 pm' author 'ct' ancestors () stepChildren ())
Expand Down