Skip to content

Commit 6ea4f01

Browse files
dalehenrichdalehenrich
committed
Merge branch 'master' into dev
2 parents a032f35 + d9c9daa commit 6ea4f01

File tree

320 files changed

+1984
-150
lines changed

Some content is hidden

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

320 files changed

+1984
-150
lines changed

‎.smalltalk.ston‎

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

‎.travis.yml‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,14 @@
1-
language: erlang
2-
3-
env:
4-
5-
- ST=Pharo-1.4 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
6-
- ST=Pharo-2.0 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
7-
- ST=Pharo-3.0 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
8-
- ST=Pharo-4.0 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
9-
- ST=Squeak-4.4 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
10-
- ST=Squeak-4.5 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
11-
- ST=GemStone-2.4.4.2 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
12-
- ST=GemStone-3.1.0.6 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
13-
- ST=GemStone-3.2.2 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
14-
15-
install:
16-
17-
- export PROJECT_HOME="$(pwd)"
18-
- cd $HOME
19-
- wget -q -O builderCI.zip https://github.com/dalehenrich/builderCI/zipball/master
20-
- unzip -q builderCI.zip
21-
- cd dalehenrich-builderCI*
22-
- source build_env_vars
23-
- ln -s $PROJECT_HOME $GIT_PATH
24-
- ./build_image.sh
25-
26-
script: $PROJECT_HOME/tests/testTravisCI.sh -verbose
1+
language: smalltalk
2+
sudo: false
3+
smalltalk:
4+
- Pharo-5.0
5+
- Pharo-4.0
6+
- Pharo-3.0
7+
- Squeak-4.5
8+
- Squeak-5.0
9+
- GemStone-3.1.0.6
10+
- GemStone-3.2.12
11+
- GemStone-3.3.0
12+
cache:
13+
directories:
14+
- $SMALLTALK_CI_CACHE

‎README.md‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ The Grease Portability Library [![Build Status](https://travis-ci.org/SeasideSt
33

44
The main repository of Grease is on Smalltalkhub: (http://www.smalltalkhub.com/#!/~Seaside/Grease11). This repository mirrors it.
55

6-
The Travis CI builds currently test Grease for Pharo1.4, Pharo2.0, Pharo3.0, Pharo4.0, Squeak 4.4, Squeak 4.5, Gemstone 2.4.4.1, Gemstone 3.1.0.6 and Gemstone 3.2.2
7-
86
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.
97

108
Grease defines expected APIs with unit tests. Platforms can quickly determine if they are compatible and users can examine the tests to determine exactly which behaviours they can count on.
@@ -17,9 +15,42 @@ Grease does not try to solve all problems. We are not testing Sockets or HTTP cl
1715

1816
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.
1917

20-
##GemStone Installation
18+
##Travis builds
19+
20+
The [Travis CI builds](https://travis-ci.org/SeasideSt/Grease) currently test Grease for the following platforms and versions:
21+
22+
| Squeak | Pharo | GemStone |
23+
| --------------- | ---------------- | -------------------- |
24+
| Squeak 5.0 | Pharo 5.0 | GemStone 3.3.0 |
25+
| Squeak 4.5 | Pharo 4.0 | GemStone 3.2.12 |
26+
| | Pharo 3.0 | GemStone 3.1.0.6 |
27+
28+
##Installation
29+
30+
###Squeak and Pharo
31+
32+
Make sure you have the [MetacelloPreview version](https://github.com/dalehenrich/metacello-work), otherwise the load will not work. You have two options for loading: from Smalltalkhub or from Github.
33+
34+
Load from Smalltalkhub:
35+
```Smalltalk
36+
Metacello new
37+
configuration: 'Grease';
38+
repository: 'http://www.smalltalkhub.com/mc/Seaside/MetacelloConfigurations/main';
39+
version: #stable;
40+
load
41+
```
42+
-or-
43+
Load from: Github:
44+
```Smalltalk
45+
Metacello new
46+
baseline: 'Grease';
47+
githubUser: 'SeasideSt' project: 'Grease' commitish: '' path: 'repository';
48+
load
49+
```
50+
###GemStone
2151

22-
GsUpgrader works on all versions of GemStone against all Versions of GLASS:
52+
Grease is part of the GLASS setup. You can upgrade your version of Grease using [GsUpgrader](https://github.com/GsDevKit/gsUpgrader).
53+
GsUpgrader works on all versions of GemStone against all versions of GLASS:
2354

2455
```Smalltalk
2556
Gofer new

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ baseline: spec
1616
group: 'Tests' with: #('Core Tests' 'Slime Tests');
1717
group: 'default' with: #('Slime') ].
1818
spec
19-
for: #'squeak'
19+
for: #'squeak4.x'
2020
do: [
2121
spec
2222
package: 'Grease-Core'
@@ -31,6 +31,21 @@ baseline: spec
3131
package: 'Grease-Tests-Squeak-Core'
3232
with: [ spec requires: #('Grease-Tests-Pharo-Core') ].
3333
self slimeForSqueakPharo1xPharo2x: spec ].
34+
spec
35+
for: #'squeak5.x'
36+
do: [
37+
spec
38+
package: 'Grease-Core'
39+
with: [ spec includes: #('Grease-Squeak5-Core') ];
40+
package: 'Grease-Tests-Core'
41+
with: [ spec includes: #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak5-Core') ];
42+
package: 'Grease-Squeak5-Core'
43+
with: [ spec requires: #('Grease-Core') ];
44+
package: 'Grease-Tests-Squeak-Core'
45+
with: [ spec requires: #('Grease-Tests-Core') ];
46+
package: 'Grease-Tests-Squeak5-Core'
47+
with: [ spec requires: #('Grease-Tests-Squeak-Core') ].
48+
self slimeForSqueakPharo1xPharo2x: spec ].
3449
spec
3550
for: #'pharo1.0'
3651
do: [
@@ -86,7 +101,7 @@ baseline: spec
86101
group: 'Slime' with: #('Grease-Slime');
87102
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
88103
spec
89-
for: #'pharo4.x'
104+
for: #(#'pharo4.x' #'pharo5.x')
90105
do: [
91106
spec
92107
package: 'Grease-Core'

‎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:" : "dkh 12/21/2015 14:45",
5+
"baseline:" : "JohanBrichau 2/27/2016 13:46",
66
"initializeLatin1ToUtf8Encodings" : "JohanBrichau 10/19/2014 10:00",
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-dkh.10' message 'update for GemStone 3.4 ...' id 'ad7f9331-d83f-4976-bf57-1d1e81111fc6' date '12/21/2015' time '15:07:11' author 'dkh' ancestors ((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 ())) stepChildren ())
1+
(name 'BaselineOfGrease-dkh.15' message 'merged by GitFileTree-MergeDriver' id '86b6f4f6-f95f-4bd7-9224-f31c5460e354' date '4 April 2016' time '9:40:53.04415 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.10' message 'update for GemStone 3.4 ...' id 'ad7f9331-d83f-4976-bf57-1d1e81111fc6' date '21 December 2015' time '3:07:11 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.9' message 'Update baseline for GemStone 3.3' id 'af9364dd-14bc-4e5e-9fc7-0abe08732ab2' date '26 May 2015' time '11:46:07 am' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.8' message 'separate package for Squeak' id '91c019c7-2b8b-40c3-97d9-2047a69512a7' date '22 March 2015' time '12:01:37 pm' author 'JohanBrichau' ancestors ((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 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 ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfGrease-JohanBrichau.14' message 'Ensure Squeak5 tests package is loaded in Squeak5' id 'abde1bd6-a8d6-45fc-a922-bcf63ec38f03' date '27 February 2016' time '1:47:23.046532 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.13' message 'Forked Grease-Tests-Pharo-Core into Grease-Tests-Squeak5-Core' id '3a01ebbc-8859-45db-ae5a-e5de8073d3a4' date '27 February 2016' time '1:40:18.726436 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.12' message 'added Pharo-Tests to Squeak5 load' id 'ffe11ade-e4f1-496d-ae59-74543cfad134' date '27 February 2016' time '1:21:56.832518 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.11' message 'added pharo5 platform to baseline' id '5c0332e9-ef4c-43cd-9066-7c9fe9ed6506' date '27 February 2016' time '12:12:12.067693 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.10' message 'added squeak 5 platform' id '18f9d568-869f-4550-804a-b0ba101f33f3' date '13 December 2015' time '8:36:25.150207 pm' author 'JohanBrichau' ancestors ((id 'af9364dd-14bc-4e5e-9fc7-0abe08732ab2')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())

‎repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ resolveWith: aDictionary
1111
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo30-') ifAbsent: [
1212
"try -Pharo40-"
1313
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo40-') ifAbsent: [
14-
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ]
14+
"try -Pharo50-"
15+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo50-') ifAbsent: [
16+
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ]

‎repository/Grease-Core.package/GRPackage.class/methodProperties.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"name" : "lr 2/17/2010 15:18",
1919
"name:" : "lr 10/25/2009 11:26",
2020
"printOn:" : "merged 10/20/2008 09:24",
21-
"resolveWith:" : "jok 8/23/2014 10:59",
21+
"resolveWith:" : "JohanBrichau 3/26/2016 15:54",
2222
"seasideAddonsUrl" : "pmm 9/12/2013 15:59",
2323
"seasideLGPLUrl" : "pmm 9/12/2013 15:59",
2424
"seasideUrl" : "pmm 9/12/2013 15:58",

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SystemOrganization addCategory: #'Grease-Core'!
2-
SystemOrganization addCategory: #'Grease-Core-Collections'!
3-
SystemOrganization addCategory: #'Grease-Core-Exceptions'!
4-
SystemOrganization addCategory: #'Grease-Core-Text'!
5-
SystemOrganization addCategory: #'Grease-Core-Utilities'!
2+
SystemOrganization addCategory: 'Grease-Core-Collections'!
3+
SystemOrganization addCategory: 'Grease-Core-Exceptions'!
4+
SystemOrganization addCategory: 'Grease-Core-Text'!
5+
SystemOrganization addCategory: 'Grease-Core-Utilities'!

0 commit comments

Comments
 (0)