Skip to content

Commit 94565be

Browse files
dalehenrichdalehenrich
authored
Merge pull request #13 from SeasideSt/master
Merge latest from Grease
2 parents cbf6d30 + b42b297 commit 94565be

952 files changed

Lines changed: 693 additions & 7293 deletions

File tree

Some content is hidden

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

‎.filetree‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{"packageExtension" : ".package",
2+
"propertyFileExtension" : ".json" }

‎.travis.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ matrix:
2222
- smalltalk: Pharo-4.0
2323
<<: *pharo4-has-latest-metacello
2424
env: BUILD_NAME=Pharo-4.0
25-
- smalltalk: Pharo-3.0
26-
<<: *pharo4-has-latest-metacello
27-
env: BUILD_NAME=Pharo-3.0
2825
- smalltalk: Squeak-trunk
2926
env: BUILD_NAME=Squeak-trunk
3027
- smalltalk: Squeak-5.2

‎README.md‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ The latest Grease version is supported on the following platforms and versions,
2424
| [![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) |
2525
| | [![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) |
2626
| | [![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) |
27+
| | | [![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) |
2828

2929
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)
3030

3131
## Installation
3232

33-
#### Prerequisite on Squeak and Pharo <3.0
33+
#### Prerequisite on Squeak
3434

3535
Make sure you have the [MetacelloPreview version](https://github.com/dalehenrich/metacello-work), otherwise the load will not work.
3636

37-
### Squeak and Pharo >=3.0
37+
### Squeak and Pharo (4.0 or newer)
3838

3939
Load the latest code from master (i.e. stable):
4040

@@ -78,3 +78,31 @@ Gofer new
7878
load.
7979
(Smalltalk at: #GsUpgrader) upgradeGrease.
8080
```
81+
82+
### Pharo (3.0 or older)
83+
84+
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.
85+
86+
For Pharo versions < 3.0, make sure you have the [MetacelloPreview version](https://github.com/dalehenrich/metacello-work), otherwise the load will not work.
87+
88+
Load the latest compatible release:
89+
90+
```Smalltalk
91+
Metacello new
92+
baseline: 'Grease';
93+
githubUser: 'SeasideSt' project: 'Grease' commitish: 'v1.4.1' path: 'repository';
94+
load
95+
```
96+
97+
-or-
98+
99+
Legacy: load older versions from Smalltalkhub:
100+
```Smalltalk
101+
Metacello new
102+
configuration: 'Grease';
103+
repository: 'http://www.smalltalkhub.com/mc/Seaside/MetacelloConfigurations/main';
104+
version: '1.0.0';
105+
load
106+
```
107+
108+
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.

‎repository/.filetree‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
{"packageExtension" : ".package",
2-
"propertyFileExtension" : ".json" }
1+
{
2+
"noMethodMetaData" : true,
3+
"separateMethodMetaAndSource" : false,
4+
"useCypressPropertiesFile" : true }

‎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: 5 additions & 244 deletions
Original file line numberDiff line numberDiff line change
@@ -1,247 +1,8 @@
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') ].
18-
spec
19-
for: #( #'squeak5.x' )
20-
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' ].
29-
spec
30-
package: 'Grease-Core'
31-
with: [ spec includes: #('Grease-Squeak5-Core') ];
32-
package: 'Grease-Tests-Core'
33-
with: [
34-
spec
35-
requires: #('Grease-Squeak5-Core');
36-
includes:
37-
#('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak5-Core') ];
38-
package: 'Grease-Squeak5-Core'
39-
with: [ spec requires: #('Grease-Core') ];
40-
package: 'Grease-Tests-Squeak-Core'
41-
with: [ spec requires: #('Grease-Tests-Core') ];
42-
package: 'Grease-Tests-Squeak5-Core'
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') ].
51-
spec
52-
for: #( #'squeak6.x' )
53-
do: [
54-
spec
55-
package: 'Grease-Core'
56-
with: [ spec includes: #('Grease-Squeak6-Core') ];
57-
package: 'Grease-Tests-Core'
58-
with: [ spec requires: #('Grease-Squeak6-Core'); includes: #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak6-Core') ];
59-
package: 'Grease-Squeak6-Core'
60-
with: [ spec requires: #('Grease-Core') ];
61-
package: 'Grease-Tests-Squeak-Core'
62-
with: [ spec requires: #('Grease-Tests-Core') ];
63-
package: 'Grease-Tests-Squeak6-Core'
64-
with: [ spec requires: #('Grease-Tests-Squeak-Core') ].
65-
self slimeForSqueakPharo1xPharo2x: spec ].
3+
<baseline>
664

67-
spec
68-
for: #'pharo3.x'
69-
do: [
70-
spec
71-
package: 'Grease-Core'
72-
with: [ spec includes: #('Grease-Pharo30-Core') ];
73-
package: 'Grease-Tests-Core'
74-
with: [
75-
spec
76-
requires: #('Grease-Pharo30-Core');
77-
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') ];
82-
package: 'Grease-Slime' with: [ spec requires: #('Grease-Core') ];
83-
package: 'Grease-Tests-Slime'
84-
with: [ spec requires: #('Grease-Slime') ].
85-
spec
86-
group: 'Slime' with: #('Grease-Slime');
87-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
88-
spec
89-
for: #(#'pharo4.x' #'pharo5.x')
90-
do: [
91-
spec
92-
package: 'Grease-Core'
93-
with: [ spec includes: #('Grease-Pharo30-Core') ];
94-
package: 'Grease-Tests-Core'
95-
with: [
96-
spec
97-
requires: #('Grease-Pharo30-Core');
98-
includes: #('Grease-Tests-Pharo20-Core') ];
99-
package: 'Grease-Pharo30-Core'
100-
with: [ spec requires: #('Grease-Core') ];
101-
package: 'Grease-Tests-Pharo20-Core'
102-
with: [ spec requires: #('Grease-Tests-Core') ];
103-
package: 'Grease-Pharo40-Slime'
104-
with: [ spec requires: #('Grease-Core') ];
105-
package: 'Grease-Tests-Slime'
106-
with: [ spec requires: #('Grease-Pharo40-Slime') ].
107-
spec
108-
group: 'Slime' with: #('Grease-Pharo40-Slime');
109-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
110-
spec
111-
for: #'pharo6.x'
112-
do: [
113-
spec
114-
package: 'Grease-Core'
115-
with: [ spec includes: #('Grease-Pharo60-Core') ];
116-
package: 'Grease-Tests-Core'
117-
with: [
118-
spec
119-
requires: #('Grease-Pharo60-Core');
120-
includes: #('Grease-Tests-Pharo20-Core') ];
121-
package: 'Grease-Pharo60-Core'
122-
with: [ spec requires: #('Grease-Core') ];
123-
package: 'Grease-Tests-Pharo20-Core'
124-
with: [ spec requires: #('Grease-Tests-Core') ];
125-
package: 'Grease-Pharo40-Slime'
126-
with: [ spec requires: #('Grease-Core') ];
127-
package: 'Grease-Tests-Slime'
128-
with: [ spec requires: #('Grease-Pharo40-Slime') ].
129-
spec
130-
group: 'Slime' with: #('Grease-Pharo40-Slime');
131-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
132-
133-
spec
134-
for: #(#'pharo7.x')
135-
do: [
136-
spec
137-
package: 'Grease-Core'
138-
with: [ spec includes: #('Grease-Pharo70-Core') ];
139-
package: 'Grease-Tests-Core'
140-
with: [ spec requires: #('Grease-Pharo70-Core'); includes: #('Grease-Tests-Pharo20-Core') ];
141-
package: 'Grease-Pharo70-Core'
142-
with: [ spec requires: #('Grease-Core') ];
143-
package: 'Grease-Tests-Pharo20-Core'
144-
with: [ spec requires: #('Grease-Tests-Core') ];
145-
package: 'Grease-Pharo40-Slime'
146-
with: [ spec requires: #('Grease-Core') ];
147-
package: 'Grease-Tests-Slime'
148-
with: [ spec requires: #('Grease-Pharo40-Slime') ].
149-
spec
150-
group: 'Slime' with: #('Grease-Pharo40-Slime');
151-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
152-
153-
spec
154-
for: #'gemstone'
155-
do: [
156-
spec
157-
project: 'GsCore'
158-
with: [
159-
spec
160-
className: 'ConfigurationOfGsCore';
161-
versionString: #'stable';
162-
repository:
163-
'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
164-
project: 'UTF8'
165-
with: [
166-
spec
167-
className: 'ConfigurationOfGsMisc';
168-
versionString: #'stable';
169-
loads: #('Utf8Encoding');
170-
repository:
171-
'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
172-
project: 'System-Digital-Signatures'
173-
copyFrom: 'UTF8'
174-
with: [ spec loads: #('System-Digital-Signatures') ];
175-
project: 'SMTPMail'
176-
copyFrom: 'UTF8'
177-
with: [ spec loads: #('SMTPMail') ].
178-
spec
179-
package: 'Grease-Core'
180-
with: [
181-
spec
182-
requires: #('GsCore');
183-
includes: #('Grease-GemStone-Core') ];
184-
package: 'Grease-Tests-Core'
185-
with: [
186-
spec
187-
requires: #('Grease-GemStone-Core');
188-
includes: #('Grease-Tests-GemStone-Core') ];
189-
package: 'Grease-GemStone-Core'
190-
with: [
191-
spec
192-
requires:
193-
#('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ];
194-
package: 'Grease-Tests-GemStone-Core'
195-
with: [ spec requires: #('Grease-Tests-Core') ] ].
196-
spec
197-
for: #'gs2.x'
198-
do: [
199-
spec
200-
package: 'Grease-GemStone-Core'
201-
with: [ spec includes: #('Grease-GemStone200-Core') ];
202-
package: 'Grease-GemStone200-Core'
203-
with: [ spec requires: #('Grease-GemStone-Core') ] ].
204-
spec
205-
for: #'gs2.3.x'
206-
do: [
207-
spec
208-
package: 'Grease-GemStone-Core'
209-
with: [ spec includes: #('Grease-GemStone230-Core') ];
210-
package: 'Grease-GemStone230-Core'
211-
with: [ spec requires: #('Grease-GemStone-Core') ] ].
212-
spec
213-
for: #'gs2.4.x'
214-
do: [
215-
spec
216-
package: 'Grease-GemStone-Core'
217-
with: [ spec includes: #('Grease-GemStone240-Core') ];
218-
package: 'Grease-GemStone240-Core'
219-
with: [ spec requires: #('Grease-GemStone-Core') ] ].
220-
spec
221-
for: #(#'gs3.0.x' #'gs3.1.x' #'gs3.2.x')
222-
do: [
223-
spec
224-
package: 'Grease-GemStone-Core'
225-
with: [ spec includes: #('Grease-GemStone300-Core') ];
226-
package: 'Grease-GemStone300-Core'
227-
with: [
228-
spec
229-
requires: #('Grease-GemStone-Core');
230-
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' ] ].
242-
spec
243-
for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x')
244-
do: [
245-
spec
246-
package: 'Grease-Tests-GemStone-Core'
247-
with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
5+
self baselineCommon: spec.
6+
self baselineSqueak: spec.
7+
self baselinePharo: spec.
8+
self baselineGemStone: spec

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
baseline
2+
baselineCommon: spec
3+
spec
4+
for: #common
5+
do: [ spec blessing: #baseline.
6+
spec
7+
package: 'Grease-Core';
8+
package: 'Grease-Tests-Core'
9+
with: [ spec requires: #('Grease-Core') ].
10+
spec
11+
group: 'Core' with: #('Grease-Core');
12+
group: 'Core Tests' with: #('Grease-Tests-Core');
13+
group: 'Slime' with: #('Core');
14+
group: 'Slime Tests' with: #('Core Tests');
15+
group: 'Tests' with: #('Core Tests' 'Slime Tests');
16+
group: 'default' with: #('Slime') ]

0 commit comments

Comments
 (0)