Issue #1: tODE upgrade for 336 is now passing .. was missing obsolete…

… pragmas in Object methods
GsDevKit · Mar 6, 2019 · a6e4aee · a6e4aee
1 parent 54735f1
commit a6e4aee
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 1 deletion.
diff --git a/gsdevkit/bin/installTODE b/gsdevkit/bin/installTODE
@@ -0,0 +1,31 @@
+# arg1 is the content id: GLASS, GLASS1, TODE
+# arg2 is the GemStone version id: 3215, 339, 343
+#
+# Sequence:
+#
+#	createStone battery_339 3.3.9
+# installImage GLASS1 339 
+#	upgradeImage GLASS1 339 GLASS1
+# upgradePreGsDevKitImage GLASS1 339
+#	---
+#	installTODE GLASS1 339
+#
+set -e
+. defStone.env
+export vers="3.5.0_g"
+
+rm -f *.log *.out
+
+contents="$1"	# GLASS, GLASS1, TODE
+version="$2"	# 3215, 339, 343
+
+newExtent -s snapshots/extent0_preparedGsDevKitImage_${contents}_${version}.dbf $GEMSTONE_NAME
+
+todeLoad $GEMSTONE_NAME
+
+stopStone $GEMSTONE_NAME
+cp extents/extent0.dbf snapshots/extent0_upgradedTODE_${contents}_${version}.dbf
+startStone $GEMSTONE_NAME
+
+startTopaz $GEMSTONE_NAME -lq < $GS_HOME/shared/repos/GsDevKit_upgradeDevKitImage/bin/runImageTests
+
diff --git a/rowan/src/GsDevKit_upgradeDevKitImage-Common/GsuAbstractGsDevKit.class.st b/rowan/src/GsDevKit_upgradeDevKitImage-Common/GsuAbstractGsDevKit.class.st
@@ -39,6 +39,18 @@ GsuAbstractGsDevKit >> _currentUserGlobals [
 GsuAbstractGsDevKit >> _defaultBootstrapApplicationLoadSpecs [
 	"formerly BootstrapApplicationLoadSpecs, bootstrap GLASS configuration name, version, load spec and directory path"
 
+	self _todeLoaded
+		ifTrue: [
+			self log: '	load BaselineOfMetacello BaselineOfTode'.
+			"first update Metacello and then update Tode"
+			^{
+				{
+					'Metacello'. 
+				}.
+				{
+					'Tode'. 
+				}.
+			} ].
 	self _glass1Loaded
 		ifTrue: [
 			self log: '	load BaselineOfMetacello BaselineOfGLASS1'.
@@ -190,6 +202,11 @@ self log: '	registration loaded: ', res printString.
 	^ false
 ]
 
+{ #category : 'private' }
+GsuAbstractGsDevKit >> _todeLoaded [
+  ^ self _standardBaselineLoaded: 'BaselineOfTode'
+]
+
 { #category : 'logging' }
 GsuAbstractGsDevKit >> bannerLog: aString [
 

diff --git a/rowan/src/GsDevKit_upgradeDevKitImage-Core/GsuAbstractGsDevKitUpgrade.class.st b/rowan/src/GsDevKit_upgradeDevKitImage-Core/GsuAbstractGsDevKitUpgrade.class.st
@@ -652,7 +652,7 @@ GsuAbstractGsDevKitUpgrade >> prepareImage_pragmas_user [
 	self log: '	Finding methods with pragmas for user: ', self upgradeUserName printString.
 	self log: '		Pragma ', (self _globalNamed: 'Pragma') asOop printString.
 	self log: '		System myUserProfile: ', System myUserProfile userId.
-	((ClassOrganizer newWithRoot: Object forUserId: self upgradeUserName) allSubclassesOf: Object)
+	(((ClassOrganizer newWithRoot: Object forUserId: self upgradeUserName) allSubclassesOf: Object), { Object })
 		do: [ :cls | 
 		  {cls.
 		  (cls class)}