X Tutup
Skip to content

Merge latest from Grease #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dalehenrich merged 22 commits into from
Feb 8, 2019
Merged

Merge latest from Grease #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d61eb7c
Fix macroman encoding lookup in Grease-Pharo70-Core
theseion Dec 14, 2018
607d7ae
Fix macroman encoding lookup in Grease-Squeak5-Core and Grease-Squeak…
theseion Dec 15, 2018
d170a3f
Remove duplicates from encoding names.
theseion Dec 15, 2018
21fab76
Merge pull request #71 from theseion/fix-macroman-encoding-lookup
Dec 15, 2018
338c71e
Update metadatas to make repo metadataless
jecisc Dec 28, 2018
84f1237
Remove metadatas
jecisc Dec 28, 2018
a122378
Drop Pharo 3 from travis
jecisc Dec 28, 2018
a71eb84
Remove Pharo 3 from the baseline.
jecisc Dec 28, 2018
79d91cd
Update README.
jecisc Dec 28, 2018
c1b2c0f
typo
jecisc Dec 28, 2018
d6c0241
Merge pull request #80 from jecisc/73-Remove-build-for-Pharo-3
Jan 24, 2019
7ab2334
fix for issue 81, thanks @gcotelli
Jan 24, 2019
03a1a1f
Merge pull request #84 from SeasideSt/81-GRSmallDictionary2-removeKey…
Jan 24, 2019
6c750b1
Put load instructions for recent Pharo first
Jan 26, 2019
2f227fa
Remove unmaintained packages
Jan 26, 2019
908d5dc
Remove unmaintained packages
Jan 26, 2019
5804e12
Now really remove packages
Jan 26, 2019
be5b51c
Renamed Grease-Pharo20-Tests-Core to Grease-Tests-Pharo-Core
Jan 26, 2019
5156d6b
Really removed the Grease-Tests-Pharo20-Core package
Jan 26, 2019
7b17e61
Merge pull request #85 from SeasideSt/76-Remove-Grease-Pharo1X-Core-p…
Jan 26, 2019
a508114
Restructure BaselineOfGrease into separate methods per platform
Jan 26, 2019
b42b297
Merge pull request #86 from SeasideSt/restructure-baseline
Jan 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .filetree
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{"packageExtension" : ".package",
"propertyFileExtension" : ".json" }
3 changes: 0 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ matrix:
- smalltalk: Pharo-4.0
<<: *pharo4-has-latest-metacello
env: BUILD_NAME=Pharo-4.0
- smalltalk: Pharo-3.0
<<: *pharo4-has-latest-metacello
env: BUILD_NAME=Pharo-3.0
- smalltalk: Squeak-trunk
env: BUILD_NAME=Squeak-trunk
- smalltalk: Squeak-5.2
Expand Down
34 changes: 31 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ The latest Grease version is supported on the following platforms and versions,
| [![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) |
| | [![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) |
| | [![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) |
| | [![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) |
| | | [![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) |

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)

## Installation

#### Prerequisite on Squeak and Pharo <3.0
#### Prerequisite on Squeak

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

### Squeak and Pharo >=3.0
### Squeak and Pharo (4.0 or newer)

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

Expand Down Expand Up @@ -78,3 +78,31 @@ Gofer new
load.
(Smalltalk at: #GsUpgrader) upgradeGrease.
```

### Pharo (3.0 or older)

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.

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

Load the latest compatible release:

```Smalltalk
Metacello new
baseline: 'Grease';
githubUser: 'SeasideSt' project: 'Grease' commitish: 'v1.4.1' path: 'repository';
load
```

-or-

Legacy: load older versions from Smalltalkhub:
```Smalltalk
Metacello new
configuration: 'Grease';
repository: 'http://www.smalltalkhub.com/mc/Seaside/MetacelloConfigurations/main';
version: '1.0.0';
load
```

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.
6 changes: 4 additions & 2 deletions repository/.filetree
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
{"packageExtension" : ".package",
"propertyFileExtension" : ".json" }
{
"noMethodMetaData" : true,
"separateMethodMetaAndSource" : false,
"useCypressPropertiesFile" : true }
5 changes: 3 additions & 2 deletions repository/BaselineOfGrease.package/.filetree
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"noMethodMetaData" : true,
"separateMethodMetaAndSource" : false,
"useCypressPropertiesFile" : true }
"noMethodMetaData" : true,
"useCypressPropertiesFile" : true
}
249 changes: 5 additions & 244 deletions repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,247 +1,8 @@
baseline
baseline: spec
<baseline>
spec
for: #'common'
do: [
spec blessing: #'baseline'.
spec
package: 'Grease-Core';
package: 'Grease-Tests-Core' with: [ spec requires: #('Grease-Core') ].
spec
group: 'Core' with: #('Grease-Core');
group: 'Core Tests' with: #('Grease-Tests-Core');
group: 'Slime' with: #('Core');
group: 'Slime Tests' with: #('Core Tests');
group: 'Tests' with: #('Core Tests' 'Slime Tests');
group: 'default' with: #('Slime') ].
spec
for: #( #'squeak5.x' )
do: [
spec
project: 'Refactoring-Core'
with: [
spec
className: 'ConfigurationOfRefactoringBrowser';
versionString: #'stable';
loads: #('Core');
repository: 'http://www.squeaksource.com/MetacelloRepository' ].
spec
package: 'Grease-Core'
with: [ spec includes: #('Grease-Squeak5-Core') ];
package: 'Grease-Tests-Core'
with: [
spec
requires: #('Grease-Squeak5-Core');
includes:
#('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak5-Core') ];
package: 'Grease-Squeak5-Core'
with: [ spec requires: #('Grease-Core') ];
package: 'Grease-Tests-Squeak-Core'
with: [ spec requires: #('Grease-Tests-Core') ];
package: 'Grease-Tests-Squeak5-Core'
with: [ spec requires: #('Grease-Tests-Squeak-Core') ];
package: 'Grease-Slime'
with: [ spec requires: #('Refactoring-Core' 'Grease-Core') ];
package: 'Grease-Tests-Slime'
with: [ spec requires: #('Grease-Slime') ].
spec
group: 'Slime' with: #('Grease-Slime');
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
spec
for: #( #'squeak6.x' )
do: [
spec
package: 'Grease-Core'
with: [ spec includes: #('Grease-Squeak6-Core') ];
package: 'Grease-Tests-Core'
with: [ spec requires: #('Grease-Squeak6-Core'); includes: #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak6-Core') ];
package: 'Grease-Squeak6-Core'
with: [ spec requires: #('Grease-Core') ];
package: 'Grease-Tests-Squeak-Core'
with: [ spec requires: #('Grease-Tests-Core') ];
package: 'Grease-Tests-Squeak6-Core'
with: [ spec requires: #('Grease-Tests-Squeak-Core') ].
self slimeForSqueakPharo1xPharo2x: spec ].
<baseline>

spec
for: #'pharo3.x'
do: [
spec
package: 'Grease-Core'
with: [ spec includes: #('Grease-Pharo30-Core') ];
package: 'Grease-Tests-Core'
with: [
spec
requires: #('Grease-Pharo30-Core');
includes: #('Grease-Tests-Pharo20-Core') ];
package: 'Grease-Pharo30-Core'
with: [ spec requires: #('Grease-Core') ];
package: 'Grease-Tests-Pharo20-Core'
with: [ spec requires: #('Grease-Tests-Core') ];
package: 'Grease-Slime' with: [ spec requires: #('Grease-Core') ];
package: 'Grease-Tests-Slime'
with: [ spec requires: #('Grease-Slime') ].
spec
group: 'Slime' with: #('Grease-Slime');
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
spec
for: #(#'pharo4.x' #'pharo5.x')
do: [
spec
package: 'Grease-Core'
with: [ spec includes: #('Grease-Pharo30-Core') ];
package: 'Grease-Tests-Core'
with: [
spec
requires: #('Grease-Pharo30-Core');
includes: #('Grease-Tests-Pharo20-Core') ];
package: 'Grease-Pharo30-Core'
with: [ spec requires: #('Grease-Core') ];
package: 'Grease-Tests-Pharo20-Core'
with: [ spec requires: #('Grease-Tests-Core') ];
package: 'Grease-Pharo40-Slime'
with: [ spec requires: #('Grease-Core') ];
package: 'Grease-Tests-Slime'
with: [ spec requires: #('Grease-Pharo40-Slime') ].
spec
group: 'Slime' with: #('Grease-Pharo40-Slime');
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
spec
for: #'pharo6.x'
do: [
spec
package: 'Grease-Core'
with: [ spec includes: #('Grease-Pharo60-Core') ];
package: 'Grease-Tests-Core'
with: [
spec
requires: #('Grease-Pharo60-Core');
includes: #('Grease-Tests-Pharo20-Core') ];
package: 'Grease-Pharo60-Core'
with: [ spec requires: #('Grease-Core') ];
package: 'Grease-Tests-Pharo20-Core'
with: [ spec requires: #('Grease-Tests-Core') ];
package: 'Grease-Pharo40-Slime'
with: [ spec requires: #('Grease-Core') ];
package: 'Grease-Tests-Slime'
with: [ spec requires: #('Grease-Pharo40-Slime') ].
spec
group: 'Slime' with: #('Grease-Pharo40-Slime');
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].

spec
for: #(#'pharo7.x')
do: [
spec
package: 'Grease-Core'
with: [ spec includes: #('Grease-Pharo70-Core') ];
package: 'Grease-Tests-Core'
with: [ spec requires: #('Grease-Pharo70-Core'); includes: #('Grease-Tests-Pharo20-Core') ];
package: 'Grease-Pharo70-Core'
with: [ spec requires: #('Grease-Core') ];
package: 'Grease-Tests-Pharo20-Core'
with: [ spec requires: #('Grease-Tests-Core') ];
package: 'Grease-Pharo40-Slime'
with: [ spec requires: #('Grease-Core') ];
package: 'Grease-Tests-Slime'
with: [ spec requires: #('Grease-Pharo40-Slime') ].
spec
group: 'Slime' with: #('Grease-Pharo40-Slime');
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].

spec
for: #'gemstone'
do: [
spec
project: 'GsCore'
with: [
spec
className: 'ConfigurationOfGsCore';
versionString: #'stable';
repository:
'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
project: 'UTF8'
with: [
spec
className: 'ConfigurationOfGsMisc';
versionString: #'stable';
loads: #('Utf8Encoding');
repository:
'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
project: 'System-Digital-Signatures'
copyFrom: 'UTF8'
with: [ spec loads: #('System-Digital-Signatures') ];
project: 'SMTPMail'
copyFrom: 'UTF8'
with: [ spec loads: #('SMTPMail') ].
spec
package: 'Grease-Core'
with: [
spec
requires: #('GsCore');
includes: #('Grease-GemStone-Core') ];
package: 'Grease-Tests-Core'
with: [
spec
requires: #('Grease-GemStone-Core');
includes: #('Grease-Tests-GemStone-Core') ];
package: 'Grease-GemStone-Core'
with: [
spec
requires:
#('Grease-Core' 'GsCore' 'System-Digital-Signatures' 'UTF8' 'SMTPMail') ];
package: 'Grease-Tests-GemStone-Core'
with: [ spec requires: #('Grease-Tests-Core') ] ].
spec
for: #'gs2.x'
do: [
spec
package: 'Grease-GemStone-Core'
with: [ spec includes: #('Grease-GemStone200-Core') ];
package: 'Grease-GemStone200-Core'
with: [ spec requires: #('Grease-GemStone-Core') ] ].
spec
for: #'gs2.3.x'
do: [
spec
package: 'Grease-GemStone-Core'
with: [ spec includes: #('Grease-GemStone230-Core') ];
package: 'Grease-GemStone230-Core'
with: [ spec requires: #('Grease-GemStone-Core') ] ].
spec
for: #'gs2.4.x'
do: [
spec
package: 'Grease-GemStone-Core'
with: [ spec includes: #('Grease-GemStone240-Core') ];
package: 'Grease-GemStone240-Core'
with: [ spec requires: #('Grease-GemStone-Core') ] ].
spec
for: #(#'gs3.0.x' #'gs3.1.x' #'gs3.2.x')
do: [
spec
package: 'Grease-GemStone-Core'
with: [ spec includes: #('Grease-GemStone300-Core') ];
package: 'Grease-GemStone300-Core'
with: [
spec
requires: #('Grease-GemStone-Core');
postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
spec
for: #(#'gs3.3.x' #'gs3.4.x')
do: [
spec
package: 'Grease-GemStone-Core'
with: [ spec includes: #('Grease-GemStone330-Core') ];
package: 'Grease-GemStone330-Core'
with: [
spec
requires: #('Grease-GemStone-Core');
postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
spec
for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x')
do: [
spec
package: 'Grease-Tests-GemStone-Core'
with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
self baselineCommon: spec.
self baselineSqueak: spec.
self baselinePharo: spec.
self baselineGemStone: spec
16 changes: 16 additions & 0 deletions repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineCommon..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
baseline
baselineCommon: spec
spec
for: #common
do: [ spec blessing: #baseline.
spec
package: 'Grease-Core';
package: 'Grease-Tests-Core'
with: [ spec requires: #('Grease-Core') ].
spec
group: 'Core' with: #('Grease-Core');
group: 'Core Tests' with: #('Grease-Tests-Core');
group: 'Slime' with: #('Core');
group: 'Slime Tests' with: #('Core Tests');
group: 'Tests' with: #('Core Tests' 'Slime Tests');
group: 'default' with: #('Slime') ]
Loading
X Tutup