Skip to content

Commit 00a7df6

Browse files
author
Johan Brichau
committed
Merge pull request SeasideSt#7 from GsDevKit/dev-1.1.12
Dev 1.1.12
2 parents 27ae1e2 + ed57cb0 commit 00a7df6

File tree

295 files changed

+1693
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

295 files changed

+1693
-151
lines changed
Lines changed: 83 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
baseline
22
baseline: spec
33
<baseline>
4-
spec
5-
for: #'common'
6-
do: [
7-
spec blessing: #'baseline'.
4+
5+
spec for: #'common' do: [
6+
spec blessing: #'baseline'.
87
spec
98
package: 'Grease-Core';
109
package: 'Grease-Tests-Core' with: [ spec requires: #('Grease-Core') ].
@@ -14,72 +13,75 @@ baseline: spec
1413
group: 'Slime' with: #('Core');
1514
group: 'Slime Tests' with: #('Core Tests');
1615
group: 'Tests' with: #('Core Tests' 'Slime Tests');
17-
group: 'default' with: #('Slime') ].
18-
spec
19-
for: #'pharo3.x'
20-
do: [
21-
spec
22-
package: 'Grease-Core'
23-
with: [ spec includes: #('Grease-Pharo30-Core') ];
24-
package: 'Grease-Tests-Core'
25-
with: [ spec includes: #('Grease-Tests-Pharo20-Core') ];
26-
package: 'Grease-Pharo30-Core'
27-
with: [ spec requires: #('Grease-Core') ];
28-
package: 'Grease-Tests-Pharo20-Core'
29-
with: [ spec requires: #('Grease-Tests-Core') ];
30-
package: 'Grease-Slime' with: [ spec requires: #('Grease-Core') ];
31-
package: 'Grease-Tests-Slime'
32-
with: [ spec requires: #('Grease-Slime') ].
33-
spec
34-
group: 'Slime' with: #('Grease-Slime');
35-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
36-
spec
37-
for: #'pharo2.x'
38-
do: [
39-
spec
40-
package: 'Grease-Core'
41-
with: [ spec includes: #('Grease-Pharo20-Core') ];
42-
package: 'Grease-Tests-Core'
43-
with: [ spec includes: #('Grease-Tests-Pharo20-Core') ];
44-
package: 'Grease-Pharo20-Core'
45-
with: [ spec requires: #('Grease-Core') ];
46-
package: 'Grease-Tests-Pharo20-Core'
47-
with: [ spec requires: #('Grease-Tests-Core') ].
48-
self slimeForSqueakPharo1xPharo2x: spec ].
49-
spec
50-
for: #'pharo1.x'
51-
do: [
16+
group: 'default' with: #('Slime')
17+
].
18+
19+
spec for: #'squeak' do: [
5220
self greaseCoreAndTestsForSqueakAndPharo1x: spec.
53-
self slimeForSqueakPharo1xPharo2x: spec ].
54-
spec
55-
for: #'pharo1.1'
56-
do: [
21+
self slimeForSqueakPharo1xPharo2x: spec
22+
].
23+
24+
spec for: #'pharo1.0' do: [
5725
spec
5826
package: 'Grease-Pharo-Core'
59-
with: [ spec includes: #('Grease-Pharo11-Core') ] ].
60-
spec
61-
for: #'pharo1.0'
62-
do: [
27+
with: [ spec includes: #('Grease-Pharo10-Core' 'Grease-Pharo11-Core') ]
28+
].
29+
30+
spec for: #'pharo1.x' do: [
31+
self greaseCoreAndTestsForSqueakAndPharo1x: spec.
32+
self slimeForSqueakPharo1xPharo2x: spec
33+
].
34+
35+
spec for: #'pharo1.1' do: [
6336
spec
6437
package: 'Grease-Pharo-Core'
65-
with: [ spec includes: #('Grease-Pharo10-Core' 'Grease-Pharo11-Core') ] ].
66-
spec
67-
for: #'squeak'
68-
do: [
69-
self greaseCoreAndTestsForSqueakAndPharo1x: spec.
38+
with: [ spec includes: #('Grease-Pharo11-Core') ]
39+
].
40+
41+
spec for: #'pharo2.x' do: [
42+
spec
43+
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo20-Core') ];
44+
package: 'Grease-Tests-Core' with: [ spec includes: #('Grease-Tests-Pharo20-Core') ];
45+
package: 'Grease-Pharo20-Core' with: [ spec requires: #('Grease-Core') ];
46+
package: 'Grease-Tests-Pharo20-Core' with: [ spec requires: #('Grease-Tests-Core') ].
7047
self slimeForSqueakPharo1xPharo2x: spec ].
71-
spec
72-
for: #'gemstone'
73-
do: [
48+
49+
spec for: #'pharo3.x' do: [
50+
spec
51+
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo30-Core') ];
52+
package: 'Grease-Tests-Core' with: [ spec includes: #('Grease-Tests-Pharo20-Core') ];
53+
package: 'Grease-Pharo30-Core' with: [ spec requires: #('Grease-Core') ];
54+
package: 'Grease-Tests-Pharo20-Core' with: [ spec requires: #('Grease-Tests-Core') ];
55+
package: 'Grease-Slime' with: [ spec requires: #('Grease-Core') ];
56+
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Slime') ].
57+
spec
58+
group: 'Slime' with: #('Grease-Slime');
59+
group: 'Slime Tests' with: #('Grease-Tests-Slime')
60+
].
61+
62+
spec for: #'pharo4.x' do: [
63+
spec
64+
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo30-Core') ];
65+
package: 'Grease-Tests-Core' with: [ spec includes: #('Grease-Tests-Pharo20-Core') ];
66+
package: 'Grease-Pharo30-Core' with: [ spec requires: #('Grease-Core') ];
67+
package: 'Grease-Tests-Pharo20-Core' with: [ spec requires: #('Grease-Tests-Core')];
68+
package: 'Grease-Pharo40-Slime' with: [ spec requires: #('Grease-Core') ];
69+
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo40-Slime') ].
70+
spec
71+
group: 'Slime' with: #('Grease-Pharo40-Slime');
72+
group: 'Slime Tests' with: #('Grease-Tests-Slime').
73+
].
74+
75+
spec for: #'gemstone' do: [
7476
spec
7577
project: 'GsCore'
76-
with: [
78+
with: [
7779
spec
7880
className: 'ConfigurationOfGsCore';
7981
versionString: #'stable';
8082
repository: 'http://seaside.gemstone.com/ss/MetacelloRepository' ];
8183
project: 'UTF8'
82-
with: [
84+
with: [
8385
spec
8486
className: 'ConfigurationOfGsMisc';
8587
versionString: #'stable';
@@ -105,42 +107,45 @@ baseline: spec
105107
requires:
106108
#('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ];
107109
package: 'Grease-Tests-GemStone-Core'
108-
with: [ spec requires: #('Grease-Tests-Core') ] ].
109-
spec
110-
for: #'gs2.x'
111-
do: [
110+
with: [ spec requires: #('Grease-Tests-Core') ]
111+
].
112+
113+
spec for: #'gs2.x' do: [
112114
spec
113115
package: 'Grease-GemStone-Core'
114116
with: [ spec includes: #('Grease-GemStone200-Core') ];
115117
package: 'Grease-GemStone200-Core'
116-
with: [ spec requires: #('Grease-GemStone-Core') ] ].
117-
spec
118-
for: #'gs2.3.x'
119-
do: [
118+
with: [ spec requires: #('Grease-GemStone-Core') ]
119+
].
120+
121+
spec for: #'gs2.3.x' do: [
120122
spec
121123
package: 'Grease-GemStone-Core'
122124
with: [ spec includes: #('Grease-GemStone230-Core') ];
123125
package: 'Grease-GemStone230-Core'
124-
with: [ spec requires: #('Grease-GemStone-Core') ] ].
125-
spec
126-
for: #'gs2.4.x'
127-
do: [
126+
with: [ spec requires: #('Grease-GemStone-Core') ]
127+
].
128+
129+
spec for: #'gs2.4.x' do: [
128130
spec
129131
package: 'Grease-GemStone-Core'
130132
with: [ spec includes: #('Grease-GemStone240-Core') ];
131133
package: 'Grease-GemStone240-Core'
132-
with: [ spec requires: #('Grease-GemStone-Core') ] ].
133-
spec
134-
for: #'gs3.x'
135-
do: [
134+
with: [ spec requires: #('Grease-GemStone-Core') ]
135+
].
136+
137+
spec for: #'gs3.x' do: [
136138
spec
137139
package: 'Grease-GemStone-Core'
138140
with: [ spec includes: #('Grease-GemStone300-Core') ];
139141
package: 'Grease-GemStone300-Core'
140-
with: [ spec requires: #('Grease-GemStone-Core') ] ].
141-
spec
142-
for: #'gs3.2.x'
143-
do: [
142+
with: [ spec
143+
requires: #('Grease-GemStone-Core');
144+
postLoadDoIt: #initializeLatin1ToUtf8Encodings ]
145+
].
146+
147+
spec for: #'gs3.2.x' do: [
144148
spec
145149
package: 'Grease-Tests-GemStone-Core'
146-
with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
150+
with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ]
151+
]
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
doits
2+
initializeLatin1ToUtf8Encodings
3+
4+
GRUtf8CodecStream initialize

repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"class" : {
33
},
44
"instance" : {
5-
"baseline:" : "dkh 06/04/2014 15:13",
5+
"baseline:" : "JohanBrichau 11/8/2014 09:27",
66
"greaseCoreAndTestsForSqueakAndPharo1x:" : "JohanBrichau 02/16/2014 03:50",
7+
"initializeLatin1ToUtf8Encodings" : "JohanBrichau 10/19/2014 10:00",
78
"slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49" } }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SystemOrganization addCategory: #'BaselineOfGrease'!
1+
SystemOrganization addCategory: #BaselineOfGrease!
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
(name 'BaselineOfGrease-dkh.5' message 'typoe' id '93eb3230-7956-4a6e-85dc-243f3dd895a1' date '06/04/2014' time '15:13:26' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.4' message 'woops specified the package branch incorrectly ... I think I got it right this time...' id '3003ee31-9d17-4dd1-9b9a-f8a80e4f0ba1' date '06/04/2014' time '15:12:31' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.3' message 'add Grease-Tests-GemStone-Core.v32 to baseline' id '26f128ca-b62e-4295-9a58-a9758b670c37' date '06/04/2014' time '14:57:48' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.2' message 'forgotten methods' id '38758da9-c922-4530-a19e-f8783900e787' date '02/16/2014' time '03:50:22' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1' message 'first baseline' id 'b89398df-14c6-4b6a-a2ba-91ad806bb07f' date '02/16/2014' time '01:49:46' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
1+
(name 'BaselineOfGrease-JohanBrichau.7' message 'included Pharo 4 and did some baseline formatting' id '3722041d-d4b5-4496-a25a-0e891fe9a945' date '8 November 2014' time '9:28:01.45573 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id '4d976044-1aa9-44b6-bab0-b66ac758b3cd' date '19 October 2014' time '10:05:25 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id 'b4ac5766-d472-4557-beff-59e5b733bce0' date '19 October 2014' time '10:04:55 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.5' message 'typoe' id '93eb3230-7956-4a6e-85dc-243f3dd895a1' date '4 June 2014' time '3:13:26 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.4' message 'woops specified the package branch incorrectly ... I think I got it right this time...' id '3003ee31-9d17-4dd1-9b9a-f8a80e4f0ba1' date '4 June 2014' time '3:12:31 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.3' message 'add Grease-Tests-GemStone-Core.v32 to baseline' id '26f128ca-b62e-4295-9a58-a9758b670c37' date '4 June 2014' time '2:57:48 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.2' message 'forgotten methods' id '38758da9-c922-4530-a19e-f8783900e787' date '16 February 2014' time '3:50:22 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1' message 'first baseline' id 'b89398df-14c6-4b6a-a2ba-91ad806bb07f' date '16 February 2014' time '1:49:46 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
file library
2+
fileExists: aString
3+
self subclassResponsibility
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
file library
2+
fileStreamOn: aString do: aBlock binary: aBoolean
3+
self subclassResponsibility

repository/Grease-Core.package/GRPlatform.class/methodProperties.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
"directoriesIn:" : "NickAger 3/9/2012 11:29",
1717
"doTransaction:" : "lr 7/25/2011 19:51",
1818
"ensureExistenceOfFolder:" : "pmm 2/5/2011 09:54",
19+
"fileExists:" : "JohanBrichau 10/3/2014 20:02",
20+
"fileStreamOn:do:binary:" : "JohanBrichau 10/3/2014 20:00",
1921
"filesIn:" : "pmm 2/5/2011 09:54",
2022
"isProcessTerminated:" : "jf 2/6/2009 16:00",
2123
"label" : "jf 2/9/2010 00:57",
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SystemOrganization addCategory: #'Grease-Core'!
2-
SystemOrganization addCategory: #'Grease-Core-Collections'!
3-
SystemOrganization addCategory: #'Grease-Core-Exceptions'!
4-
SystemOrganization addCategory: #'Grease-Core-Text'!
5-
SystemOrganization addCategory: #'Grease-Core-Utilities'!
2+
SystemOrganization addCategory: 'Grease-Core-Collections'!
3+
SystemOrganization addCategory: 'Grease-Core-Exceptions'!
4+
SystemOrganization addCategory: 'Grease-Core-Text'!
5+
SystemOrganization addCategory: 'Grease-Core-Utilities'!

repository/Grease-Core.package/monticello.meta/version

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)