X Tutup
Skip to content

Commit cbf6d30

Browse files
author
Johan Brichau
authored
Merge pull request #12 from SeasideSt/master
Sync GsDevKit>>Grease with SeasideSt>>Grease master
2 parents 6973d2b + eca45ab commit cbf6d30

File tree

389 files changed

+2493
-2134
lines changed

Some content is hidden

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

389 files changed

+2493
-2134
lines changed

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# inform linguist that files with these extensions are indeed smalltalk files
2+
*.st linguist-language=Smalltalk
3+

‎.pharo4.ston‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
SmalltalkCISpec {
2+
#loading : [
3+
SCIMetacelloLoadSpec {
4+
#useLatestMetacello : true,
5+
#baseline : 'Grease',
6+
#directory : 'repository',
7+
#load : [ 'Tests' ],
8+
#useLatestMetacello : true,
9+
#platforms : [ #pharo ]
10+
}
11+
]
12+
}

‎.project‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
'srcDirectory' : 'repository'
3+
}

‎.travis.yml‎

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,43 @@
11
language: smalltalk
22
sudo: false
33

4-
smalltalk:
5-
- Pharo-alpha
6-
- Pharo-6.1
7-
- Pharo-6.0
8-
- Pharo-5.0
9-
- Pharo-4.0
10-
- Pharo-3.0
11-
- Squeak-trunk
12-
- Squeak-5.1
4+
aliases:
5+
- &pharo4-has-latest-metacello
6+
smalltalk_config: .pharo4.ston
7+
138
matrix:
149
allow_failures:
15-
- smalltalk: Pharo-alpha
1610
- smalltalk: Squeak-trunk
1711
- smalltalk: Squeak-5.1
18-
os: linux
19-
12+
2013
include:
14+
- smalltalk: Pharo64-7.0
15+
env: BUILD_NAME=Pharo64-7.0
16+
- smalltalk: Pharo64-6.1
17+
env: BUILD_NAME=Pharo64-6.1
18+
- smalltalk: Pharo-6.1
19+
env: BUILD_NAME=Pharo-6.1
20+
- smalltalk: Pharo-5.0
21+
env: BUILD_NAME=Pharo-5.0
22+
- smalltalk: Pharo-4.0
23+
<<: *pharo4-has-latest-metacello
24+
env: BUILD_NAME=Pharo-4.0
25+
- smalltalk: Pharo-3.0
26+
<<: *pharo4-has-latest-metacello
27+
env: BUILD_NAME=Pharo-3.0
28+
- smalltalk: Squeak-trunk
29+
env: BUILD_NAME=Squeak-trunk
30+
- smalltalk: Squeak-5.2
31+
env: BUILD_NAME=Squeak-5.2
2132
- smalltalk: Squeak-5.1
22-
os: osx
23-
- smalltalk: GemStone-2.4.8
24-
cache:
25-
directories:
26-
- $SMALLTALK_CI_CACHE
27-
- smalltalk: GemStone-3.1.0.6
28-
cache:
29-
directories:
30-
- $SMALLTALK_CI_CACHE
31-
- smalltalk: GemStone-3.2.16
32-
cache:
33-
directories:
34-
- $SMALLTALK_CI_CACHE
33+
env: BUILD_NAME=Squeak-5.1
34+
- smalltalk: GemStone-3.4.2
35+
env: BUILD_NAME=GemStone-3.4.2
3536
- smalltalk: GemStone-3.3.4
36-
cache:
37-
directories:
38-
- $SMALLTALK_CI_CACHE
37+
env: BUILD_NAME=GemStone-3.3.4
38+
- smalltalk: GemStone-3.2.16
39+
env: BUILD_NAME=GemStone-3.2.16
40+
- smalltalk: GemStone-3.1.0.6
41+
env: BUILD_NAME=GemStone-3.1.0.6
42+
- smalltalk: GemStone-2.4.8
43+
env: BUILD_NAME=GemStone-2.4.8

‎README.md‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
**IMPORTANT**: Since version 1.3.0, this is the main repository of Grease. Versions older than 1.1.9 can be found in the [Smalltalkhub repository](http://www.smalltalkhub.com/#!/~Seaside/Grease11). Check out the [releases list](https://github.com/SeasideSt/Grease/releases) for all version numbers in this repository.
1+
**IMPORTANT**: Since version 1.3.0, this is the main repository of Grease. Versions older than 1.1.9 can only be found in the [Smalltalkhub repository](http://www.smalltalkhub.com/#!/~Seaside/Grease11). Check out the [releases list](https://github.com/SeasideSt/Grease/releases) for all version numbers in this repository.
22

3-
The Grease Portability Library [![Build Status](https://travis-ci.org/SeasideSt/Grease.svg?branch=master)](https://travis-ci.org/SeasideSt/Grease)
3+
The Grease Portability Library
44
======
55
Grease enhances the ANSI Smalltalk standard. With only a few exceptions, we assume platforms are fully ANSI-compliant. Platforms want to support Seaside and standardization makes this easier for the project’s developers and its porters.
66

@@ -14,16 +14,19 @@ Grease does not try to solve all problems. We are not testing Sockets or HTTP cl
1414

1515
Grease is widely adopted. Implementations exist already for all platforms that support Seaside 3.x. As well as Seaside, new versions of Magritte, Pier, and Monticello are already being implemented on top of Grease.
1616

17-
## Travis builds
17+
## Platform compatibility and Travis builds
1818

19-
The [Travis CI builds](https://travis-ci.org/SeasideSt/Grease) currently test Grease for the following platforms and versions:
19+
The latest Grease version is supported on the following platforms and versions, which are tested using [Travis CI builds](https://travis-ci.org/SeasideSt/Grease):
2020

2121
| Squeak | Pharo | GemStone |
2222
| --------------- | ---------------- | -------------------- |
23-
| Squeak 5.1 | Pharo 6.0 | GemStone 3.3.4 |
24-
| | Pharo 5.0 | GemStone 3.2.16 |
25-
| | Pharo 4.0 | GemStone 3.1.0.6 |
26-
| | Pharo 3.0 | |
23+
| [![Build status: Squeak-5.2](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Squeak-trunk&label=5.2)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Pharo64-7.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-7.0&label=7.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.4.2](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.4.2&label=3.4.2)](http://travis-ci.org/SeasideSt/Grease) |
24+
| [![Build status: Squeak-5.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Squeak-5.1&label=5.1)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Pharo64-6.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-6.1&label=6.1)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.3.4](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.3.4&label=3.3.4)](http://travis-ci.org/SeasideSt/Grease) |
25+
| | [![Build status: Pharo-5.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-5.0&label=5.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.2.16](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.2.16&label=3.2.16)](http://travis-ci.org/SeasideSt/Grease) |
26+
| | [![Build status: Pharo-4.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-4.0&label=4.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.1.0.6](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.1.0.6&label=3.1.0.6)](http://travis-ci.org/SeasideSt/Grease) |
27+
| | [![Build status: Pharo-3.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-3.0&label=3.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-2.4.8](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-2.4.8&label=2.4.8)](http://travis-ci.org/SeasideSt/Grease) |
28+
29+
Coveralls (experimental): [![Coverage Status](https://coveralls.io/repos/github/SeasideSt/Grease/badge.svg?branch=test-coveralls)](https://coveralls.io/github/SeasideSt/Grease?branch=test-coveralls)
2730

2831
## Installation
2932

@@ -44,6 +47,7 @@ Metacello new
4447
-or-
4548

4649
Load a specific version:
50+
(See [Releases](https://github.com/SeasideSt/Grease/releases) for a list of versions)
4751

4852
```Smalltalk
4953
Metacello new
@@ -53,7 +57,7 @@ Metacello new
5357
```
5458
-or-
5559

56-
Legacy: load from Smalltalkhub:
60+
Legacy: load older versions from Smalltalkhub:
5761
```Smalltalk
5862
Metacello new
5963
configuration: 'Grease';

‎repository/.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
#format : #filetree
3+
}

‎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: 54 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,39 @@ baseline: spec
1515
group: 'Slime Tests' with: #('Core Tests');
1616
group: 'Tests' with: #('Core Tests' 'Slime Tests');
1717
group: 'default' with: #('Slime') ].
18-
1918
spec
2019
for: #( #'squeak5.x' )
2120
do: [
21+
spec
22+
project: 'Refactoring-Core'
23+
with: [
24+
spec
25+
className: 'ConfigurationOfRefactoringBrowser';
26+
versionString: #'stable';
27+
loads: #('Core');
28+
repository: 'http://www.squeaksource.com/MetacelloRepository' ].
2229
spec
2330
package: 'Grease-Core'
2431
with: [ spec includes: #('Grease-Squeak5-Core') ];
2532
package: 'Grease-Tests-Core'
26-
with: [ spec requires: #('Grease-Squeak5-Core'); includes: #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak5-Core') ];
33+
with: [
34+
spec
35+
requires: #('Grease-Squeak5-Core');
36+
includes:
37+
#('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak5-Core') ];
2738
package: 'Grease-Squeak5-Core'
2839
with: [ spec requires: #('Grease-Core') ];
2940
package: 'Grease-Tests-Squeak-Core'
3041
with: [ spec requires: #('Grease-Tests-Core') ];
3142
package: 'Grease-Tests-Squeak5-Core'
32-
with: [ spec requires: #('Grease-Tests-Squeak-Core') ].
33-
self slimeForSqueakPharo1xPharo2x: spec ].
34-
43+
with: [ spec requires: #('Grease-Tests-Squeak-Core') ];
44+
package: 'Grease-Slime'
45+
with: [ spec requires: #('Refactoring-Core' 'Grease-Core') ];
46+
package: 'Grease-Tests-Slime'
47+
with: [ spec requires: #('Grease-Slime') ].
48+
spec
49+
group: 'Slime' with: #('Grease-Slime');
50+
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
3551
spec
3652
for: #( #'squeak6.x' )
3753
do: [
@@ -55,7 +71,10 @@ baseline: spec
5571
package: 'Grease-Core'
5672
with: [ spec includes: #('Grease-Pharo30-Core') ];
5773
package: 'Grease-Tests-Core'
58-
with: [ spec requires: #('Grease-Pharo30-Core'); includes: #('Grease-Tests-Pharo20-Core') ];
74+
with: [
75+
spec
76+
requires: #('Grease-Pharo30-Core');
77+
includes: #('Grease-Tests-Pharo20-Core') ];
5978
package: 'Grease-Pharo30-Core'
6079
with: [ spec requires: #('Grease-Core') ];
6180
package: 'Grease-Tests-Pharo20-Core'
@@ -73,7 +92,10 @@ baseline: spec
7392
package: 'Grease-Core'
7493
with: [ spec includes: #('Grease-Pharo30-Core') ];
7594
package: 'Grease-Tests-Core'
76-
with: [ spec requires: #('Grease-Pharo30-Core'); includes: #('Grease-Tests-Pharo20-Core') ];
95+
with: [
96+
spec
97+
requires: #('Grease-Pharo30-Core');
98+
includes: #('Grease-Tests-Pharo20-Core') ];
7799
package: 'Grease-Pharo30-Core'
78100
with: [ spec requires: #('Grease-Core') ];
79101
package: 'Grease-Tests-Pharo20-Core'
@@ -86,13 +108,16 @@ baseline: spec
86108
group: 'Slime' with: #('Grease-Pharo40-Slime');
87109
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
88110
spec
89-
for: #(#'pharo6.x')
111+
for: #'pharo6.x'
90112
do: [
91113
spec
92114
package: 'Grease-Core'
93115
with: [ spec includes: #('Grease-Pharo60-Core') ];
94116
package: 'Grease-Tests-Core'
95-
with: [ spec requires: #('Grease-Pharo60-Core'); includes: #('Grease-Tests-Pharo20-Core') ];
117+
with: [
118+
spec
119+
requires: #('Grease-Pharo60-Core');
120+
includes: #('Grease-Tests-Pharo20-Core') ];
96121
package: 'Grease-Pharo60-Core'
97122
with: [ spec requires: #('Grease-Core') ];
98123
package: 'Grease-Tests-Pharo20-Core'
@@ -134,14 +159,16 @@ baseline: spec
134159
spec
135160
className: 'ConfigurationOfGsCore';
136161
versionString: #'stable';
137-
repository: 'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
162+
repository:
163+
'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
138164
project: 'UTF8'
139165
with: [
140166
spec
141167
className: 'ConfigurationOfGsMisc';
142168
versionString: #'stable';
143169
loads: #('Utf8Encoding');
144-
repository: 'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
170+
repository:
171+
'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
145172
project: 'System-Digital-Signatures'
146173
copyFrom: 'UTF8'
147174
with: [ spec loads: #('System-Digital-Signatures') ];
@@ -155,7 +182,10 @@ baseline: spec
155182
requires: #('GsCore');
156183
includes: #('Grease-GemStone-Core') ];
157184
package: 'Grease-Tests-Core'
158-
with: [ spec requires: #('Grease-GemStone-Core'); includes: #('Grease-Tests-GemStone-Core') ];
185+
with: [
186+
spec
187+
requires: #('Grease-GemStone-Core');
188+
includes: #('Grease-Tests-GemStone-Core') ];
159189
package: 'Grease-GemStone-Core'
160190
with: [
161191
spec
@@ -188,7 +218,7 @@ baseline: spec
188218
package: 'Grease-GemStone240-Core'
189219
with: [ spec requires: #('Grease-GemStone-Core') ] ].
190220
spec
191-
for: #'gs3.x'
221+
for: #(#'gs3.0.x' #'gs3.1.x' #'gs3.2.x')
192222
do: [
193223
spec
194224
package: 'Grease-GemStone-Core'
@@ -198,6 +228,17 @@ baseline: spec
198228
spec
199229
requires: #('Grease-GemStone-Core');
200230
postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
231+
spec
232+
for: #(#'gs3.3.x' #'gs3.4.x')
233+
do: [
234+
spec
235+
package: 'Grease-GemStone-Core'
236+
with: [ spec includes: #('Grease-GemStone330-Core') ];
237+
package: 'Grease-GemStone330-Core'
238+
with: [
239+
spec
240+
requires: #('Grease-GemStone-Core');
241+
postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
201242
spec
202243
for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x')
203244
do: [

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"instance" : {
33
"initializeLatin1ToUtf8Encodings" : "JohanBrichau 10/19/2014 10:00",
44
"slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49",
5-
"baseline:" : "JohanBrichau 11/18/2017 16:17"
5+
"baseline:" : "JohanBrichau 11/22/2018 09:09"
66
},
77
"class" : { }
88
}

‎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