From 642d092b4b7dbb1681d930d71bc65fb415fe476a Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Mon, 3 Jun 2019 22:31:01 +0200 Subject: [PATCH] Factorize baseline of pharo. Fixes #92 --- repository/BaselineOfGrease.package/.filetree | 5 +- .../instance/baselinePharo..st | 75 ++++--------------- .../methodProperties.json | 10 --- .../BaselineOfGrease.class/properties.json | 19 ++--- .../monticello.meta/categories.st | 2 +- .../monticello.meta/version | 1 - .../BaselineOfGrease.package/properties.json | 3 +- 7 files changed, 29 insertions(+), 86 deletions(-) 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/.filetree b/repository/BaselineOfGrease.package/.filetree index 8998102c..57a67973 100644 --- a/repository/BaselineOfGrease.package/.filetree +++ b/repository/BaselineOfGrease.package/.filetree @@ -1,4 +1,5 @@ { - "noMethodMetaData" : true, "separateMethodMetaAndSource" : false, - "useCypressPropertiesFile" : true } + "noMethodMetaData" : true, + "useCypressPropertiesFile" : true +} \ 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 index 4e9bd050..f866e823 100644 --- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st @@ -1,82 +1,39 @@ baselines baselinePharo: spec spec - for: #(#'pharo4.x' #'pharo5.x') + for: #pharo do: [ spec - package: 'Grease-Core' - with: [ spec includes: #('Grease-Pharo30-Core') ]; - package: 'Grease-Tests-Core' - with: [ spec - requires: #('Grease-Pharo30-Core'); - includes: #('Grease-Tests-Pharo-Core') ]; - package: 'Grease-Pharo30-Core' - with: [ spec requires: #('Grease-Core') ]; - package: 'Grease-Tests-Pharo-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') ]. + package: 'Grease-Tests-Pharo-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' + for: #(#'pharo4.x' #'pharo5.x') do: [ spec - package: 'Grease-Core' - with: [ spec includes: #('Grease-Pharo60-Core') ]; + package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo30-Core') ]; package: 'Grease-Tests-Core' with: [ spec - requires: #('Grease-Pharo60-Core'); + requires: #('Grease-Pharo30-Core'); includes: #('Grease-Tests-Pharo-Core') ]; - package: 'Grease-Pharo60-Core' - with: [ spec requires: #('Grease-Core') ]; - package: 'Grease-Tests-Pharo-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') ]. + package: 'Grease-Pharo30-Core' with: [ spec requires: #('Grease-Core') ] ]. spec - for: #(#'pharo7.x') + for: #'pharo6.x' do: [ spec - package: 'Grease-Core' - with: [ spec includes: #('Grease-Pharo70-Core') ]; + package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo60-Core') ]; package: 'Grease-Tests-Core' with: [ spec - requires: #('Grease-Pharo70-Core'); + requires: #('Grease-Pharo60-Core'); includes: #('Grease-Tests-Pharo-Core') ]; - package: 'Grease-Pharo70-Core' - with: [ spec requires: #('Grease-Core') ]; - package: 'Grease-Tests-Pharo-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') ]. + package: 'Grease-Pharo60-Core' with: [ spec requires: #('Grease-Core') ] ]. + spec - for: #(#'pharo8.x') + for: #(#'pharo7.x' #'pharo8.x') do: [ spec - package: 'Grease-Core' - with: [ spec includes: #('Grease-Pharo70-Core') ]; + package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo70-Core') ]; package: 'Grease-Tests-Core' with: [ spec requires: #('Grease-Pharo70-Core'); includes: #('Grease-Tests-Pharo-Core') ]; - package: 'Grease-Pharo70-Core' - with: [ spec requires: #('Grease-Core') ]; - package: 'Grease-Tests-Pharo-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') ] + package: 'Grease-Pharo70-Core' with: [ spec requires: #('Grease-Core') ] ] \ 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 456234d9..00000000 --- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "baseline:" : " 02/08/2019 09:34:04", - "baselineCommon:" : " 02/08/2019 09:34:04", - "baselineGemStone:" : "dkh 02/08/2019 09:35", - "baselinePharo:" : " 02/08/2019 09:34:04", - "baselineSqueak:" : " 02/08/2019 09:34:04", - "initializeLatin1ToUtf8Encodings" : " 02/08/2019 09:34:04" } } diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json b/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json index 8a39c621..0260395f 100644 --- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json @@ -1,14 +1,11 @@ { - "category" : "BaselineOfGrease", - "classinstvars" : [ - ], - "classvars" : [ - ], "commentStamp" : "", - "instvars" : [ - ], - "name" : "BaselineOfGrease", - "pools" : [ - ], "super" : "BaselineOf", - "type" : "normal" } + "category" : "BaselineOfGrease", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "BaselineOfGrease", + "type" : "normal" +} \ No newline at end of file diff --git a/repository/BaselineOfGrease.package/monticello.meta/categories.st b/repository/BaselineOfGrease.package/monticello.meta/categories.st index 3687f0b2..aad806f8 100644 --- a/repository/BaselineOfGrease.package/monticello.meta/categories.st +++ b/repository/BaselineOfGrease.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'BaselineOfGrease'! +SystemOrganization addCategory: #BaselineOfGrease! diff --git a/repository/BaselineOfGrease.package/monticello.meta/version b/repository/BaselineOfGrease.package/monticello.meta/version deleted file mode 100644 index c7c944c7..00000000 --- a/repository/BaselineOfGrease.package/monticello.meta/version +++ /dev/null @@ -1 +0,0 @@ -(name 'BaselineOfGrease-dkh.2' message 'Issue #88: add 3.5 and 3.6 (thinking about future) to baseline' id '9141ab69-c0a0-4718-ac99-fd5fe9de2c6d' date '02/08/2019' time '09:36:09' author 'dkh' ancestors ((name 'BaselineOfGrease-cypress.1' message 'fabricated from a Cypress format repository' id 'e86a3b9e-ded9-4e86-a47c-06bdd15e26fd' date '02/08/2019' time '09:34:04' author '' ancestors () stepChildren ())) stepChildren ()) \ No newline at end of file diff --git a/repository/BaselineOfGrease.package/properties.json b/repository/BaselineOfGrease.package/properties.json index f037444a..6f31cf5a 100644 --- a/repository/BaselineOfGrease.package/properties.json +++ b/repository/BaselineOfGrease.package/properties.json @@ -1,2 +1 @@ -{ - } +{ } \ No newline at end of file