X Tutup
Skip to content

Commit 5a4bfb4

Browse files
author
Johan Brichau
authored
Merge pull request SeasideSt#17 from SeasideSt/gsdevkit-merge
straight up comparison between the two reops
2 parents 0ca2766 + 464fd24 commit 5a4bfb4

File tree

146 files changed

+636
-439
lines changed

Some content is hidden

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

146 files changed

+636
-439
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: smalltalkCI
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-16.04
8+
strategy:
9+
fail-fast: false
10+
matrix:
11+
smalltalk: [ Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, Pharo-6.1, GemStone64-3.6.0, GemStone64-3.5.5, GemStone64-3.4.5, GemStone64-3.3.9, GemStone64-3.2.17, GemStone64-3.1.0.6, Squeak64-5.3, Squeak64-5.2, Squeak64-5.1 ]
12+
experimental: [ false ]
13+
include:
14+
- smalltalk: Squeak64-trunk
15+
experimental: true
16+
continue-on-error: ${{ matrix.experimental }}
17+
name: ${{ matrix.smalltalk }}
18+
steps:
19+
- uses: actions/checkout@v2
20+
- uses: hpi-swa/setup-smalltalkCI@v1
21+
with:
22+
smalltalk-version: ${{ matrix.smalltalk }}
23+
- name: Fix missing OS prerequisites for GemStone builds
24+
run: |
25+
git clone https://github.com/GsDevKit/GsDevKit_home.git
26+
./GsDevKit_home/bin/utils/installOsPrereqs
27+
continue-on-error: true
28+
if: startsWith(matrix.smalltalk,'GemStone')
29+
- name: Run tests
30+
run: smalltalkci -s ${{ matrix.smalltalk }}
31+
shell: bash
32+
timeout-minutes: 10

‎.pharo4.ston‎

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

‎.travis.yml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
language: smalltalk
22
sudo: false
33

4-
aliases:
5-
- &pharo4-has-latest-metacello
6-
smalltalk_config: .pharo4.ston
7-
84
matrix:
95
allow_failures:
10-
- smalltalk: Pharo64-9.0
116
- smalltalk: Squeak32-trunk
127
include:
138
- smalltalk: Pharo64-9.0
@@ -20,11 +15,6 @@ matrix:
2015
env: BUILD_NAME=Pharo64-6.1
2116
- smalltalk: Pharo-6.1
2217
env: BUILD_NAME=Pharo-6.1
23-
- smalltalk: Pharo-5.0
24-
env: BUILD_NAME=Pharo-5.0
25-
- smalltalk: Pharo-4.0
26-
<<: *pharo4-has-latest-metacello
27-
env: BUILD_NAME=Pharo-4.0
2818
- smalltalk: Squeak32-trunk
2919
env: BUILD_NAME=Squeak-trunk
3020
- smalltalk: Squeak32-5.3
@@ -45,9 +35,3 @@ matrix:
4535
env: BUILD_NAME=GemStone-3.2.17
4636
- smalltalk: GemStone-3.1.0.6
4737
env: BUILD_NAME=GemStone-3.1.0.6
48-
- smalltalk: GemStone-2.4.8
49-
env: BUILD_NAME=GemStone-2.4.8
50-
51-
notifications:
52-
slack: gemtalksystems:4YWbzy6sJN9cE0FhxvUPP8nS
53-

‎README.md‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ The latest Grease version is supported on the following platforms and versions,
2020

2121
| Squeak | Pharo | GemStone |
2222
| --------------- | ---------------- | -------------------- |
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-8.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-8.0&label=8.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.5.2](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.5.2&label=3.5.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-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.5](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.4.5&label=3.4.5)](http://travis-ci.org/SeasideSt/Grease) |
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-9.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-9.0&label=9.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.6.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.6.0&label=3.6.0)](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-8.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-8.0&label=8.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.5.5](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.5.5&label=3.5.5)](http://travis-ci.org/SeasideSt/Grease) |
25+
| | [![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.5](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.4.5&label=3.4.5)](http://travis-ci.org/SeasideSt/Grease) |
2526
| | [![Build status: Pharo-6.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-6.1&label=6.1)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.3.9](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.3.9&label=3.3.9)](http://travis-ci.org/SeasideSt/Grease) |
26-
| | [![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.17](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.2.17&label=3.2.17)](http://travis-ci.org/SeasideSt/Grease) |
27-
| | [![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) |
28-
| | | [![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) |
27+
| | | [![Build status: Gemstone-3.2.17](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.2.17&label=3.2.17)](http://travis-ci.org/SeasideSt/Grease) |
28+
| | | [![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) |
29+
| | | |
2930

3031
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)
3132

@@ -35,7 +36,7 @@ Coveralls (experimental): [![Coverage Status](https://coveralls.io/repos/github/
3536

3637
Make sure you have the [MetacelloPreview version](https://github.com/Metacello/metacello), otherwise the load will not work.
3738

38-
### Squeak and Pharo (4.0 or newer)
39+
### Squeak and Pharo (6.0 or newer)
3940

4041
Load the latest code from master (i.e. stable):
4142

@@ -80,9 +81,11 @@ Gofer new
8081
(Smalltalk at: #GsUpgrader) upgradeGrease.
8182
```
8283

83-
### Pharo (3.0 or older)
84+
### Pharo (5.0 or older)
8485

85-
The compatibility for Pharo < 4.0 is not maintained for new releases. If you need grease in Pharo < 4, we recommend to either update your pharo version or reference the latest release compatible with Pharo < 4, which is currently v1.4.1.
86+
The compatibility for Pharo < 6.0 is not maintained for new releases. If you need grease in Pharo < 6, we recommend to either update your pharo version or reference the latest release compatible with your version of Pharo:
87+
- Pharo <4: v1.4.1
88+
- Pharo 5 & 6: v1.6.1
8689

8790
For Pharo versions < 3.0, make sure you have the [MetacelloPreview version](https://github.com/dalehenrich/metacello-work), otherwise the load will not work.
8891

@@ -106,4 +109,4 @@ Metacello new
106109
load
107110
```
108111

109-
In case you need a specific feature for Pharo 3, it is still possible to create a new release by branching from v1.4.1.
112+
In case you need a specific feature for an older version, it is still possible to create a new release by branching starting from the tagged commit of the compatible version.

‎repository/BaselineOfGrease.package/.filetree‎

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
baseline
1+
baselines
22
baseline: spec
33
<baseline>
44

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
baseline
1+
baselines
22
baselineCommon: spec
33
spec
44
for: #common

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

Lines changed: 125 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,126 @@
1-
baseline
1+
baselines
22
baselineGemStone: spec
3-
spec
4-
for: #'gemstone'
5-
do: [
6-
spec
7-
project: 'GsCore'
8-
with: [
9-
spec
10-
className: 'ConfigurationOfGsCore';
11-
versionString: #'stable';
12-
repository: 'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
13-
project: 'UTF8'
14-
with: [
15-
spec
16-
className: 'ConfigurationOfGsMisc';
17-
versionString: #'stable';
18-
loads: #('Utf8Encoding');
19-
repository: 'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
20-
project: 'System-Digital-Signatures'
21-
copyFrom: 'UTF8'
22-
with: [ spec loads: #('System-Digital-Signatures') ];
23-
project: 'SMTPMail' copyFrom: 'UTF8' with: [ spec loads: #('SMTPMail') ].
24-
spec
25-
package: 'Grease-Core'
26-
with: [
27-
spec
28-
requires: #('GsCore');
29-
includes: #('Grease-GemStone-Core') ];
30-
package: 'Grease-Tests-Core'
31-
with: [
32-
spec
33-
requires: #('Grease-GemStone-Core');
34-
includes: #('Grease-Tests-GemStone-Core') ];
35-
package: 'Grease-GemStone-Core'
36-
with: [
37-
spec
38-
requires:
39-
#('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ];
40-
package: 'Grease-Tests-GemStone-Core'
41-
with: [ spec requires: #('Grease-Tests-Core') ] ].
42-
spec
43-
for: #'gs2.x'
44-
do: [
45-
spec
46-
package: 'Grease-GemStone-Core'
47-
with: [ spec includes: #('Grease-GemStone200-Core') ];
48-
package: 'Grease-GemStone200-Core'
49-
with: [ spec requires: #('Grease-GemStone-Core') ] ].
50-
spec
51-
for: #'gs2.3.x'
52-
do: [
53-
spec
54-
package: 'Grease-GemStone-Core'
55-
with: [ spec includes: #('Grease-GemStone230-Core') ];
56-
package: 'Grease-GemStone230-Core'
57-
with: [ spec requires: #('Grease-GemStone-Core') ] ].
58-
spec
59-
for: #'gs2.4.x'
60-
do: [
61-
spec
62-
package: 'Grease-GemStone-Core'
63-
with: [ spec includes: #('Grease-GemStone240-Core') ];
64-
package: 'Grease-GemStone240-Core'
65-
with: [ spec requires: #('Grease-GemStone-Core') ] ].
66-
spec
67-
for: #(#'gs3.0.x' #'gs3.1.x' #'gs3.2.x')
68-
do: [
69-
spec
70-
package: 'Grease-GemStone-Core'
71-
with: [ spec includes: #('Grease-GemStone300-Core') ];
72-
package: 'Grease-GemStone300-Core'
73-
with: [
74-
spec
75-
requires: #('Grease-GemStone-Core');
76-
postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
77-
spec
78-
for:
79-
#(#'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x' #'gs3.7.x' #'gs3.8.x' #'gs3.9.x')
80-
do: [
81-
spec
82-
package: 'Grease-GemStone-Core'
83-
with: [ spec includes: #('Grease-GemStone330-Core') ];
84-
package: 'Grease-GemStone330-Core'
85-
with: [
86-
spec
87-
requires: #('Grease-GemStone-Core');
88-
postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
89-
spec
90-
for: #(#'gs3.5.4.x' #'gs3.5.5.x')
91-
do: [
92-
spec
93-
package: 'Grease-GemStone-Core'
94-
with: [ spec includes: #('Grease-GemStone-Kernelv354') ];
95-
package: 'Grease-GemStone-Kernelv354'
96-
with: [ spec requires: #('Grease-GemStone-Core') ] ].
97-
spec
98-
for: #(#'gs3.6.x' #'gs3.7.x' #'gs3.8.x' #'gs3.9.x')
99-
do: [
100-
spec
101-
package: 'Grease-GemStone-Core'
102-
with: [ spec includes: #('Grease-GemStone-Kernelv360') ];
103-
package: 'Grease-GemStone-Kernelv360'
104-
with: [ spec requires: #('Grease-GemStone-Core') ] ].
105-
spec
106-
for:
107-
#(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x' #'gs3.7.x' #'gs3.8.x' #'gs3.9.x')
108-
do: [
109-
spec
110-
package: 'Grease-Tests-GemStone-Core'
111-
with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
3+
spec
4+
for: #'gemstone'
5+
do: [
6+
spec
7+
project: 'GsCore'
8+
with: [
9+
spec
10+
className: 'ConfigurationOfGsCore';
11+
versionString: #'stable';
12+
repository:
13+
'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
14+
project: 'UTF8'
15+
with: [
16+
spec
17+
className: 'ConfigurationOfGsMisc';
18+
versionString: #'stable';
19+
loads: #('Utf8Encoding');
20+
repository:
21+
'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
22+
project: 'System-Digital-Signatures'
23+
copyFrom: 'UTF8'
24+
with: [ spec loads: #('System-Digital-Signatures') ];
25+
project: 'SMTPMail'
26+
copyFrom: 'UTF8'
27+
with: [ spec loads: #('SMTPMail') ].
28+
spec
29+
package: 'Grease-Core'
30+
with: [
31+
spec
32+
requires: #('GsCore');
33+
includes: #('Grease-GemStone-Core') ];
34+
package: 'Grease-Tests-Core'
35+
with: [
36+
spec
37+
requires: #('Grease-GemStone-Core') ];
38+
package: 'Grease-GemStone-Core'
39+
with: [
40+
spec
41+
requires:
42+
#('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ] ].
43+
44+
spec
45+
for: #'gs2.x'
46+
do: [
47+
spec
48+
package: 'Grease-GemStone-Core'
49+
with: [ spec includes: #('Grease-GemStone200-Core') ];
50+
package: 'Grease-GemStone200-Core'
51+
with: [ spec requires: #('Grease-GemStone-Core') ] ].
52+
spec
53+
for: #'gs2.3.x'
54+
do: [
55+
spec
56+
package: 'Grease-GemStone-Core'
57+
with: [ spec includes: #('Grease-GemStone230-Core') ];
58+
package: 'Grease-GemStone230-Core'
59+
with: [ spec requires: #('Grease-GemStone-Core') ] ].
60+
spec
61+
for: #'gs2.4.x'
62+
do: [
63+
spec
64+
package: 'Grease-GemStone-Core'
65+
with: [ spec includes: #('Grease-GemStone240-Core') ];
66+
package: 'Grease-GemStone240-Core'
67+
with: [ spec requires: #('Grease-GemStone-Core') ] ].
68+
spec
69+
for: #(#'gs3.0.x' #'gs3.1.x' #'gs3.2.x')
70+
do: [
71+
spec
72+
package: 'Grease-GemStone-Core'
73+
with: [ spec includes: #('Grease-GemStone300-Core') ];
74+
package: 'Grease-GemStone300-Core'
75+
with: [
76+
spec
77+
requires: #('Grease-GemStone-Core');
78+
postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
79+
spec
80+
for: #(#'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x' #'gs3.7.x' #'gs3.8.x' #'gs3.9.x')
81+
do: [
82+
spec
83+
package: 'Grease-GemStone-Core'
84+
with: [ spec includes: #('Grease-GemStone330-Core') ];
85+
package: 'Grease-GemStone330-Core'
86+
with: [
87+
spec
88+
requires: #('Grease-GemStone-Core');
89+
postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
90+
91+
spec for: #(#'gs2.x' #'gs3.0.x' #'gs3.1.x')
92+
do:[
93+
spec
94+
package: 'Grease-Tests-GemStone-Core'
95+
with:[ spec requires: 'Grease-Tests-Core' ];
96+
package: 'Grease-Tests-Core'
97+
with: [ spec includes: 'Grease-Tests-GemStone-Core' ] ].
98+
99+
spec
100+
for: #( #'gs3.5.4.x' #'gs3.5.5.x' )
101+
do: [
102+
spec
103+
package: 'Grease-GemStone-Core'
104+
with: [ spec includes: #('Grease-GemStone-Kernelv354') ];
105+
package: 'Grease-GemStone-Kernelv354'
106+
with: [
107+
spec
108+
requires: #('Grease-GemStone-Core') ] ].
109+
spec
110+
for: #( #'gs3.6.x' #'gs3.7.x' #'gs3.8.x' #'gs3.9.x')
111+
do: [
112+
spec
113+
package: 'Grease-GemStone-Core'
114+
with: [ spec includes: #('Grease-GemStone-Kernelv360') ];
115+
package: 'Grease-GemStone-Kernelv360'
116+
with: [
117+
spec
118+
requires: #('Grease-GemStone-Core') ] ].
119+
spec
120+
for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x' #'gs3.7.x' #'gs3.8.x' #'gs3.9.x')
121+
do: [
122+
spec
123+
package: 'Grease-Tests-GemStone32-Core'
124+
with:[ spec requires: 'Grease-Tests-Core' ];
125+
package: 'Grease-Tests-Core'
126+
with: [ spec includes: 'Grease-Tests-GemStone32-Core' ] ]

0 commit comments

Comments
 (0)
X Tutup