From ae9c7916f0c61fbb6689bc02c2ac71e8e83e68fd Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Sun, 23 Dec 2018 22:54:27 +0100 Subject: [PATCH 1/3] Factorize squeak baseline --- .../instance/baseline..st | 251 +----------------- .../instance/baselineCommon..st | 15 ++ .../instance/baselineGemstone..st | 66 +++++ .../instance/baselinePharo..st | 65 +++++ .../instance/baselineSqueak..st | 36 +++ .../instance/slimeForSqueakPharo1xPharo2x..st | 16 -- .../methodProperties.json | 8 - .../monticello.meta/version | 1 - 8 files changed, 188 insertions(+), 270 deletions(-) create mode 100644 repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineCommon..st create mode 100644 repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemstone..st create mode 100644 repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st create mode 100644 repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineSqueak..st delete mode 100644 repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/slimeForSqueakPharo1xPharo2x..st delete mode 100644 repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json delete mode 100644 repository/BaselineOfGrease.package/monticello.meta/version diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st index 87667eaf..4113f10c 100644 --- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st @@ -1,247 +1,8 @@ baseline baseline: 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') ]. - 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 ]. - - 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' ] ] \ No newline at end of file + + self + baselineCommon: spec; + baselineSqueak: spec; + baselinePharo: spec; + baselineGemstone: spec \ No newline at end of file diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineCommon..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineCommon..st new file mode 100644 index 00000000..d6301cbe --- /dev/null +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineCommon..st @@ -0,0 +1,15 @@ +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') ] \ No newline at end of file diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemstone..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemstone..st new file mode 100644 index 00000000..8e37af3c --- /dev/null +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemstone..st @@ -0,0 +1,66 @@ +baseline +baselineGemstone: spec + 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' ] ] \ No newline at end of file diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st new file mode 100644 index 00000000..1836db86 --- /dev/null +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st @@ -0,0 +1,65 @@ +baseline +baselinePharo: spec + 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') ] \ No newline at end of file diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineSqueak..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineSqueak..st new file mode 100644 index 00000000..755e1ea7 --- /dev/null +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineSqueak..st @@ -0,0 +1,36 @@ +baseline +baselineSqueak: spec + + spec + for: #squeak + do: [ spec + project: 'Refactoring-Core' + with: [ spec + className: 'ConfigurationOfRefactoringBrowser'; + versionString: #stable; + loads: #('Core'); + repository: 'http://www.squeaksource.com/MetacelloRepository' ]. + spec + package: 'Grease-Tests-Core' with: [ spec includes: #('Grease-Tests-Squeak-Core') ]; + package: 'Grease-Tests-Squeak-Core' with: [ spec requires: #('Grease-Tests-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: #'squeak5.x' + do: [ spec + package: 'Grease-Core' with: [ spec includes: #('Grease-Squeak5-Core') ]; + package: 'Grease-Tests-Core' with: [ spec includes: #('Grease-Tests-Squeak5-Core') ]; + package: 'Grease-Squeak5-Core' with: [ spec requires: #('Grease-Core') ]; + package: 'Grease-Tests-Squeak5-Core' with: [ spec requires: #('Grease-Tests-Squeak-Core') ] ]. + + spec + for: #'squeak6.x' + do: [ spec + package: 'Grease-Core' with: [ spec includes: #('Grease-Squeak6-Core') ]; + package: 'Grease-Tests-Core' with: [ spec includes: #('Grease-Tests-Squeak6-Core') ]; + package: 'Grease-Squeak6-Core' with: [ spec requires: #('Grease-Core') ]; + package: 'Grease-Tests-Squeak6-Core' with: [ spec requires: #('Grease-Tests-Squeak-Core') ] ] \ No newline at end of file diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/slimeForSqueakPharo1xPharo2x..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/slimeForSqueakPharo1xPharo2x..st deleted file mode 100644 index fa336694..00000000 --- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/slimeForSqueakPharo1xPharo2x..st +++ /dev/null @@ -1,16 +0,0 @@ -baseline -slimeForSqueakPharo1xPharo2x: spec - spec - project: 'Refactoring-Core' - with: [ - spec - className: 'ConfigurationOfRefactoringBrowser'; - versionString: #stable; - loads: #('Core'); - repository: 'http://www.squeaksource.com/MetacelloRepository' ]. - spec - 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') \ No newline at end of file diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json b/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json deleted file mode 100644 index 18ab4065..00000000 --- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "instance" : { - "initializeLatin1ToUtf8Encodings" : "JohanBrichau 10/19/2014 10:00", - "slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49", - "baseline:" : "JohanBrichau 11/22/2018 09:09" - }, - "class" : { } -} \ No newline at end of file diff --git a/repository/BaselineOfGrease.package/monticello.meta/version b/repository/BaselineOfGrease.package/monticello.meta/version deleted file mode 100644 index 21372c07..00000000 --- a/repository/BaselineOfGrease.package/monticello.meta/version +++ /dev/null @@ -1 +0,0 @@ -(name 'BaselineOfGrease-JohanBrichau.1496564080' message 'Fix gemstone330 package references in the baseline (seems like a mistake was done years ago in dev branch)' id '0dc85b3c-9e37-0d00-a065-e21a0da0b32f' date '22 November 2018' time '9:17:34.247194 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564079' message 'merged by GitFileTree-MergeDriver' id '76992aa1-9d37-0d00-b8c1-d67d0a027646' date '22 November 2018' time '8:34:10.555289 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ()) \ No newline at end of file From d0ffce976a27021b7c054902efeb6a0dc9f96b9b Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Sun, 23 Dec 2018 22:57:51 +0100 Subject: [PATCH 2/3] Revert metadata deletion --- .../BaselineOfGrease.class/methodProperties.json | 8 ++++++++ .../BaselineOfGrease.package/monticello.meta/version | 1 + 2 files changed, 9 insertions(+) create mode 100644 repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json create mode 100644 repository/BaselineOfGrease.package/monticello.meta/version diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json b/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json new file mode 100644 index 00000000..18ab4065 --- /dev/null +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json @@ -0,0 +1,8 @@ +{ + "instance" : { + "initializeLatin1ToUtf8Encodings" : "JohanBrichau 10/19/2014 10:00", + "slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49", + "baseline:" : "JohanBrichau 11/22/2018 09:09" + }, + "class" : { } +} \ No newline at end of file diff --git a/repository/BaselineOfGrease.package/monticello.meta/version b/repository/BaselineOfGrease.package/monticello.meta/version new file mode 100644 index 00000000..21372c07 --- /dev/null +++ b/repository/BaselineOfGrease.package/monticello.meta/version @@ -0,0 +1 @@ +(name 'BaselineOfGrease-JohanBrichau.1496564080' message 'Fix gemstone330 package references in the baseline (seems like a mistake was done years ago in dev branch)' id '0dc85b3c-9e37-0d00-a065-e21a0da0b32f' date '22 November 2018' time '9:17:34.247194 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564079' message 'merged by GitFileTree-MergeDriver' id '76992aa1-9d37-0d00-b8c1-d67d0a027646' date '22 November 2018' time '8:34:10.555289 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ()) \ No newline at end of file From c6f9586e03a70a2494ed51a24cb5041ffe7de384 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Sun, 23 Dec 2018 23:23:18 +0100 Subject: [PATCH 3/3] Remove useless line --- .../BaselineOfGrease.class/instance/baselineCommon..st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineCommon..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineCommon..st index d6301cbe..89ad8b87 100644 --- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineCommon..st +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineCommon..st @@ -2,7 +2,7 @@ baseline baselineCommon: spec spec for: #common - do: [ spec blessing: #baseline. + do: [ spec package: 'Grease-Core'; package: 'Grease-Tests-Core' with: [ spec requires: #('Grease-Core') ].