Skip to content

Commit 288af99

Browse files
dalehenrichdalehenrich
committed
Issue #321: copy GsDevKit-Core packages to their new home and adjust scripts so they are loaded into solo scripts that need them ...
1 parent e5aa151 commit 288af99

File tree

9 files changed

+126
-10
lines changed

9 files changed

+126
-10
lines changed

‎shared/gemstone/bin/restartnetldi

+22-4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,23 @@ EXAMPLES
1616
$basename myStoneName
1717
-----
1818
%
19+
projectshome
20+
$GS_HOME/shared/gemstone/repos
21+
%
22+
specs
23+
[
24+
RwLoadSpecificationV2 {
25+
#specName : 'GsDevKit_SuperDoit',
26+
#projectName : 'GsDevKit_SuperDoit',
27+
#diskUrl : 'file:$GS_HOME/shared/gemstone/repos/GsDevKit_SuperDoit',
28+
#projectSpecFile : 'rowan/project.ston',
29+
#componentNames : [
30+
'GsDevKit'
31+
],
32+
#comment : 'loads GsDevKit support code in support of GsDevKit_home superDoit scripts'
33+
}
34+
]
35+
%
1936
method
2037
restartNetldi
2138
"If GemStone version if >= 3.3 netldi supports restarting with -r.
@@ -86,7 +103,7 @@ sessionDescriptionFor: aStoneName ifAbsent: absentBlock
86103
sessionDescriptionReference := self sessionDescriptionHome / aStoneName.
87104
sessionDescriptionReference exists
88105
ifFalse: [ ^ absentBlock value: sessionDescriptionReference ].
89-
^ TDSessionDescription importFrom: sessionDescriptionReference pathString
106+
^ (self globalNamed: 'TDSessionDescription') importFrom: sessionDescriptionReference pathString
90107
%
91108
method
92109
sessionDescriptionHome
@@ -114,7 +131,7 @@ gs_stoneDirectory
114131
%
115132
method
116133
stoneInfoClass
117-
^ GsDevKitStoneInfo
134+
^ (self globalNamed: 'GsDevKitStoneInfo')
118135
%
119136
method
120137
stoneInfoFilename
@@ -144,6 +161,7 @@ doit
144161
withStatus: 1 "does not return" ].
145162
%
146163
doit
147-
self restartNetldi.
148-
^ self noResult
164+
self preDoitSpecLoad. "load the GsDevKit_SuperDoit project from spec"
165+
self restartNetldi.
166+
^ self noResult
149167
%

‎shared/gemstone/bin/startnetldi

+19-2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,23 @@ EXAMPLES
4040
$basename -g myStoneName -A
4141
-----
4242
%
43+
projectshome
44+
$GS_HOME/shared/gemstone/repos
45+
%
46+
specs
47+
[
48+
RwLoadSpecificationV2 {
49+
#specName : 'GsDevKit_SuperDoit',
50+
#projectName : 'GsDevKit_SuperDoit',
51+
#diskUrl : 'file:$GS_HOME/shared/gemstone/repos/GsDevKit_SuperDoit',
52+
#projectSpecFile : 'rowan/project.ston',
53+
#componentNames : [
54+
'GsDevKit'
55+
],
56+
#comment : 'loads GsDevKit support code in support of GsDevKit_home superDoit scripts'
57+
}
58+
]
59+
%
4360
method
4461
startNetldi
4562
| netldiArgs result |
@@ -107,7 +124,7 @@ sessionDescriptionFor: aStoneName ifAbsent: absentBlock
107124
sessionDescriptionReference := self sessionDescriptionHome / aStoneName.
108125
sessionDescriptionReference exists
109126
ifFalse: [ ^ absentBlock value: sessionDescriptionReference ].
110-
^ TDSessionDescription importFrom: sessionDescriptionReference pathString
127+
^ (self globalNamed: 'TDSessionDescription') importFrom: sessionDescriptionReference pathString
111128
%
112129
method
113130
sessionDescriptionHome
@@ -131,7 +148,7 @@ gs_stoneDirectory
131148
%
132149
method
133150
stoneInfoClass
134-
^ GsDevKitStoneInfo
151+
^ (self globalNamed: 'GsDevKitStoneInfo')
135152
%
136153
method
137154
stoneInfoFilename

‎shared/gemstone/bin/startstone

+18-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,23 @@ EXAMPLES
4040
$basename -w myStoneName
4141
-----
4242
%
43+
projectshome
44+
$GS_HOME/shared/gemstone/repos
45+
%
46+
specs
47+
[
48+
RwLoadSpecificationV2 {
49+
#specName : 'GsDevKit_SuperDoit',
50+
#projectName : 'GsDevKit_SuperDoit',
51+
#diskUrl : 'file:$GS_HOME/shared/gemstone/repos/GsDevKit_SuperDoit',
52+
#projectSpecFile : 'rowan/project.ston',
53+
#componentNames : [
54+
'GsDevKit'
55+
],
56+
#comment : 'loads GsDevKit support code in support of GsDevKit_home superDoit scripts'
57+
}
58+
]
59+
%
4360
method
4461
startStone
4562
| result |
@@ -79,7 +96,7 @@ gs_stoneDirectory
7996
%
8097
method
8198
stoneInfoClass
82-
^ GsDevKitStoneInfo
99+
^ (self globalNamed: 'GsDevKitStoneInfo')
83100
%
84101
method
85102
stoneInfoFilename

‎shared/gemstone/bin/stopnetldi

+19-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,23 @@ EXAMPLES
1616
$basename myStoneName
1717
-----
1818
%
19+
projectshome
20+
$GS_HOME/shared/gemstone/repos
21+
%
22+
specs
23+
[
24+
RwLoadSpecificationV2 {
25+
#specName : 'GsDevKit_SuperDoit',
26+
#projectName : 'GsDevKit_SuperDoit',
27+
#diskUrl : 'file:$GS_HOME/shared/gemstone/repos/GsDevKit_SuperDoit',
28+
#projectSpecFile : 'rowan/project.ston',
29+
#componentNames : [
30+
'GsDevKit'
31+
],
32+
#comment : 'loads GsDevKit support code in support of GsDevKit_home superDoit scripts'
33+
}
34+
]
35+
%
1936
method
2037
stopNetldi
2138
| sess stoneInfo netldiArgs result |
@@ -54,7 +71,7 @@ sessionDescriptionFor: aStoneName ifAbsent: absentBlock
5471
sessionDescriptionReference := self sessionDescriptionHome / aStoneName.
5572
sessionDescriptionReference exists
5673
ifFalse: [ ^ absentBlock value: sessionDescriptionReference ].
57-
^ TDSessionDescription importFrom: sessionDescriptionReference pathString
74+
^ (self globalNamed: 'TDSessionDescription') importFrom: sessionDescriptionReference pathString
5875
%
5976
method
6077
sessionDescriptionHome
@@ -74,7 +91,7 @@ gs_stoneDirectory
7491
%
7592
method
7693
stoneInfoClass
77-
^ GsDevKitStoneInfo
94+
^ (self globalNamed: 'GsDevKitStoneInfo')
7895
%
7996
method
8097
stoneInfoFilename

‎shared/gemstone/bin/stopstone

+18-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,23 @@ EXAMPLES
2626
$basename -b myStoneName
2727
-----
2828
%
29+
projectshome
30+
$GS_HOME/shared/gemstone/repos
31+
%
32+
specs
33+
[
34+
RwLoadSpecificationV2 {
35+
#specName : 'GsDevKit_SuperDoit',
36+
#projectName : 'GsDevKit_SuperDoit',
37+
#diskUrl : 'file:$GS_HOME/shared/gemstone/repos/GsDevKit_SuperDoit',
38+
#projectSpecFile : 'rowan/project.ston',
39+
#componentNames : [
40+
'GsDevKit'
41+
],
42+
#comment : 'loads GsDevKit support code in support of GsDevKit_home superDoit scripts'
43+
}
44+
]
45+
%
2946
method
3047
stopStone
3148
| result |
@@ -77,7 +94,7 @@ stoneName
7794
%
7895
method
7996
stoneInfoClass
80-
^ GsDevKitStoneInfo
97+
^ (self globalNamed: 'GsDevKitStoneInfo')
8198
%
8299
method
83100
stoneInfoFilename

‎shared/gemstone/repos/GsDevKit_SuperDoit/rowan/components/GsDevKit.ston

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
RwSimpleProjectLoadComponentV2 {
2+
#name : 'GsDevKit',
3+
#condition : 'common',
4+
#projectNames : [ ],
5+
#componentNames : [ ],
6+
#packageNames : [
7+
'GsDevKit-Core'
8+
],
9+
#comment : ''
10+
}

‎shared/gemstone/repos/GsDevKit_SuperDoit/rowan/project.ston

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
RwProjectSpecificationV2 {
2+
#specName : 'project',
3+
#projectSpecPath : 'rowan',
4+
#componentsPath : 'rowan/components',
5+
#packagesPath : 'rowan/src',
6+
#projectsPath : 'rowan/projects',
7+
#specsPath : 'rowan/specs',
8+
#packageFormat : 'filetree',
9+
#comment : ''
10+
}

‎shared/gemstone/repos/GsDevKit_SuperDoit/rowan/projects/README.md

Whitespace-only changes.

‎shared/gemstone/repos/GsDevKit_SuperDoit/rowan/specs/GsDevKit.ston

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
RwLoadSpecificationV2 {
2+
#specName : 'GsDevKit_SuperDoit',
3+
#projectName : 'GsDevKit_SuperDoit',
4+
#diskUrl : 'file:$GS_HOME/shared/gemstone/repos/GsDevKit_SuperDoit',
5+
#projectSpecFile : 'rowan/project.ston',
6+
#componentNames : [
7+
'GsDevKit'
8+
],
9+
#comment : 'loads GsDevKit support code in support of GsDevKit_home superDoit scripts'
10+
}

0 commit comments

Comments
 (0)