Issue #4: GEMSTONE is defined by defineCustomEnvVars in stones spec .…

….. remove from scripts and make sure the spots where GEMSTONE is needed are covered
GsDevKit · Jun 1, 2023 · 1f26802 · 1f26802
1 parent 21b5dbc
commit 1f26802
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 5 deletions.
diff --git a/bin/deleteStone.solo b/bin/deleteStone.solo
@@ -79,7 +79,6 @@ doit
 		ifTrue: [ self error: 'Expected a positional argument: <stone-name>' ].
 	stoneName := self positionalArgs at: 1.
 	stoneSpec := stonesRegistry stoneNamed: stoneName.
-	System gemEnvironmentVariable: 'GEMSTONE' put: stoneSpec gemstonePath.
 	stonesRegistry destroyStoneStructureFor: stoneName.
-	^ stonesRegistry
+	^ self noResult
 %
diff --git a/bin/startStone.solo b/bin/startStone.solo
@@ -106,7 +106,6 @@ doit
 				ifNil: [ self error: '--registry option must be specified when <stone-name> is specified' ].
 			stonesRegistry := registryClass stonesRegistryNamed: self registry.
 			stoneSpec := stonesRegistry stoneNamed: stoneName ].
-	System gemEnvironmentVariable: 'GEMSTONE' put: stoneSpec gemstonePath.
 	stoneSpec startStone: self withSuperDoitOptions: true.
 	self wait
 		ifNotNil: [:waitTime |

diff --git a/bin/stopStone.solo b/bin/stopStone.solo
@@ -104,7 +104,6 @@ doit
 				ifNil: [ self error: '--registry option must be specified when <stone-name> is specified' ].
 			stonesRegistry := registryClass stonesRegistryNamed: self registry.
 			stoneSpec := stonesRegistry stoneNamed: stoneName ].
-	System gemEnvironmentVariable: 'GEMSTONE' put: stoneSpec gemstonePath.
 	stoneSpec stopStone: self withSuperDoitOptions: true.
 	^ self noResult
 %
diff --git a/...evKit_stones-Core.package/GDKStoneSpec.class/instance/startStone.withSuperDoitOptions..st b/...evKit_stones-Core.package/GDKStoneSpec.class/instance/startStone.withSuperDoitOptions..st
@@ -25,9 +25,9 @@ startStone: superDoitScriptOrNil withSuperDoitOptions: superDoitOptionsBoolean
 				'======  ' , scriptPath , ' starting stone at ' , DateAndTime now printString;
 		lf;
 		lf.
-	self defineCustomEnvVars.
 	stoneLogFile := (self rootDir / self stoneDirectorySpec logs / self stoneName
 		, 'log') pathString.
+	self defineCustomEnvVars.
 	[ 
 	arrayOfOutputs := (Rowan globalNamed: 'GsStartStone')
 		startStone: self stoneName

diff --git a/...DevKit_stones-Core.package/GDKStoneSpec.class/instance/stopStone.withSuperDoitOptions..st b/...DevKit_stones-Core.package/GDKStoneSpec.class/instance/stopStone.withSuperDoitOptions..st
@@ -21,6 +21,7 @@ stopStone: superDoitScriptOrNil withSuperDoitOptions: superDoitOptionsBoolean
 		lf;
 		lf.
 	exitStatus := 0.
+	self defineCustomEnvVars.
 	[ 
 	arrayOfOutputs := (Rowan globalNamed: 'GsStopStone')
 		stopStone: self stoneName

diff --git a/src/GsDevKit_stones-Core.package/GDKStoneSpec.class/instance/waitStone..st b/src/GsDevKit_stones-Core.package/GDKStoneSpec.class/instance/waitStone..st
@@ -4,6 +4,7 @@ waitStone: timeout
 
 	| exitStatus |
 	exitStatus := 0.
+	self defineCustomEnvVars.
 	[ 
 	(Rowan globalNamed: 'GsWaitStone')
 		waitForStoneName: self stoneName