From f1a6a32b206bbae6688edb0a21f39ade8c0efc8f Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Thu, 9 Oct 2014 11:42:07 -0700 Subject: [PATCH] Issue #51: first cut at fixing the gettext load problem (might be other changes needed from Issue #48 and PR #50) --- .../instance/baselinecommon..st | 55 +++++++--------- .../instance/baselinegettext..st | 66 +++++++++---------- .../methodProperties.json | 4 +- .../monticello.meta/categories.st | 2 +- .../monticello.meta/version | 2 +- 5 files changed, 61 insertions(+), 68 deletions(-) diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinecommon..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinecommon..st index 97ff6c146..e6b0cc3d1 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinecommon..st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinecommon..st @@ -1,39 +1,34 @@ baselines baselinecommon: spec - spec for: #'squeakCommon' do: [ - spec repository: 'http://smalltalkhub.com/mc/Seaside/Seaside31/main'. - spec - project: 'Grease' - with: [ - spec - versionString: #'release1.1'; - className: 'ConfigurationOfGrease'; - loads: #('Grease-Core'); - repository: 'http://smalltalkhub.com/mc/Seaside/MetacelloConfigurations/main' ]. - spec - project: 'Grease Core Tests' - copyFrom: 'Grease' - with: [ spec loads: #('Core Tests') ] - ]. - + spec repository: 'http://smalltalkhub.com/mc/Seaside/Seaside31/main'. + spec + configuration: 'Grease' + with: [ + spec + versionString: #'release1.1'; + loads: #('Grease-Core'); + repository: + 'http://smalltalkhub.com/mc/Seaside/MetacelloConfigurations/main' ]. + spec + project: 'Grease Core Tests' + copyFrom: 'Grease' + with: [ spec loads: #('Core Tests') ] ]. spec - for: #gemstone - do: [ - spec - baseline: 'Grease' - with: [ - spec - loads: #('Grease-Core'); - repository: 'github://GsDevKit/Grease:master/repository' ]. - spec - project: 'Grease Core Tests' - copyFrom: 'Grease' - with: [ spec loads: #('Core Tests') ] - ]. - + for: #'gemstone' + do: [ + spec + baseline: 'Grease' + with: [ + spec + loads: #('Grease-Core'); + repository: 'github://GsDevKit/Grease:master/repository' ]. + spec + project: 'Grease Core Tests' + copyFrom: 'Grease' + with: [ spec loads: #('Core Tests') ] ]. spec for: #'common' do: [ diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegettext..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegettext..st index a993b7842..890256023 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegettext..st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegettext..st @@ -1,36 +1,34 @@ baselines baselinegettext: spec - - spec for: #'common' do: [ - spec repository: 'http://www.smalltalkhub.com/mc/Seaside/Seaside30Addons/main'. - - spec - project: 'Gettext-Project' - with: [ spec - loads: #('Core'); - className: 'ConfigurationOfGettext'; - repository: 'http://www.smalltalkhub.com/mc/PharoExtras/Gettext/main' ]. - - spec - package: 'Seaside-Gettext-Core' with: [ spec requires: #('Gettext-Project' 'Core') ]; - package: 'Seaside-Gettext-Examples' with: [ spec requires: #('Seaside-Gettext-Core') ]. - - spec - group: 'Gettext' with: #('Seaside-Gettext-Core'); - group: 'Gettext-Examples' with: #('Gettext' 'Seaside-Gettext-Examples') - - ]. - - spec for: #(#squeak 'pharo1.x') do:[ - spec - package: 'Seaside-Gettext-Slime' with: [ spec requires: #('Slime') ]. - - spec - group: 'GettextSlime' with: #('Seaside-Gettext-Slime') - ]. - - spec for: #pharo do: [ - spec - package: 'Seaside-Pharo-Gettext-Core'; - package: 'Seaside-Gettext-Core' with:[spec includes: 'Seaside-Pharo-Gettext-Core']. - ]. \ No newline at end of file + spec + for: #'common' + do: [ + spec repository: 'http://www.smalltalkhub.com/mc/Seaside/Seaside30Addons/main'. + spec + configuration: 'Gettext-Project' + with: [ + spec + loads: #('Core'); + versionString: #'stable'; + repository: + 'http://www.smalltalkhub.com/mc/PharoExtras/Gettext/main' ]. + spec + package: 'Seaside-Gettext-Core' + with: [ spec requires: #('Gettext-Project' 'Core') ]; + package: 'Seaside-Gettext-Examples' + with: [ spec requires: #('Seaside-Gettext-Core') ]. + spec + group: 'Gettext' with: #('Seaside-Gettext-Core'); + group: 'Gettext-Examples' with: #('Gettext' 'Seaside-Gettext-Examples') ]. + spec + for: #(#'squeak' 'pharo1.x') + do: [ + spec package: 'Seaside-Gettext-Slime' with: [ spec requires: #('Slime') ]. + spec group: 'GettextSlime' with: #('Seaside-Gettext-Slime') ]. + spec + for: #'pharo' + do: [ + spec + package: 'Seaside-Pharo-Gettext-Core'; + package: 'Seaside-Gettext-Core' + with: [ spec includes: 'Seaside-Pharo-Gettext-Core' ] ] \ No newline at end of file diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/methodProperties.json b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/methodProperties.json index 938b0fda8..5be6df41a 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/methodProperties.json +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/methodProperties.json @@ -5,10 +5,10 @@ "baseline:" : "JohanBrichau 2/15/2014 11:45", "baselineadaptors:" : "dkh 07/02/2014 16:00", "baselinecomet:" : "JohanBrichau 2/15/2014 11:48", - "baselinecommon:" : "JohanBrichau 2/15/2014 11:47", + "baselinecommon:" : "dkh 10/09/2014 11:38", "baselinefilesystem:" : "dkh 07/03/2014 16:29", "baselinegemstone:" : "JohanBrichau 9/8/2014 21:14", - "baselinegettext:" : "JohanBrichau 2/15/2014 11:47", + "baselinegettext:" : "dkh 10/09/2014 11:40", "baselinejavascript:" : "dkh 07/02/2014 15:20", "baselinejquery:" : "JohanBrichau 2/15/2014 11:47", "baselinejqueryui:" : "JohanBrichau 2/15/2014 11:47", diff --git a/repository/BaselineOfSeaside3.package/monticello.meta/categories.st b/repository/BaselineOfSeaside3.package/monticello.meta/categories.st index 33792de89..886c5b74e 100644 --- a/repository/BaselineOfSeaside3.package/monticello.meta/categories.st +++ b/repository/BaselineOfSeaside3.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #BaselineOfSeaside3! +SystemOrganization addCategory: #'BaselineOfSeaside3'! diff --git a/repository/BaselineOfSeaside3.package/monticello.meta/version b/repository/BaselineOfSeaside3.package/monticello.meta/version index 9352d61aa..0a27c6732 100644 --- a/repository/BaselineOfSeaside3.package/monticello.meta/version +++ b/repository/BaselineOfSeaside3.package/monticello.meta/version @@ -1 +1 @@ -(name 'BaselineOfSeaside3-JohanBrichau.21' message 'fix baseline' id '856ac32f-09c2-472a-8b76-b51ef11696f8' date '8 September 2014' time '9:14:35.091933 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.20' message 'switch to loadtype atomic' id 'b416801d-2c8c-4f4e-8924-cec962349d08' date '7 September 2014' time '12:17:18 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.19' message 'sync with ConfigurationOf' id '5bd04035-4943-4b51-a9c4-8332b92aa3d0' date '24 May 2014' time '5:29:12 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.18' message 'formatting' id '9b9f290c-a352-4810-8b2d-1f028c088f73' date '19 March 2014' time '9:25:06 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.17' message 'got rid of version numbers in baseline' id '96eb40cf-03fa-4721-a266-acf53b4f3412' date '15 February 2014' time '11:48:43 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.16' message 'typo' id 'cc790a69-8dcd-44e9-8988-d1b0e18347bf' date '2 February 2014' time '1:59:32 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.15' message 'REST in gemstone' id '977475fc-b567-4455-b433-a11b91b72b06' date '2 February 2014' time '1:29:09 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.14' message 're-include gemstone parts in baseline methods' id '9882d28e-b9d9-4c27-94c7-5dd6fcc30104' date '2 February 2014' time '9:58:41 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.13' message 'remove comet tests from general tests' id '8e386ffd-2c4e-4904-9f8b-ed6697781d26' date '2 February 2014' time '9:13:59 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.12' message 'comet cannot load into gemstone' id '77a9f389-8662-46a8-b5d5-2ee47d2431ef' date '2 February 2014' time '9:05:49 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.11' message 'fixing the baseline for gemstone' id '5618d06f-a597-4e4e-b871-154fba5dcdfe' date '1 February 2014' time '8:18:30 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.10' message 'move REST-Tests to Tests group (not CI)' id 'e735a3ff-9371-4a8f-9366-74b5ecaceda0' date '1 February 2014' time '5:23:20 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.9' message 'fix squeak/pharo1.4 config for REST group' id 'cedb3ab0-abc6-4155-9709-52345ba26c6a' date '1 February 2014' time '5:15:37 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.8' message 'fixing javascript tests package in squeak' id 'cd067145-40e0-422e-a1f1-ae25cee50ee3' date '1 February 2014' time '5:07:40 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.7' message 'updated baseline' id 'de3d06bb-a0f5-4cb4-9a40-6bcbadd05180' date '1 February 2014' time '4:38:17 am' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-dkh.6' message 'add Seaside-GemStone-JSON-Core to baseline ' id 'b4372d68-1367-492e-a6ae-66bfe3bef2c5' date '17 September 2013' time '5:26:03 am' author 'dkh' ancestors ((name 'BaselineOfSeaside3-dkh.5' message 'JQuery-UI.gemstone not needed ... ' id '6d54217d-4c07-49e7-b4dc-ba572e93e135' date '14 September 2013' time '8:25:12 am' author 'dkh' ancestors ((name 'BaselineOfSeaside3-dkh.4' message 'adjust baseline for Seaside-Core.gemstone, Seaside-Environment.gemstone, Seaside-Session.gemstone, Seaside-Tools-Core.gemstone ' id 'fe3edf26-ef48-4634-8add-2f2036b32eb9' date '14 September 2013' time '8:15:48 am' author 'dkh' ancestors ((name 'BaselineOfSeaside3-dkh.3' message 'remove Seaside-Canvas.gemstone ' id '1c664ef3-89df-4665-968a-78c5352ed761' date '14 September 2013' time '8:05:06 am' author 'dkh' ancestors ((name 'BaselineOfSeaside3-dkh.2' message 'initial BaselineOfSeaside31 ' id 'bfeb1d26-e2a3-4aa5-9871-534d8d473d0f' date '14 September 2013' time '7:00:59 am' author 'dkh' ancestors ((name 'BaselineOfSeaside3-dkh.1' message 'initial BaselineOfSeaside31 ' id '0bdadbef-78ec-4096-8ef4-b14ce0098fb6' date '14 September 2013' time '6:57:47 am' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file +(name 'BaselineOfSeaside3-dkh.22' message 'Issue #51: first cut at fixing the gettext load problem (might be other changes needed from Issue #48 and PR #50)' id '1d86ceaa-e745-4d5e-99eb-60846636f603' date '10/09/2014' time '11:42:06' author 'dkh' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.21' message 'fix baseline' id '856ac32f-09c2-472a-8b76-b51ef11696f8' date '09/08/2014' time '09:14:35' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.20' message 'switch to loadtype atomic' id 'b416801d-2c8c-4f4e-8924-cec962349d08' date '09/07/2014' time '12:17:18' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.19' message 'sync with ConfigurationOf' id '5bd04035-4943-4b51-a9c4-8332b92aa3d0' date '05/24/2014' time '05:29:12' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.18' message 'formatting' id '9b9f290c-a352-4810-8b2d-1f028c088f73' date '03/19/2014' time '09:25:06' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.17' message 'got rid of version numbers in baseline' id '96eb40cf-03fa-4721-a266-acf53b4f3412' date '02/15/2014' time '11:48:43' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.16' message 'typo' id 'cc790a69-8dcd-44e9-8988-d1b0e18347bf' date '02/02/2014' time '01:59:32' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.15' message 'REST in gemstone' id '977475fc-b567-4455-b433-a11b91b72b06' date '02/02/2014' time '01:29:09' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.14' message 're-include gemstone parts in baseline methods' id '9882d28e-b9d9-4c27-94c7-5dd6fcc30104' date '02/02/2014' time '09:58:41' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.13' message 'remove comet tests from general tests' id '8e386ffd-2c4e-4904-9f8b-ed6697781d26' date '02/02/2014' time '09:13:59' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.12' message 'comet cannot load into gemstone' id '77a9f389-8662-46a8-b5d5-2ee47d2431ef' date '02/02/2014' time '09:05:49' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.11' message 'fixing the baseline for gemstone' id '5618d06f-a597-4e4e-b871-154fba5dcdfe' date '02/01/2014' time '08:18:30' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.10' message 'move REST-Tests to Tests group (not CI)' id 'e735a3ff-9371-4a8f-9366-74b5ecaceda0' date '02/01/2014' time '05:23:20' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.9' message 'fix squeak/pharo1.4 config for REST group' id 'cedb3ab0-abc6-4155-9709-52345ba26c6a' date '02/01/2014' time '05:15:37' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.8' message 'fixing javascript tests package in squeak' id 'cd067145-40e0-422e-a1f1-ae25cee50ee3' date '02/01/2014' time '05:07:40' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-JohanBrichau.7' message 'updated baseline' id 'de3d06bb-a0f5-4cb4-9a40-6bcbadd05180' date '02/01/2014' time '04:38:17' author 'JohanBrichau' ancestors ((name 'BaselineOfSeaside3-dkh.6' message 'add Seaside-GemStone-JSON-Core to baseline ' id 'b4372d68-1367-492e-a6ae-66bfe3bef2c5' date '09/17/2013' time '05:26:03' author 'dkh' ancestors ((name 'BaselineOfSeaside3-dkh.5' message 'JQuery-UI.gemstone not needed ... ' id '6d54217d-4c07-49e7-b4dc-ba572e93e135' date '09/14/2013' time '08:25:12' author 'dkh' ancestors ((name 'BaselineOfSeaside3-dkh.4' message 'adjust baseline for Seaside-Core.gemstone, Seaside-Environment.gemstone, Seaside-Session.gemstone, Seaside-Tools-Core.gemstone ' id 'fe3edf26-ef48-4634-8add-2f2036b32eb9' date '09/14/2013' time '08:15:48' author 'dkh' ancestors ((name 'BaselineOfSeaside3-dkh.3' message 'remove Seaside-Canvas.gemstone ' id '1c664ef3-89df-4665-968a-78c5352ed761' date '09/14/2013' time '08:05:06' author 'dkh' ancestors ((name 'BaselineOfSeaside3-dkh.2' message 'initial BaselineOfSeaside31 ' id 'bfeb1d26-e2a3-4aa5-9871-534d8d473d0f' date '09/14/2013' time '07:00:59' author 'dkh' ancestors ((name 'BaselineOfSeaside3-dkh.1' message 'initial BaselineOfSeaside31 ' id '0bdadbef-78ec-4096-8ef4-b14ce0098fb6' date '09/14/2013' time '06:57:47' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file