Reorganize and reduce compatibility packages

MCRepositoryGroup methods have been added in Squeak 6.0, and they were ported back to Squeak 5.3. So the extensions are only needed in Squeak 5.2 and below. Rename the package to SquotCompatibility-Squeak52 accordingly. Remove packages for Pharo and Squeak 6.0 since they are not used and just add complexity at the moment. Ref #349
hpi-swa · Jul 11, 2022 · 4097f80 · 4097f80
1 parent 4c2e349
commit 4097f80
Show file tree

Hide file tree

Showing 32 changed files with 12 additions and 71 deletions.
diff --git a/.squot b/.squot
@@ -1,13 +1,11 @@
 OrderedDictionary {
 	'src/VersionControl.package' : #SquotCypressCodeSerializer,
-	'src/SquotCompatibility-Pharo.package' : #SquotCypressCodeSerializer,
+	'src/SquotCompatibility-SqueakCommon.package' : #SquotCypressCodeSerializer,
+	'src/SquotCompatibility-Squeak52.package' : #SquotCypressCodeSerializer,
 	'src/Squot.package' : #SquotCypressCodeSerializer,
 	'src/FileSystem-Git.package' : #SquotCypressCodeSerializer,
 	'src/Squit.package' : #SquotCypressCodeSerializer,
 	'src/BaselineOfSquot.package' : #SquotCypressCodeSerializer,
 	'src/SquotTonel-Core.package' : #SquotCypressCodeSerializer,
-	'src/SquotTonel-Tests.package' : #SquotCypressCodeSerializer,
-	'src/SquotCompatibility-Squeak50.package' : #SquotCypressCodeSerializer,
-	'src/SquotCompatibility-Squeak60.package' : #SquotCypressCodeSerializer,
-	'src/SquotCompatibility-SqueakCommon.package' : #SquotCypressCodeSerializer
+	'src/SquotTonel-Tests.package' : #SquotCypressCodeSerializer
 }
diff --git a/src/BaselineOfSquot.package/.squot-contents b/src/BaselineOfSquot.package/.squot-contents
@@ -1,7 +1,7 @@
 SquotTrackedObjectMetadata {
 	#objectClassName : #PackageInfo,
 	#id : UUID [ '2e6bf85bea1d114fb70219ff89791241' ],
-	#objectsReplacedByNames : true,
 	#slotOverrides : { },
+	#objectsReplacedByNames : true,
 	#serializer : #SquotCypressCodeSerializer
 }
diff --git a/src/BaselineOfSquot.package/BaselineOfSquot.class/instance/baseline..st b/src/BaselineOfSquot.package/BaselineOfSquot.class/instance/baseline..st
@@ -50,22 +50,12 @@ baseline: spec
 			group: 'default' with: #('Squit' 'Squot' 'SquotTonel-Core');
 			group: 'tests' with: #('default' 'SquotTonel-Tests'). ].
 
-	spec for: #pharo do: [
-		spec package: 'SquotCompatibility-Pharo'.
-		spec package: 'Squot' with: [
-			spec includes: 'SquotCompatibility-Pharo']].
-
 	spec for: #'squeakCommon' do: [
 		spec package: 'SquotCompatibility-SqueakCommon'.
 		spec package: 'Squot' with: [
 			spec includes: 'SquotCompatibility-SqueakCommon']].
 
-	spec for: #'squeak5.x' do: [
-		spec package: 'SquotCompatibility-Squeak50'.
-		spec package: 'Squot' with: [
-			spec includes: 'SquotCompatibility-Squeak50']].
-
-	spec for: #'squeak6.x' do: [
-		spec package: 'SquotCompatibility-Squeak60'.
+	spec for: #(#'squeak5.0.x' #'squeak5.1.x' #'squeak5.2.x' "not for squeak5.3") do: [
+		spec package: 'SquotCompatibility-Squeak52'.
 		spec package: 'Squot' with: [
-			spec includes: 'SquotCompatibility-Squeak60']].
+			spec includes: 'SquotCompatibility-Squeak52']].
diff --git a/src/BaselineOfSquot.package/BaselineOfSquot.class/methodProperties.json b/src/BaselineOfSquot.package/BaselineOfSquot.class/methodProperties.json
@@ -2,5 +2,5 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "ct 10/30/2021 22:23",
+		"baseline:" : "jr 7/11/2022 17:59",
 		"projectClass" : "jr 5/4/2017 17:25" } }
diff --git a/src/SquotCompatibility-Pharo.package/.squot-contents b/src/SquotCompatibility-Pharo.package/.squot-contents
diff --git a/src/SquotCompatibility-Pharo.package/README.md b/src/SquotCompatibility-Pharo.package/README.md
diff --git a/src/SquotCompatibility-Pharo.package/monticello.meta/categories.st b/src/SquotCompatibility-Pharo.package/monticello.meta/categories.st
diff --git a/src/SquotCompatibility-Squeak50.package/.filetree b/src/SquotCompatibility-Squeak50.package/.filetree
diff --git a/src/SquotCompatibility-Squeak50.package/monticello.meta/categories.st b/src/SquotCompatibility-Squeak50.package/monticello.meta/categories.st
diff --git a/src/SquotCompatibility-Squeak50.package/monticello.meta/initializers.st b/src/SquotCompatibility-Squeak50.package/monticello.meta/initializers.st
diff --git a/src/SquotCompatibility-Squeak50.package/properties.json b/src/SquotCompatibility-Squeak50.package/properties.json
diff --git a/...quotCompatibility-Pharo.package/.filetree → ...tCompatibility-Squeak52.package/.filetree b/...quotCompatibility-Pharo.package/.filetree → ...tCompatibility-Squeak52.package/.filetree
diff --git a/...tibility-Squeak50.package/.squot-contents → ...tibility-Squeak52.package/.squot-contents b/...tibility-Squeak50.package/.squot-contents → ...tibility-Squeak52.package/.squot-contents
diff --git a/...sion/instance/cacheAllFileNamesDuring..st → ...sion/instance/cacheAllFileNamesDuring..st b/...sion/instance/cacheAllFileNamesDuring..st → ...sion/instance/cacheAllFileNamesDuring..st
@@ -1,4 +1,4 @@
-*SquotCompatibility-Squeak50-private
+*SquotCompatibility-Squeak52-private
 cacheAllFileNamesDuring: aBlock
 	^ (repositories
 		inject: aBlock

diff --git a/...sitoryGroup.extension/instance/isValid.st → ...sitoryGroup.extension/instance/isValid.st b/...sitoryGroup.extension/instance/isValid.st → ...sitoryGroup.extension/instance/isValid.st
@@ -1,4 +1,4 @@
-*SquotCompatibility-Squeak50-testing
+*SquotCompatibility-Squeak52-testing
 isValid
 
 	^ repositories allSatisfy: #isValid
diff --git a/...toryGroup.extension/methodProperties.json → ...toryGroup.extension/methodProperties.json b/...toryGroup.extension/methodProperties.json → ...toryGroup.extension/methodProperties.json
diff --git a/...RepositoryGroup.extension/properties.json → ...RepositoryGroup.extension/properties.json b/...RepositoryGroup.extension/properties.json → ...RepositoryGroup.extension/properties.json
diff --git a/...nsion/instance/packageNamed.ifPresent..st → ...nsion/instance/packageNamed.ifPresent..st b/...nsion/instance/packageNamed.ifPresent..st → ...nsion/instance/packageNamed.ifPresent..st
@@ -1,3 +1,3 @@
-*SquotCompatibility-Squeak50
+*SquotCompatibility-Squeak52
 packageNamed: aString ifPresent: aBlock
 	^ packages at: aString ifPresent: aBlock
diff --git a/...Organizer.extension/methodProperties.json → ...Organizer.extension/methodProperties.json b/...Organizer.extension/methodProperties.json → ...Organizer.extension/methodProperties.json
diff --git a/...ackageOrganizer.extension/properties.json → ...ackageOrganizer.extension/properties.json b/...ackageOrganizer.extension/properties.json → ...ackageOrganizer.extension/properties.json
diff --git a/src/SquotCompatibility-Squeak52.package/monticello.meta/categories.st b/src/SquotCompatibility-Squeak52.package/monticello.meta/categories.st
@@ -0,0 +1 @@
+SystemOrganization addCategory: #'SquotCompatibility-Squeak52'!
diff --git a/...o.package/monticello.meta/initializers.st → ...2.package/monticello.meta/initializers.st b/...o.package/monticello.meta/initializers.st → ...2.package/monticello.meta/initializers.st
diff --git a/...mpatibility-Pharo.package/properties.json → ...tibility-Squeak52.package/properties.json b/...mpatibility-Pharo.package/properties.json → ...tibility-Squeak52.package/properties.json
diff --git a/src/SquotCompatibility-Squeak60.package/.filetree b/src/SquotCompatibility-Squeak60.package/.filetree
diff --git a/src/SquotCompatibility-Squeak60.package/.squot-contents b/src/SquotCompatibility-Squeak60.package/.squot-contents
diff --git a/...ibility-Squeak60.package/MCRepositoryGroup.extension/instance/cacheAllFileNamesDuring..st b/...ibility-Squeak60.package/MCRepositoryGroup.extension/instance/cacheAllFileNamesDuring..st
diff --git a/src/SquotCompatibility-Squeak60.package/MCRepositoryGroup.extension/instance/isValid.st b/src/SquotCompatibility-Squeak60.package/MCRepositoryGroup.extension/instance/isValid.st
diff --git a/src/SquotCompatibility-Squeak60.package/MCRepositoryGroup.extension/methodProperties.json b/src/SquotCompatibility-Squeak60.package/MCRepositoryGroup.extension/methodProperties.json
diff --git a/src/SquotCompatibility-Squeak60.package/MCRepositoryGroup.extension/properties.json b/src/SquotCompatibility-Squeak60.package/MCRepositoryGroup.extension/properties.json
diff --git a/src/SquotCompatibility-Squeak60.package/monticello.meta/categories.st b/src/SquotCompatibility-Squeak60.package/monticello.meta/categories.st
diff --git a/src/SquotCompatibility-Squeak60.package/monticello.meta/initializers.st b/src/SquotCompatibility-Squeak60.package/monticello.meta/initializers.st
diff --git a/src/SquotCompatibility-Squeak60.package/properties.json b/src/SquotCompatibility-Squeak60.package/properties.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		SystemOrganization addCategory: #'SquotCompatibility-Squeak52'!