Issue #321: copy GsDevKit-Core packages to their new home and adjust …

…scripts so they are loaded into solo scripts that need them ...
GsDevKit · Aug 17, 2021 · 288af99 · 288af99
1 parent e5aa151
commit 288af99
Show file tree

Hide file tree

Showing 9 changed files with 126 additions and 10 deletions.
diff --git a/shared/gemstone/bin/restartnetldi b/shared/gemstone/bin/restartnetldi
@@ -16,6 +16,23 @@ EXAMPLES
   $basename myStoneName
 -----
 %
+projectshome
+$GS_HOME/shared/gemstone/repos
+%
+specs
+[
+RwLoadSpecificationV2 {
+	#specName : 'GsDevKit_SuperDoit',
+	#projectName : 'GsDevKit_SuperDoit',
+	#diskUrl : 'file:$GS_HOME/shared/gemstone/repos/GsDevKit_SuperDoit',
+	#projectSpecFile : 'rowan/project.ston',
+	#componentNames : [
+		'GsDevKit'
+	],
+	#comment : 'loads GsDevKit support code in support of GsDevKit_home superDoit scripts'
+}
+]
+%
 method
 restartNetldi
 	"If GemStone version if >= 3.3 netldi supports restarting with -r.
@@ -86,7 +103,7 @@ sessionDescriptionFor: aStoneName ifAbsent: absentBlock
 	sessionDescriptionReference := self sessionDescriptionHome / aStoneName.
 	sessionDescriptionReference exists
 		ifFalse: [ ^ absentBlock value: sessionDescriptionReference ].
-	^ TDSessionDescription importFrom: sessionDescriptionReference pathString
+	^ (self globalNamed: 'TDSessionDescription') importFrom: sessionDescriptionReference pathString
 %
 method
 sessionDescriptionHome
@@ -114,7 +131,7 @@ gs_stoneDirectory
 %
 method
 stoneInfoClass
-	^ GsDevKitStoneInfo
+	^ (self globalNamed: 'GsDevKitStoneInfo')
 %
 method
 stoneInfoFilename
@@ -144,6 +161,7 @@ doit
 			withStatus: 1 "does not return" ].
 %
 doit
-		self restartNetldi.
-		^ self noResult
+	self preDoitSpecLoad.	"load the GsDevKit_SuperDoit project from spec"
+	self restartNetldi.
+	^ self noResult
 %
diff --git a/shared/gemstone/bin/startnetldi b/shared/gemstone/bin/startnetldi
@@ -40,6 +40,23 @@ EXAMPLES
   $basename -g myStoneName -A
 -----
 %
+projectshome
+$GS_HOME/shared/gemstone/repos
+%
+specs
+[
+RwLoadSpecificationV2 {
+	#specName : 'GsDevKit_SuperDoit',
+	#projectName : 'GsDevKit_SuperDoit',
+	#diskUrl : 'file:$GS_HOME/shared/gemstone/repos/GsDevKit_SuperDoit',
+	#projectSpecFile : 'rowan/project.ston',
+	#componentNames : [
+		'GsDevKit'
+	],
+	#comment : 'loads GsDevKit support code in support of GsDevKit_home superDoit scripts'
+}
+]
+%
 method
 startNetldi
 	| netldiArgs result |
@@ -107,7 +124,7 @@ sessionDescriptionFor: aStoneName ifAbsent: absentBlock
 	sessionDescriptionReference := self sessionDescriptionHome / aStoneName.
 	sessionDescriptionReference exists
 		ifFalse: [ ^ absentBlock value: sessionDescriptionReference ].
-	^ TDSessionDescription importFrom: sessionDescriptionReference pathString
+	^ (self globalNamed: 'TDSessionDescription') importFrom: sessionDescriptionReference pathString
 %
 method
 sessionDescriptionHome
@@ -131,7 +148,7 @@ gs_stoneDirectory
 %
 method
 stoneInfoClass
-	^ GsDevKitStoneInfo
+	^ (self globalNamed: 'GsDevKitStoneInfo')
 %
 method
 stoneInfoFilename

diff --git a/shared/gemstone/bin/startstone b/shared/gemstone/bin/startstone
@@ -40,6 +40,23 @@ EXAMPLES
   $basename -w myStoneName
 -----
 %
+projectshome
+$GS_HOME/shared/gemstone/repos
+%
+specs
+[
+RwLoadSpecificationV2 {
+	#specName : 'GsDevKit_SuperDoit',
+	#projectName : 'GsDevKit_SuperDoit',
+	#diskUrl : 'file:$GS_HOME/shared/gemstone/repos/GsDevKit_SuperDoit',
+	#projectSpecFile : 'rowan/project.ston',
+	#componentNames : [
+		'GsDevKit'
+	],
+	#comment : 'loads GsDevKit support code in support of GsDevKit_home superDoit scripts'
+}
+]
+%
 method
 startStone
 	| result |
@@ -79,7 +96,7 @@ gs_stoneDirectory
 %
 method
 stoneInfoClass
-	^ GsDevKitStoneInfo
+	^ (self globalNamed: 'GsDevKitStoneInfo')
 %
 method
 stoneInfoFilename

diff --git a/shared/gemstone/bin/stopnetldi b/shared/gemstone/bin/stopnetldi
@@ -16,6 +16,23 @@ EXAMPLES
   $basename myStoneName
 -----
 %
+projectshome
+$GS_HOME/shared/gemstone/repos
+%
+specs
+[
+RwLoadSpecificationV2 {
+	#specName : 'GsDevKit_SuperDoit',
+	#projectName : 'GsDevKit_SuperDoit',
+	#diskUrl : 'file:$GS_HOME/shared/gemstone/repos/GsDevKit_SuperDoit',
+	#projectSpecFile : 'rowan/project.ston',
+	#componentNames : [
+		'GsDevKit'
+	],
+	#comment : 'loads GsDevKit support code in support of GsDevKit_home superDoit scripts'
+}
+]
+%
 method
 stopNetldi
 	| sess stoneInfo netldiArgs result |
@@ -54,7 +71,7 @@ sessionDescriptionFor: aStoneName ifAbsent: absentBlock
 	sessionDescriptionReference := self sessionDescriptionHome / aStoneName.
 	sessionDescriptionReference exists
 		ifFalse: [ ^ absentBlock value: sessionDescriptionReference ].
-	^ TDSessionDescription importFrom: sessionDescriptionReference pathString
+	^ (self globalNamed: 'TDSessionDescription') importFrom: sessionDescriptionReference pathString
 %
 method
 sessionDescriptionHome
@@ -74,7 +91,7 @@ gs_stoneDirectory
 %
 method
 stoneInfoClass
-	^ GsDevKitStoneInfo
+	^ (self globalNamed: 'GsDevKitStoneInfo')
 %
 method
 stoneInfoFilename

diff --git a/shared/gemstone/bin/stopstone b/shared/gemstone/bin/stopstone
@@ -26,6 +26,23 @@ EXAMPLES
   $basename -b myStoneName
 -----
 %
+projectshome
+$GS_HOME/shared/gemstone/repos
+%
+specs
+[
+RwLoadSpecificationV2 {
+	#specName : 'GsDevKit_SuperDoit',
+	#projectName : 'GsDevKit_SuperDoit',
+	#diskUrl : 'file:$GS_HOME/shared/gemstone/repos/GsDevKit_SuperDoit',
+	#projectSpecFile : 'rowan/project.ston',
+	#componentNames : [
+		'GsDevKit'
+	],
+	#comment : 'loads GsDevKit support code in support of GsDevKit_home superDoit scripts'
+}
+]
+%
 method
 stopStone
 	| result |
@@ -77,7 +94,7 @@ stoneName
 %
 method
 stoneInfoClass
-	^ GsDevKitStoneInfo
+	^ (self globalNamed: 'GsDevKitStoneInfo')
 %
 method
 stoneInfoFilename

diff --git a/shared/gemstone/repos/GsDevKit_SuperDoit/rowan/components/GsDevKit.ston b/shared/gemstone/repos/GsDevKit_SuperDoit/rowan/components/GsDevKit.ston
@@ -0,0 +1,10 @@
+RwSimpleProjectLoadComponentV2 {
+	#name : 'GsDevKit',
+	#condition : 'common',
+	#projectNames : [ ],
+	#componentNames : [ ],
+	#packageNames : [
+		'GsDevKit-Core'
+	],
+	#comment : ''
+}
diff --git a/shared/gemstone/repos/GsDevKit_SuperDoit/rowan/project.ston b/shared/gemstone/repos/GsDevKit_SuperDoit/rowan/project.ston
@@ -0,0 +1,10 @@
+RwProjectSpecificationV2 {
+	#specName : 'project',
+	#projectSpecPath : 'rowan',
+	#componentsPath : 'rowan/components',
+	#packagesPath : 'rowan/src',
+	#projectsPath : 'rowan/projects',
+	#specsPath : 'rowan/specs',
+	#packageFormat : 'filetree',
+	#comment : ''
+}
diff --git a/shared/gemstone/repos/GsDevKit_SuperDoit/rowan/projects/README.md b/shared/gemstone/repos/GsDevKit_SuperDoit/rowan/projects/README.md
diff --git a/shared/gemstone/repos/GsDevKit_SuperDoit/rowan/specs/GsDevKit.ston b/shared/gemstone/repos/GsDevKit_SuperDoit/rowan/specs/GsDevKit.ston
@@ -0,0 +1,10 @@
+RwLoadSpecificationV2 {
+	#specName : 'GsDevKit_SuperDoit',
+	#projectName : 'GsDevKit_SuperDoit',
+	#diskUrl : 'file:$GS_HOME/shared/gemstone/repos/GsDevKit_SuperDoit',
+	#projectSpecFile : 'rowan/project.ston',
+	#componentNames : [
+		'GsDevKit'
+	],
+	#comment : 'loads GsDevKit support code in support of GsDevKit_home superDoit scripts'
+}