X Tutup
Skip to content

Commit 393d061

Browse files
dalehenrichdalehenrich
committed
Merge branch 'dev'
2 parents 00a7df6 + 5ede6e5 commit 393d061

Some content is hidden

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

45 files changed

+360
-107
lines changed

‎.travis.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
language: erlang
22

3+
notifications:
4+
webhooks:
5+
urls:
6+
- https://webhooks.gitter.im/e/c59e6bffa0b41a693676 # GsDevKit/chat (public)
7+
on_success: always # options: [always|never|change] default: always
8+
on_failure: always # options: [always|never|change] default: always
9+
on_start: false # default: false
10+
311
env:
412

513
- ST=Pharo-1.4 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"

‎repository/.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*.package/monticello.meta/version merge=mcVersion
2+
*.package/*.class/methodProperties.json merge=mcMethodProperties
3+

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

Lines changed: 114 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
baseline
22
baseline: spec
33
<baseline>
4-
5-
spec for: #'common' do: [
6-
spec blessing: #'baseline'.
4+
spec
5+
for: #'common'
6+
do: [
7+
spec blessing: #'baseline'.
78
spec
89
package: 'Grease-Core';
910
package: 'Grease-Tests-Core' with: [ spec requires: #('Grease-Core') ].
@@ -13,75 +14,108 @@ baseline: spec
1314
group: 'Slime' with: #('Core');
1415
group: 'Slime Tests' with: #('Core Tests');
1516
group: 'Tests' with: #('Core Tests' 'Slime Tests');
16-
group: 'default' with: #('Slime')
17-
].
18-
19-
spec for: #'squeak' do: [
20-
self greaseCoreAndTestsForSqueakAndPharo1x: spec.
21-
self slimeForSqueakPharo1xPharo2x: spec
22-
].
23-
24-
spec for: #'pharo1.0' do: [
17+
group: 'default' with: #('Slime') ].
18+
spec
19+
for: #'squeak'
20+
do: [
21+
spec
22+
package: 'Grease-Core'
23+
with: [ spec includes: #('Grease-Pharo-Core' 'Grease-Squeak-Core') ];
24+
package: 'Grease-Tests-Core'
25+
with: [ spec includes: #('Grease-Tests-Pharo-Core' 'Grease-Tests-Squeak-Core') ];
26+
package: 'Grease-Pharo-Core' with: [ spec requires: #('Grease-Core') ];
27+
package: 'Grease-Tests-Pharo-Core'
28+
with: [ spec requires: #('Grease-Tests-Core') ];
29+
package: 'Grease-Squeak-Core'
30+
with: [ spec requires: #('Grease-Pharo-Core') ];
31+
package: 'Grease-Tests-Squeak-Core'
32+
with: [ spec requires: #('Grease-Tests-Pharo-Core') ].
33+
self slimeForSqueakPharo1xPharo2x: spec ].
34+
spec
35+
for: #'pharo1.0'
36+
do: [
2537
spec
2638
package: 'Grease-Pharo-Core'
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: [
39+
with: [ spec includes: #('Grease-Pharo10-Core' 'Grease-Pharo11-Core') ] ].
40+
spec
41+
for: #'pharo1.x'
42+
do: [
43+
spec
44+
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo-Core') ];
45+
package: 'Grease-Tests-Core'
46+
with: [ spec includes: #('Grease-Tests-Pharo-Core') ];
47+
package: 'Grease-Pharo-Core' with: [ spec requires: #('Grease-Core') ];
48+
package: 'Grease-Tests-Pharo-Core'
49+
with: [ spec requires: #('Grease-Tests-Core') ].
50+
self slimeForSqueakPharo1xPharo2x: spec ].
51+
spec
52+
for: #'pharo1.1'
53+
do: [
3654
spec
3755
package: 'Grease-Pharo-Core'
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') ].
56+
with: [ spec includes: #('Grease-Pharo11-Core') ] ].
57+
spec
58+
for: #'pharo2.x'
59+
do: [
60+
spec
61+
package: 'Grease-Core'
62+
with: [ spec includes: #('Grease-Pharo20-Core') ];
63+
package: 'Grease-Tests-Core'
64+
with: [ spec includes: #('Grease-Tests-Pharo20-Core') ];
65+
package: 'Grease-Pharo20-Core'
66+
with: [ spec requires: #('Grease-Core') ];
67+
package: 'Grease-Tests-Pharo20-Core'
68+
with: [ spec requires: #('Grease-Tests-Core') ].
4769
self slimeForSqueakPharo1xPharo2x: spec ].
48-
49-
spec for: #'pharo3.x' do: [
70+
spec
71+
for: #'pharo3.x'
72+
do: [
5073
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') ];
74+
package: 'Grease-Core'
75+
with: [ spec includes: #('Grease-Pharo30-Core') ];
76+
package: 'Grease-Tests-Core'
77+
with: [ spec includes: #('Grease-Tests-Pharo20-Core') ];
78+
package: 'Grease-Pharo30-Core'
79+
with: [ spec requires: #('Grease-Core') ];
80+
package: 'Grease-Tests-Pharo20-Core'
81+
with: [ spec requires: #('Grease-Tests-Core') ];
5582
package: 'Grease-Slime' with: [ spec requires: #('Grease-Core') ];
56-
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Slime') ].
83+
package: 'Grease-Tests-Slime'
84+
with: [ spec requires: #('Grease-Slime') ].
5785
spec
5886
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: [
87+
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
88+
spec
89+
for: #'pharo4.x'
90+
do: [
91+
spec
92+
package: 'Grease-Core'
93+
with: [ spec includes: #('Grease-Pharo30-Core') ];
94+
package: 'Grease-Tests-Core'
95+
with: [ spec includes: #('Grease-Tests-Pharo20-Core') ];
96+
package: 'Grease-Pharo30-Core'
97+
with: [ spec requires: #('Grease-Core') ];
98+
package: 'Grease-Tests-Pharo20-Core'
99+
with: [ spec requires: #('Grease-Tests-Core') ];
100+
package: 'Grease-Pharo40-Slime'
101+
with: [ spec requires: #('Grease-Core') ];
102+
package: 'Grease-Tests-Slime'
103+
with: [ spec requires: #('Grease-Pharo40-Slime') ].
104+
spec
105+
group: 'Slime' with: #('Grease-Pharo40-Slime');
106+
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
107+
spec
108+
for: #'gemstone'
109+
do: [
76110
spec
77111
project: 'GsCore'
78-
with: [
112+
with: [
79113
spec
80114
className: 'ConfigurationOfGsCore';
81115
versionString: #'stable';
82116
repository: 'http://seaside.gemstone.com/ss/MetacelloRepository' ];
83117
project: 'UTF8'
84-
with: [
118+
with: [
85119
spec
86120
className: 'ConfigurationOfGsMisc';
87121
versionString: #'stable';
@@ -107,45 +141,45 @@ baseline: spec
107141
requires:
108142
#('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ];
109143
package: 'Grease-Tests-GemStone-Core'
110-
with: [ spec requires: #('Grease-Tests-Core') ]
111-
].
112-
113-
spec for: #'gs2.x' do: [
144+
with: [ spec requires: #('Grease-Tests-Core') ] ].
145+
spec
146+
for: #'gs2.x'
147+
do: [
114148
spec
115149
package: 'Grease-GemStone-Core'
116150
with: [ spec includes: #('Grease-GemStone200-Core') ];
117151
package: 'Grease-GemStone200-Core'
118-
with: [ spec requires: #('Grease-GemStone-Core') ]
119-
].
120-
121-
spec for: #'gs2.3.x' do: [
152+
with: [ spec requires: #('Grease-GemStone-Core') ] ].
153+
spec
154+
for: #'gs2.3.x'
155+
do: [
122156
spec
123157
package: 'Grease-GemStone-Core'
124158
with: [ spec includes: #('Grease-GemStone230-Core') ];
125159
package: 'Grease-GemStone230-Core'
126-
with: [ spec requires: #('Grease-GemStone-Core') ]
127-
].
128-
129-
spec for: #'gs2.4.x' do: [
160+
with: [ spec requires: #('Grease-GemStone-Core') ] ].
161+
spec
162+
for: #'gs2.4.x'
163+
do: [
130164
spec
131165
package: 'Grease-GemStone-Core'
132166
with: [ spec includes: #('Grease-GemStone240-Core') ];
133167
package: 'Grease-GemStone240-Core'
134-
with: [ spec requires: #('Grease-GemStone-Core') ]
135-
].
136-
137-
spec for: #'gs3.x' do: [
168+
with: [ spec requires: #('Grease-GemStone-Core') ] ].
169+
spec
170+
for: #'gs3.x'
171+
do: [
138172
spec
139173
package: 'Grease-GemStone-Core'
140174
with: [ spec includes: #('Grease-GemStone300-Core') ];
141175
package: 'Grease-GemStone300-Core'
142-
with: [ spec
143-
requires: #('Grease-GemStone-Core');
144-
postLoadDoIt: #initializeLatin1ToUtf8Encodings ]
145-
].
146-
147-
spec for: #'gs3.2.x' do: [
176+
with: [
177+
spec
178+
requires: #('Grease-GemStone-Core');
179+
postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
180+
spec
181+
for: #(#'gs3.2.x' #'gs3.3.x')
182+
do: [
148183
spec
149184
package: 'Grease-Tests-GemStone-Core'
150-
with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ]
151-
]
185+
with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]

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

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

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"class" : {
33
},
44
"instance" : {
5-
"baseline:" : "JohanBrichau 11/8/2014 09:27",
6-
"greaseCoreAndTestsForSqueakAndPharo1x:" : "JohanBrichau 02/16/2014 03:50",
5+
"baseline:" : "dkh 05/26/2015 11:45",
76
"initializeLatin1ToUtf8Encodings" : "JohanBrichau 10/19/2014 10:00",
87
"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.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 ())
1+
(name 'BaselineOfGrease-dkh.9' message 'Update baseline for GemStone 3.3' id 'af9364dd-14bc-4e5e-9fc7-0abe08732ab2' date '05/26/2015' time '11:46:07' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.8' message 'separate package for Squeak' id '91c019c7-2b8b-40c3-97d9-2047a69512a7' date '03/22/2015' time '12:01:37' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.7' message 'included Pharo 4 and did some baseline formatting' id '3722041d-d4b5-4496-a25a-0e891fe9a945' date '11/08/2014' time '09:28:01' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id '4d976044-1aa9-44b6-bab0-b66ac758b3cd' date '10/19/2014' time '10:05:25' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id 'b4ac5766-d472-4557-beff-59e5b733bce0' date '10/19/2014' time '10:04:55' author 'JohanBrichau' ancestors ((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 ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())

‎repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/instance/doTransaction..st‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
*grease-gemstone-core
22
doTransaction: aBlock
3-
"Evaluate aBlock in a transaction.
3+
"Evaluate aBlock in a transaction.
44
Return true if the transaction succeeds and false if the transaction fails.
55
Nested calls are allowed and will always return true.
66
See System class>>transactionConflicts for dealing with failed transactions."
77

8-
"Ensure that each block evaluation is mutually exclusive: https://code.google.com/p/glassdb/issues/detail?id=355"
9-
self transactionMutex critical: [
10-
"Get the transactionMutex, and perform the transaction."
11-
System inTransaction
12-
ifTrue: [ "We already are in a transaction, so just evaluate the block"
13-
aBlock value.
14-
^ true]
15-
ifFalse:[
16-
[
17-
self doBeginTransaction.
18-
aBlock value
19-
] ensure: [ ^self doCommitTransaction]]]
20-
8+
"Ensure that each block evaluation is mutually exclusive: https://code.google.com/p/glassdb/issues/detail?id=355"
9+
10+
self transactionMutex
11+
critical: [
12+
| commitResult |
13+
"Get the transactionMutex, and perform the transaction."
14+
System inTransaction
15+
ifTrue: [
16+
"We already are in a transaction, so just evaluate the block"
17+
aBlock value.
18+
^ true ]
19+
ifFalse: [
20+
[
21+
self doBeginTransaction.
22+
aBlock value ]
23+
ensure: [
24+
"workaround for Bug 42963: ensure: block executed twice (don't return from ensure: block)"
25+
commitResult := self doCommitTransaction ] ].
26+
^ commitResult ]

‎repository/Grease-GemStone-Core.package/GRGemStonePlatform.class/methodProperties.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"doAbortTransaction" : "dkh 11/06/2009 08:41",
1717
"doBeginTransaction" : "dkh 11/06/2009 08:41",
1818
"doCommitTransaction" : "dkh 11/06/2009 08:41",
19-
"doTransaction:" : "JohanBrichau 03/21/2014 17:45",
19+
"doTransaction:" : "dkh 12/21/2014 16:11",
2020
"ensureExistenceOfFolder:" : "DaleHenrichs 12/03/2010 16:28",
2121
"fileExists:" : "JohanBrichau 10/11/2014 02:18",
2222
"fileStreamOn:do:binary:" : "JohanBrichau 10/11/2014 02:27",

0 commit comments

Comments
 (0)
X Tutup