Merge pull request #552 from LinqLover/fix-metacello-squeak60

Fix Metacello for Squeak 6.0beta
Metacello · May 25, 2022 · 214c519 · 214c519
2 parents c047c7b + 8d11206
commit 214c519
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 13 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-Platform.squeak.package/monticello.meta/version b/repository/Metacello-Platform.squeak.package/monticello.meta/version
@@ -1,4 +1,4 @@
-(name 'Metacello-Platform.squeak-ct.74' message 'Honor possible case-insensitivity of certain file system repositories. For instance, paths are not case-sensitive on Windows. The same applies to BitBucket or GitHub repositories.
+(name 'Metacello-Platform.squeak-ct.75' message 'Eliminates dependency on Squeak 60Deprecated by removing obsolete extension on BlockContext. This fixes Metacello/Squeak CI and loading Metacello into Squeak 6.0beta image. BlockContext has been deprecated since Squeak 5.2 is no longer available in Squeak 6.0. See 60Deprecated-pre.5.' id '987af074-fcc8-df4c-884c-173f4eb62bc7' date '21 May 2022' time '11:57:51.105178 pm' author 'ct' ancestors ((name 'Metacello-Platform.squeak-ct.74' message 'Honor possible case-insensitivity of certain file system repositories. For instance, paths are not case-sensitive on Windows. The same applies to BitBucket or GitHub repositories.
 
 For a recent real-world failure caused by this inconsistency, see: https://github.com/hpi-swa-lab/SqueakByExample-english/pull/105/commits/f9beaad90e843a3ed68c6e69a118eefd857bf2a8' id '1933c091-b53b-d043-8245-f1319bf2c591' date '26 April 2021' time '7:08:40.645311 pm' author 'ct' ancestors ((name 'Metacello-Platform.squeak-ct.73' message 'More comments' id 'a14119da-991c-bb41-bd0d-bde6a198dbfe' date '16 November 2020' time '12:43:29.529666 pm' author 'ct' ancestors ((name 'Metacello-Platform.squeak-ct.72' message 'Adds method comments for Metacello credentials parameters.' id 'dd50f4cc-320f-4944-8a84-0757b4de516b' date '16 November 2020' time '12:37:10.620666 pm' author 'ct' ancestors ((name 'Metacello-Platform.squeak-tobe.71' message 'squeak/windows: github repo paths with slashes were not interpreted correctly
 
@@ -35,4 +35,4 @@ so Metacello works on Squeak 4.6 & 5.0' id '27bb3ca8-5bb9-40eb-aac1-7c80b39e3c0f
 - fix Issue 111: progress notification for Squeak
   http://code.google.com/p/metacello/issues/detail?id=111' id '5cf04623-a4fb-447a-96d8-21978c340f77' date '18 January 2012' time '4:57:04 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.10' message '- passing tests in Squeak3.10.2
 - 365 run, 365 passes' id 'e3af2d13-7aed-41ad-8788-2ea645f0cace' date '5 January 2011' time '5:03:59 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.9' message '- Squeak portability' id '6895c682-39ad-47d8-8206-2ed1bf117947' date '5 January 2011' time '4:09:03 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.8' message '- add Squeak attributes: #''squeak3.10.x'', #''squeak4.1.x'', and #''squeak4.2.x''' id '00f3028a-51a9-40fc-a409-c015a787779b' date '5 January 2011' time '3:39:28 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.7' message '- implement copyClass:as:inCategory:' id '2962dcae-a27e-4a64-906c-f076ff018c8d' date '18 November 2010' time '4:25:10 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.6' message '- implement copyClass:as:' id '8bc3449c-f0be-43ca-9d20-260ed0059df9' date '18 November 2010' time '3:37:16 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.5' message '- port to Squeak3.10.2-7179-basic' id '9a3caba5-a0cd-42cf-bb29-7b31e9b84fcb' date '5 February 2010' time '4:51:41 pm' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.4' message '- fix Issue 14: http://code.google.com/p/metacello/issues/detail?id=14 Ftp repository for Squeak
-- add ftp support for Squeak' id 'b30549fa-52cb-424e-a7aa-329b15152b47' date '29 December 2009' time '4:17:21 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.3' message '- needs #initialize method' id 'b0033f12-24a1-4373-8a2c-211ccb6d061e' date '12 October 2009' time '1:30:44 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.2' message '- implement platform utility methods' id 'f4ca5554-cf53-4251-8066-5c2ae813ab09' date '12 October 2009' time '1:28:37 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.1' message '- Squeak-specific metacello support' id '7045edec-ac01-4485-bd21-efac82f0c9ef' date '9 August 2009' time '11:13:57 am' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
+- add ftp support for Squeak' id 'b30549fa-52cb-424e-a7aa-329b15152b47' date '29 December 2009' time '4:17:21 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.3' message '- needs #initialize method' id 'b0033f12-24a1-4373-8a2c-211ccb6d061e' date '12 October 2009' time '1:30:44 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.2' message '- implement platform utility methods' id 'f4ca5554-cf53-4251-8066-5c2ae813ab09' date '12 October 2009' time '1:28:37 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.1' message '- Squeak-specific metacello support' id '7045edec-ac01-4485-bd21-efac82f0c9ef' date '9 August 2009' time '11:13:57 am' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
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/...n/instance/setAuthorInMetacelloConfig..st → ...n/instance/setAuthorInMetacelloConfig..st b/...n/instance/setAuthorInMetacelloConfig..st → ...n/instance/setAuthorInMetacelloConfig..st
@@ -1,4 +1,4 @@
-*metacello-platform
+*Metacello-Squeak6Compatibility-*metacello-platform
 setAuthorInMetacelloConfig: aMetacelloConfig
 
 	aMetacelloConfig setAuthorWithBlock: self
diff --git a/...instance/setBlessingInMetacelloConfig..st → ...instance/setBlessingInMetacelloConfig..st b/...instance/setBlessingInMetacelloConfig..st → ...instance/setBlessingInMetacelloConfig..st
@@ -1,4 +1,4 @@
-*metacello-platform
+*Metacello-Squeak6Compatibility-*metacello-platform
 setBlessingInMetacelloConfig: aMetacelloConfig
 
 	aMetacelloConfig setBlessingWithBlock: self
diff --git a/...tance/setDescriptionInMetacelloConfig..st → ...tance/setDescriptionInMetacelloConfig..st b/...tance/setDescriptionInMetacelloConfig..st → ...tance/setDescriptionInMetacelloConfig..st
@@ -1,4 +1,4 @@
-*metacello-platform
+*Metacello-Squeak6Compatibility-*metacello-platform
 setDescriptionInMetacelloConfig: aMetacelloConfig
 
 	aMetacelloConfig setDescriptionWithBlock: self
diff --git a/...ance/setPackage.withInMetacelloConfig..st → ...ance/setPackage.withInMetacelloConfig..st b/...ance/setPackage.withInMetacelloConfig..st → ...ance/setPackage.withInMetacelloConfig..st
@@ -1,4 +1,4 @@
-*metacello-platform
+*Metacello-Squeak6Compatibility-*metacello-platform
 setPackage: aString withInMetacelloConfig: aMetacelloConfig
 
 	aMetacelloConfig setPackage: aString withBlock: self
diff --git a/...ance/setProject.withInMetacelloConfig..st → ...ance/setProject.withInMetacelloConfig..st b/...ance/setProject.withInMetacelloConfig..st → ...ance/setProject.withInMetacelloConfig..st
@@ -1,4 +1,4 @@
-*metacello-platform
+*Metacello-Squeak6Compatibility-*metacello-platform
 setProject: aString withInMetacelloConfig: aMetacelloConfig
 
 	aMetacelloConfig setProject: aString withBlock: self
diff --git a/...nstance/setTimestampInMetacelloConfig..st → ...nstance/setTimestampInMetacelloConfig..st b/...nstance/setTimestampInMetacelloConfig..st → ...nstance/setTimestampInMetacelloConfig..st
@@ -1,4 +1,4 @@
-*metacello-platform
+*Metacello-Squeak6Compatibility-*metacello-platform
 setTimestampInMetacelloConfig: aMetacelloConfig
 
 	aMetacelloConfig setTimestampWithBlock: self
diff --git a/...stance/valueSupplyingMetacelloAnswers..st → ...stance/valueSupplyingMetacelloAnswers..st b/...stance/valueSupplyingMetacelloAnswers..st → ...stance/valueSupplyingMetacelloAnswers..st
@@ -1,4 +1,4 @@
-*metacello-platform
+*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"

diff --git a/...ckContext.extension/methodProperties.json → ...ckContext.extension/methodProperties.json b/...ckContext.extension/methodProperties.json → ...ckContext.extension/methodProperties.json
diff --git a/...ge/BlockContext.extension/properties.json → ...ge/BlockContext.extension/properties.json b/...ge/BlockContext.extension/properties.json → ...ge/BlockContext.extension/properties.json
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