X Tutup
Skip to content

Commit d5864a7

Browse files
dalehenrichdalehenrich
authored
Merge pull request SeasideSt#20 from GsDevKit/issue_111
better all around solution for the gemstone kernel overrides for Issue SeasideSt#111
2 parents 70f88a7 + 60b064c commit d5864a7

File tree

32 files changed

+36
-174
lines changed

32 files changed

+36
-174
lines changed

‎repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ baselineGemStone: spec
7979
requires: #('Grease-GemStone-Core');
8080
postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
8181
spec
82-
for: #(#'gs3.3.x' #'gs3.4.x' #'gs3.5.x')
82+
for: #(#'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x')
8383
do: [
8484
spec
8585
package: 'Grease-GemStone-Core'
@@ -89,17 +89,26 @@ baselineGemStone: spec
8989
spec
9090
requires: #('Grease-GemStone-Core');
9191
postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
92+
spec
93+
for: #( #'gs3.5.4.x' #'gs3.5.5.x')
94+
do: [
95+
spec
96+
package: 'Grease-GemStone-Core'
97+
with: [ spec includes: #('Grease-GemStone-Kernelv354') ];
98+
package: 'Grease-GemStone-Kernelv354'
99+
with: [
100+
spec
101+
requires: #('Grease-GemStone-Core') ] ].
92102
spec
93103
for: #( #'gs3.6.x')
94104
do: [
95105
spec
96106
package: 'Grease-GemStone-Core'
97-
with: [ spec includes: #('Grease-GemStone360-Core') ];
98-
package: 'Grease-GemStone360-Core'
107+
with: [ spec includes: #('Grease-GemStone-Kernelv360') ];
108+
package: 'Grease-GemStone-Kernelv360'
99109
with: [
100110
spec
101-
requires: #('Grease-GemStone-Core');
102-
postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
111+
requires: #('Grease-GemStone-Core') ] ].
103112
spec
104113
for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x')
105114
do: [

‎repository/Grease-GemStone-Kernelv354.package/Class.extension/instance/comment.st‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
*grease-gemstone-kernelv354
2+
comment
3+
"override new 3.5.4 comment implementation (answers default GemStone class comment for
4+
class instead of nil) and restore pre-3.5.4 behavior (answer '' if no comment
5+
defined)"
6+
7+
"https://github.com/SeasideSt/Grease/issues/111"
8+
9+
^ self commentForFileout ifNil: [ '' ]

repository/Grease-GemStone360-Core.package/Class.extension/properties.json renamed to repository/Grease-GemStone-Kernelv354.package/Class.extension/properties.json

File renamed without changes.

‎repository/Grease-GemStone-Kernelv360.package/Class.extension/instance/comment.st‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
*grease-gemstone-kernelv360
2+
comment
3+
"override new 3.6.0 comment implementation (answers default GemStone class comment for
4+
class instead of nil) and restore pre-3.6.0 behavior (answer '' if no comment
5+
defined)"
6+
7+
"https://github.com/SeasideSt/Grease/issues/111"
8+
9+
^ self commentForFileout ifNil: [ '' ]

‎repository/Grease-GemStone-Kernelv360.package/Class.extension/properties.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{
2+
"name" : "Class" }

repository/Grease-GemStone360-Core.package/Exception.extension/instance/messageText.st renamed to repository/Grease-GemStone-Kernelv360.package/Exception.extension/instance/messageText.st

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
*grease-gemstone360-core
1+
*grease-gemstone-kernelv360
22
messageText
33
"override new 3.6.0 messageText implementation to restore pre-3.6.0 behavior"
44
"https://github.com/SeasideSt/Grease/issues/111"
5-
^ gsDetails
5+
^ gsDetails

repository/Grease-GemStone360-Core.package/Exception.extension/properties.json renamed to repository/Grease-GemStone-Kernelv360.package/Exception.extension/properties.json

File renamed without changes.

‎repository/Grease-GemStone360-Core.package/.filetree‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎repository/Grease-GemStone360-Core.package/Class.extension/instance/comment.st‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎repository/Grease-GemStone360-Core.package/Exception.extension/instance/greaseString.st‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)
X Tutup