X Tutup
Skip to content

Commit 8df18a2

Browse files
dalehenrichdalehenrich
committed
Merge branch 'issue_21_utf8'
2 parents 58342e8 + fbc2c87 commit 8df18a2

File tree

59 files changed

+424
-133
lines changed

Some content is hidden

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

59 files changed

+424
-133
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ env:
66
- ST=Pharo-2.0 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
77
- ST=Pharo-3.0 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
88
- ST=Squeak-4.4 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
9-
- ST=GemStone-2.4.4.1 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
10-
- ST=GemStone-3.1.0.5 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
9+
- ST=GemStone-2.4.4.2 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
10+
- ST=GemStone-3.1.0.6 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
11+
- ST=GemStone-3.2.0 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
1112

1213
install:
1314
- export PROJECT_HOME="$(pwd)"

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

Lines changed: 144 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,146 @@
11
baseline
22
baseline: spec
3-
<baseline>
4-
5-
spec
6-
for: #common
7-
do: [
8-
spec blessing: #baseline.
9-
10-
spec
11-
package: 'Grease-Core';
12-
package: 'Grease-Tests-Core' with: [ spec requires: #('Grease-Core') ].
13-
spec
14-
group: 'Core' with: #('Grease-Core');
15-
group: 'Core Tests' with: #('Grease-Tests-Core');
16-
group: 'Slime' with: #('Core');
17-
group: 'Slime Tests' with: #('Core Tests');
18-
group: 'Tests' with: #('Core Tests' 'Slime Tests');
19-
group: 'default' with: #('Slime')
20-
].
21-
22-
spec
23-
for: #'pharo3.x'
24-
do: [
25-
spec
26-
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo30-Core') ];
27-
package: 'Grease-Tests-Core' with: [ spec includes: #('Grease-Tests-Pharo20-Core') ];
28-
package: 'Grease-Pharo30-Core' with: [ spec requires: #('Grease-Core') ];
29-
package: 'Grease-Tests-Pharo20-Core' with: [ spec requires: #('Grease-Tests-Core')];
30-
package: 'Grease-Slime' with: [ spec requires: #('Grease-Core') ];
31-
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Slime') ].
32-
spec
33-
group: 'Slime' with: #('Grease-Slime');
34-
group: 'Slime Tests' with: #('Grease-Tests-Slime').
35-
].
36-
37-
spec
38-
for: #'pharo2.x'
39-
do: [
40-
spec
41-
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo20-Core') ];
42-
package: 'Grease-Tests-Core' with: [ spec includes: #('Grease-Tests-Pharo20-Core') ];
43-
package: 'Grease-Pharo20-Core' with: [ spec requires: #('Grease-Core') ];
44-
package: 'Grease-Tests-Pharo20-Core' with: [ spec requires: #('Grease-Tests-Core') ].
45-
self slimeForSqueakPharo1xPharo2x: spec ].
46-
spec
47-
for: #'pharo1.x'
48-
do: [
49-
self greaseCoreAndTestsForSqueakAndPharo1x: spec.
50-
self slimeForSqueakPharo1xPharo2x: spec ].
51-
52-
spec
53-
for: #'pharo1.1'
54-
do: [ spec package: 'Grease-Pharo-Core' with: [ spec includes: #('Grease-Pharo11-Core') ] ].
55-
56-
spec
57-
for: #'pharo1.0'
58-
do: [ spec package: 'Grease-Pharo-Core' with: [ spec includes: #('Grease-Pharo10-Core' 'Grease-Pharo11-Core') ] ].
59-
60-
spec
61-
for: #squeak
62-
do: [
63-
self greaseCoreAndTestsForSqueakAndPharo1x: spec.
64-
self slimeForSqueakPharo1xPharo2x: spec ].
65-
66-
spec
67-
for: #gemstone
68-
do: [
69-
spec
70-
project: 'GsCore'
71-
with: [
72-
spec
73-
className: 'ConfigurationOfGsCore';
74-
versionString: #stable;
75-
repository: 'http://seaside.gemstone.com/ss/MetacelloRepository' ];
76-
project: 'UTF8'
77-
with: [
78-
spec
79-
className: 'ConfigurationOfGsMisc';
80-
versionString: #stable;
81-
loads: #('Utf8Encoding');
82-
repository: 'http://seaside.gemstone.com/ss/MetacelloRepository' ];
83-
project: 'System-Digital-Signatures' copyFrom: 'UTF8' with: [ spec loads: #('System-Digital-Signatures') ];
84-
project: 'SMTPMail' copyFrom: 'UTF8' with: [ spec loads: #('SMTPMail') ].
85-
spec
86-
package: 'Grease-Core'
87-
with: [
88-
spec
89-
requires: #('GsCore');
90-
includes: #('Grease-GemStone-Core') ];
91-
package: 'Grease-Tests-Core' with: [ spec includes: #('Grease-Tests-GemStone-Core') ];
92-
package: 'Grease-GemStone-Core'
93-
with: [ spec requires: #('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ];
94-
package: 'Grease-Tests-GemStone-Core' with: [ spec requires: #('Grease-Tests-Core') ] ].
95-
spec
96-
for: #'gs2.x'
97-
do: [
98-
spec
99-
package: 'Grease-GemStone-Core' with: [ spec includes: #('Grease-GemStone200-Core') ];
100-
package: 'Grease-GemStone200-Core' with: [ spec requires: #('Grease-GemStone-Core') ] ].
101-
spec
102-
for: #'gs2.3.x'
103-
do: [
104-
spec
105-
package: 'Grease-GemStone-Core' with: [ spec includes: #('Grease-GemStone230-Core') ];
106-
package: 'Grease-GemStone230-Core' with: [ spec requires: #('Grease-GemStone-Core') ] ].
107-
spec
108-
for: #'gs2.4.x'
109-
do: [
110-
spec
111-
package: 'Grease-GemStone-Core' with: [ spec includes: #('Grease-GemStone240-Core') ];
112-
package: 'Grease-GemStone240-Core' with: [ spec requires: #('Grease-GemStone-Core') ] ].
113-
spec
114-
for: #'gs3.x'
115-
do: [
116-
spec
117-
package: 'Grease-GemStone-Core' with: [ spec includes: #('Grease-GemStone300-Core') ];
118-
package: 'Grease-GemStone300-Core' with: [ spec requires: #('Grease-GemStone-Core') ]
119-
]
3+
<baseline>
4+
spec
5+
for: #'common'
6+
do: [
7+
spec blessing: #'baseline'.
8+
spec
9+
package: 'Grease-Core';
10+
package: 'Grease-Tests-Core' with: [ spec requires: #('Grease-Core') ].
11+
spec
12+
group: 'Core' with: #('Grease-Core');
13+
group: 'Core Tests' with: #('Grease-Tests-Core');
14+
group: 'Slime' with: #('Core');
15+
group: 'Slime Tests' with: #('Core Tests');
16+
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: [
52+
self greaseCoreAndTestsForSqueakAndPharo1x: spec.
53+
self slimeForSqueakPharo1xPharo2x: spec ].
54+
spec
55+
for: #'pharo1.1'
56+
do: [
57+
spec
58+
package: 'Grease-Pharo-Core'
59+
with: [ spec includes: #('Grease-Pharo11-Core') ] ].
60+
spec
61+
for: #'pharo1.0'
62+
do: [
63+
spec
64+
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.
70+
self slimeForSqueakPharo1xPharo2x: spec ].
71+
spec
72+
for: #'gemstone'
73+
do: [
74+
spec
75+
project: 'GsCore'
76+
with: [
77+
spec
78+
className: 'ConfigurationOfGsCore';
79+
versionString: #'stable';
80+
repository: 'http://seaside.gemstone.com/ss/MetacelloRepository' ];
81+
project: 'UTF8'
82+
with: [
83+
spec
84+
className: 'ConfigurationOfGsMisc';
85+
versionString: #'stable';
86+
loads: #('Utf8Encoding');
87+
repository: 'http://seaside.gemstone.com/ss/MetacelloRepository' ];
88+
project: 'System-Digital-Signatures'
89+
copyFrom: 'UTF8'
90+
with: [ spec loads: #('System-Digital-Signatures') ];
91+
project: 'SMTPMail'
92+
copyFrom: 'UTF8'
93+
with: [ spec loads: #('SMTPMail') ].
94+
spec
95+
package: 'Grease-Core'
96+
with: [
97+
spec
98+
requires: #('GsCore');
99+
includes: #('Grease-GemStone-Core') ];
100+
package: 'Grease-Tests-Core'
101+
with: [ spec includes: #('Grease-Tests-GemStone-Core') ];
102+
package: 'Grease-GemStone-Core'
103+
with: [
104+
spec
105+
requires:
106+
#('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ];
107+
package: 'Grease-Tests-GemStone-Core'
108+
with: [ spec requires: #('Grease-Tests-Core') ] ].
109+
spec
110+
for: #'gs2.x'
111+
do: [
112+
spec
113+
package: 'Grease-GemStone-Core'
114+
with: [ spec includes: #('Grease-GemStone200-Core') ];
115+
package: 'Grease-GemStone200-Core'
116+
with: [ spec requires: #('Grease-GemStone-Core') ] ].
117+
spec
118+
for: #'gs2.3.x'
119+
do: [
120+
spec
121+
package: 'Grease-GemStone-Core'
122+
with: [ spec includes: #('Grease-GemStone230-Core') ];
123+
package: 'Grease-GemStone230-Core'
124+
with: [ spec requires: #('Grease-GemStone-Core') ] ].
125+
spec
126+
for: #'gs2.4.x'
127+
do: [
128+
spec
129+
package: 'Grease-GemStone-Core'
130+
with: [ spec includes: #('Grease-GemStone240-Core') ];
131+
package: 'Grease-GemStone240-Core'
132+
with: [ spec requires: #('Grease-GemStone-Core') ] ].
133+
spec
134+
for: #'gs3.x'
135+
do: [
136+
spec
137+
package: 'Grease-GemStone-Core'
138+
with: [ spec includes: #('Grease-GemStone300-Core') ];
139+
package: 'Grease-GemStone300-Core'
140+
with: [ spec requires: #('Grease-GemStone-Core') ] ].
141+
spec
142+
for: #'gs3.2.x'
143+
do: [
144+
spec
145+
package: 'Grease-Tests-GemStone-Core'
146+
with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"class" : {
33
},
44
"instance" : {
5-
"baseline:" : "JohanBrichau 02/16/2014 01:48",
5+
"baseline:" : "dkh 06/04/2014 15:13",
66
"greaseCoreAndTestsForSqueakAndPharo1x:" : "JohanBrichau 02/16/2014 03:50",
77
"slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49" } }

‎repository/BaselineOfGrease.package/monticello.meta/categories.st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SystemOrganization addCategory: 'BaselineOfGrease'!
1+
SystemOrganization addCategory: #'BaselineOfGrease'!

‎repository/BaselineOfGrease.package/monticello.meta/version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
(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 ())
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 ())

‎repository/Grease-GemStone-Core.package/ExecutableBlock.extension/instance/tempVarRefs.st‎

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

‎repository/Grease-GemStone-Core.package/monticello.meta/categories.st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SystemOrganization addCategory: 'Grease-GemStone-Core'!
1+
SystemOrganization addCategory: #'Grease-GemStone-Core'!

0 commit comments

Comments
 (0)
X Tutup