X Tutup
Skip to content

Commit d65731b

Browse files
author
Johan Brichau
committed
Fix issue SeasideSt#20: encoding to utf8 breaks in GemStone 3.3+
1 parent 5c1b15b commit d65731b

37 files changed

+378
-180
lines changed

‎repository/BaselineOfGrease.package/.filetree‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"separateMethodMetaAndSource" : false,
32
"noMethodMetaData" : true,
4-
"useCypressPropertiesFile" : true
5-
}
3+
"separateMethodMetaAndSource" : false,
4+
"useCypressPropertiesFile" : true }

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

Lines changed: 165 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -1,169 +1,169 @@
11
baseline
22
baseline: spec
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') ].
3+
<baseline>
4+
spec for: #'common' do: [
5+
spec blessing: #'baseline'.
6+
spec
7+
package: 'Grease-Core';
8+
package: 'Grease-Tests-Core' with: [
9+
spec requires: #('Grease-Core' ). ];
10+
package: 'Grease-GemStone330-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' ). ].
1818

19-
spec
20-
for: #'squeak5.x'
21-
do: [
22-
spec
23-
package: 'Grease-Core'
24-
with: [ spec includes: #('Grease-Squeak5-Core') ];
25-
package: 'Grease-Tests-Core'
26-
with: [ spec requires: #('Grease-Squeak5-Core'); includes: #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak5-Core') ];
27-
package: 'Grease-Squeak5-Core'
28-
with: [ spec requires: #('Grease-Core') ];
29-
package: 'Grease-Tests-Squeak-Core'
30-
with: [ spec requires: #('Grease-Tests-Core') ];
31-
package: 'Grease-Tests-Squeak5-Core'
32-
with: [ spec requires: #('Grease-Tests-Squeak-Core') ].
33-
self slimeForSqueakPharo1xPharo2x: spec ].
19+
spec for: #'squeak5.x' do: [
20+
spec project: 'Refactoring-Core' with: [
21+
spec
22+
className: 'ConfigurationOfRefactoringBrowser';
23+
versionString: #'stable';
24+
loads: #('Core' );
25+
repository: 'http://www.squeaksource.com/MetacelloRepository' ].
26+
spec
27+
package: 'Grease-Core' with: [
28+
spec includes: #('Grease-Squeak5-Core' ). ];
29+
package: 'Grease-Tests-Core' with: [
30+
spec
31+
requires: #('Grease-Squeak5-Core' );
32+
includes: #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak5-Core' ). ];
33+
package: 'Grease-Squeak5-Core' with: [
34+
spec requires: #('Grease-Core' ). ];
35+
package: 'Grease-Tests-Squeak-Core' with: [
36+
spec requires: #('Grease-Tests-Core' ). ];
37+
package: 'Grease-Tests-Squeak5-Core' with: [
38+
spec requires: #('Grease-Tests-Squeak-Core' ). ];
39+
package: 'Grease-Slime' with: [
40+
spec requires: #('Refactoring-Core' 'Grease-Core' ). ];
41+
package: 'Grease-Tests-Slime' with: [
42+
spec requires: #('Grease-Slime' ). ].
43+
spec
44+
group: 'Slime' with: #('Grease-Slime' );
45+
group: 'Slime Tests' with: #('Grease-Tests-Slime' ). ].
3446

35-
spec
36-
for: #'pharo3.x'
37-
do: [
38-
spec
39-
package: 'Grease-Core'
40-
with: [ spec includes: #('Grease-Pharo30-Core') ];
41-
package: 'Grease-Tests-Core'
42-
with: [ spec requires: #('Grease-Pharo30-Core'); includes: #('Grease-Tests-Pharo20-Core') ];
43-
package: 'Grease-Pharo30-Core'
44-
with: [ spec requires: #('Grease-Core') ];
45-
package: 'Grease-Tests-Pharo20-Core'
46-
with: [ spec requires: #('Grease-Tests-Core') ];
47-
package: 'Grease-Slime' with: [ spec requires: #('Grease-Core') ];
48-
package: 'Grease-Tests-Slime'
49-
with: [ spec requires: #('Grease-Slime') ].
50-
spec
51-
group: 'Slime' with: #('Grease-Slime');
52-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
53-
spec
54-
for: #(#'pharo4.x' #'pharo5.x')
55-
do: [
56-
spec
57-
package: 'Grease-Core'
58-
with: [ spec includes: #('Grease-Pharo30-Core') ];
59-
package: 'Grease-Tests-Core'
60-
with: [ spec requires: #('Grease-Pharo30-Core'); includes: #('Grease-Tests-Pharo20-Core') ];
61-
package: 'Grease-Pharo30-Core'
62-
with: [ spec requires: #('Grease-Core') ];
63-
package: 'Grease-Tests-Pharo20-Core'
64-
with: [ spec requires: #('Grease-Tests-Core') ];
65-
package: 'Grease-Pharo40-Slime'
66-
with: [ spec requires: #('Grease-Core') ];
67-
package: 'Grease-Tests-Slime'
68-
with: [ spec requires: #('Grease-Pharo40-Slime') ].
69-
spec
70-
group: 'Slime' with: #('Grease-Pharo40-Slime');
71-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
72-
spec
73-
for: #(#'pharo6.x')
74-
do: [
75-
spec
76-
package: 'Grease-Core'
77-
with: [ spec includes: #('Grease-Pharo60-Core') ];
78-
package: 'Grease-Tests-Core'
79-
with: [ spec requires: #('Grease-Pharo60-Core'); includes: #('Grease-Tests-Pharo20-Core') ];
80-
package: 'Grease-Pharo60-Core'
81-
with: [ spec requires: #('Grease-Core') ];
82-
package: 'Grease-Tests-Pharo20-Core'
83-
with: [ spec requires: #('Grease-Tests-Core') ];
84-
package: 'Grease-Pharo40-Slime'
85-
with: [ spec requires: #('Grease-Core') ];
86-
package: 'Grease-Tests-Slime'
87-
with: [ spec requires: #('Grease-Pharo40-Slime') ].
88-
spec
89-
group: 'Slime' with: #('Grease-Pharo40-Slime');
90-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
91-
spec
92-
for: #'gemstone'
93-
do: [
94-
spec
95-
project: 'GsCore'
96-
with: [
97-
spec
98-
className: 'ConfigurationOfGsCore';
99-
versionString: #'stable';
100-
repository: 'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
101-
project: 'UTF8'
102-
with: [
103-
spec
104-
className: 'ConfigurationOfGsMisc';
105-
versionString: #'stable';
106-
loads: #('Utf8Encoding');
107-
repository: 'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
108-
project: 'System-Digital-Signatures'
109-
copyFrom: 'UTF8'
110-
with: [ spec loads: #('System-Digital-Signatures') ];
111-
project: 'SMTPMail'
112-
copyFrom: 'UTF8'
113-
with: [ spec loads: #('SMTPMail') ].
114-
spec
115-
package: 'Grease-Core'
116-
with: [
117-
spec
118-
requires: #('GsCore');
119-
includes: #('Grease-GemStone-Core') ];
120-
package: 'Grease-Tests-Core'
121-
with: [ spec requires: #('Grease-GemStone-Core'); includes: #('Grease-Tests-GemStone-Core') ];
122-
package: 'Grease-GemStone-Core'
123-
with: [
124-
spec
125-
requires:
126-
#('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ];
127-
package: 'Grease-Tests-GemStone-Core'
128-
with: [ spec requires: #('Grease-Tests-Core') ] ].
129-
spec
130-
for: #'gs2.x'
131-
do: [
132-
spec
133-
package: 'Grease-GemStone-Core'
134-
with: [ spec includes: #('Grease-GemStone200-Core') ];
135-
package: 'Grease-GemStone200-Core'
136-
with: [ spec requires: #('Grease-GemStone-Core') ] ].
137-
spec
138-
for: #'gs2.3.x'
139-
do: [
140-
spec
141-
package: 'Grease-GemStone-Core'
142-
with: [ spec includes: #('Grease-GemStone230-Core') ];
143-
package: 'Grease-GemStone230-Core'
144-
with: [ spec requires: #('Grease-GemStone-Core') ] ].
145-
spec
146-
for: #'gs2.4.x'
147-
do: [
148-
spec
149-
package: 'Grease-GemStone-Core'
150-
with: [ spec includes: #('Grease-GemStone240-Core') ];
151-
package: 'Grease-GemStone240-Core'
152-
with: [ spec requires: #('Grease-GemStone-Core') ] ].
153-
spec
154-
for: #'gs3.x'
155-
do: [
156-
spec
157-
package: 'Grease-GemStone-Core'
158-
with: [ spec includes: #('Grease-GemStone300-Core') ];
159-
package: 'Grease-GemStone300-Core'
160-
with: [
161-
spec
162-
requires: #('Grease-GemStone-Core');
163-
postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
164-
spec
165-
for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x')
166-
do: [
167-
spec
168-
package: 'Grease-Tests-GemStone-Core'
169-
with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
47+
spec for: #'pharo3.x' do: [
48+
spec
49+
package: 'Grease-Core' with: [
50+
spec includes: #('Grease-Pharo30-Core' ). ];
51+
package: 'Grease-Tests-Core' with: [
52+
spec
53+
requires: #('Grease-Pharo30-Core' );
54+
includes: #('Grease-Tests-Pharo20-Core' ). ];
55+
package: 'Grease-Pharo30-Core' with: [
56+
spec requires: #('Grease-Core' ). ];
57+
package: 'Grease-Tests-Pharo20-Core' with: [
58+
spec requires: #('Grease-Tests-Core' ). ];
59+
package: 'Grease-Slime' with: [
60+
spec requires: #('Grease-Core' ). ];
61+
package: 'Grease-Tests-Slime' with: [
62+
spec requires: #('Grease-Slime' ). ].
63+
spec
64+
group: 'Slime' with: #('Grease-Slime' );
65+
group: 'Slime Tests' with: #('Grease-Tests-Slime' ). ].
66+
67+
spec for: #(#'pharo4.x' #'pharo5.x' ) do: [
68+
spec
69+
package: 'Grease-Core' with: [
70+
spec includes: #('Grease-Pharo30-Core' ). ];
71+
package: 'Grease-Tests-Core' with: [
72+
spec
73+
requires: #('Grease-Pharo30-Core' );
74+
includes: #('Grease-Tests-Pharo20-Core' ). ];
75+
package: 'Grease-Pharo30-Core' with: [
76+
spec requires: #('Grease-Core' ). ];
77+
package: 'Grease-Tests-Pharo20-Core' with: [
78+
spec requires: #('Grease-Tests-Core' ). ];
79+
package: 'Grease-Pharo40-Slime' with: [
80+
spec requires: #('Grease-Core' ). ];
81+
package: 'Grease-Tests-Slime' with: [
82+
spec requires: #('Grease-Pharo40-Slime' ). ].
83+
spec
84+
group: 'Slime' with: #('Grease-Pharo40-Slime' );
85+
group: 'Slime Tests' with: #('Grease-Tests-Slime' ). ].
86+
87+
spec for: #'pharo6.x' do: [
88+
spec
89+
package: 'Grease-Core' with: [
90+
spec includes: #('Grease-Pharo60-Core' ). ];
91+
package: 'Grease-Tests-Core' with: [
92+
spec
93+
requires: #('Grease-Pharo60-Core' );
94+
includes: #('Grease-Tests-Pharo20-Core' ). ];
95+
package: 'Grease-Pharo60-Core' with: [
96+
spec requires: #('Grease-Core' ). ];
97+
package: 'Grease-Tests-Pharo20-Core' with: [
98+
spec requires: #('Grease-Tests-Core' ). ];
99+
package: 'Grease-Pharo40-Slime' with: [
100+
spec requires: #('Grease-Core' ). ];
101+
package: 'Grease-Tests-Slime' with: [
102+
spec requires: #('Grease-Pharo40-Slime' ). ].
103+
spec
104+
group: 'Slime' with: #('Grease-Pharo40-Slime' );
105+
group: 'Slime Tests' with: #('Grease-Tests-Slime' ). ].
106+
107+
spec for: #'gemstone' do: [
108+
spec
109+
project: 'GsCore' with: [
110+
spec
111+
className: 'ConfigurationOfGsCore';
112+
versionString: #'stable';
113+
repository: 'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
114+
project: 'UTF8' with: [
115+
spec
116+
className: 'ConfigurationOfGsMisc';
117+
versionString: #'stable';
118+
loads: #('Utf8Encoding' );
119+
repository: 'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
120+
project: 'System-Digital-Signatures' copyFrom: 'UTF8' with: [
121+
spec loads: #('System-Digital-Signatures' ) ];
122+
project: 'SMTPMail' copyFrom: 'UTF8' with: [
123+
spec loads: #('SMTPMail' ) ].
124+
spec
125+
package: 'Grease-Core' with: [
126+
spec
127+
requires: #('GsCore' );
128+
includes: #('Grease-GemStone-Core' ). ];
129+
package: 'Grease-Tests-Core' with: [
130+
spec
131+
requires: #('Grease-GemStone-Core' );
132+
includes: #('Grease-Tests-GemStone-Core' ). ];
133+
package: 'Grease-GemStone-Core' with: [
134+
spec requires: #('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail' ). ];
135+
package: 'Grease-Tests-GemStone-Core' with: [
136+
spec requires: #('Grease-Tests-Core' ). ]. ].
137+
138+
spec for: #'gs2.x' do: [
139+
spec
140+
package: 'Grease-GemStone-Core' with: [
141+
spec includes: #('Grease-GemStone200-Core' ). ];
142+
package: 'Grease-GemStone200-Core' with: [
143+
spec requires: #('Grease-GemStone-Core' ). ]. ].
144+
145+
spec for: #'gs2.3.x' do: [
146+
spec
147+
package: 'Grease-GemStone-Core' with: [
148+
spec includes: #('Grease-GemStone230-Core' ). ];
149+
package: 'Grease-GemStone230-Core' with: [
150+
spec requires: #('Grease-GemStone-Core' ). ]. ].
151+
152+
spec for: #'gs2.4.x' do: [
153+
spec
154+
package: 'Grease-GemStone-Core' with: [
155+
spec includes: #('Grease-GemStone240-Core' ). ];
156+
package: 'Grease-GemStone240-Core' with: [
157+
spec requires: #('Grease-GemStone-Core' ). ]. ].
158+
159+
spec for: #'gs3.x' do: [
160+
spec
161+
package: 'Grease-GemStone-Core' with: [
162+
spec includes: #('Grease-GemStone300-Core' ). ];
163+
package: 'Grease-GemStone300-Core' with: [
164+
spec
165+
requires: #('Grease-GemStone-Core' );
166+
postLoadDoIt: #'initializeLatin1ToUtf8Encodings'. ]. ].
167+
168+
spec for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' ) do: [
169+
spec package: 'Grease-Tests-GemStone-Core' with: '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 7/23/2017 19:28",
5+
"baseline:" : "JohanBrichau 10/07/2017 06:47",
66
"initializeLatin1ToUtf8Encodings" : "JohanBrichau 10/19/2014 10:00",
77
"slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49" } }

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
{
2-
"commentStamp" : "",
3-
"super" : "BaselineOf",
42
"category" : "BaselineOfGrease",
5-
"classinstvars" : [ ],
6-
"pools" : [ ],
7-
"classvars" : [ ],
8-
"instvars" : [ ],
3+
"classinstvars" : [
4+
],
5+
"classvars" : [
6+
],
7+
"commentStamp" : "",
8+
"instvars" : [
9+
],
910
"name" : "BaselineOfGrease",
10-
"type" : "normal"
11-
}
11+
"pools" : [
12+
],
13+
"super" : "BaselineOf",
14+
"type" : "normal" }

0 commit comments

Comments
 (0)
X Tutup