Skip to content
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

Jump to bottom

add Squeak 4.6 & 5.0 platform attributes and update Travis #364

Merged
merged 3 commits into from
Sep 13, 2015
Merged

add Squeak 4.6 & 5.0 platform attributes and update Travis #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ac5f80
add Squeak 4.6 & 5.0 platform attributes and update Travis
pdebruic Aug 21, 2015
4d998a8
revert bad edit to travis.yml
pdebruic Aug 21, 2015
c5fea5f
first attempt at a fix for issue #369 - going to use Travis to test a…
pdebruic Aug 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ env:
# - ST=Squeak-4.3 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
- ST=Squeak-4.4 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
- ST=Squeak-4.4 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
- ST=Squeak-4.6 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
- ST=Squeak-4.6 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
- ST=Squeak-5.0 LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
- ST=Squeak-5.0 LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st

- ST=Squeak-Trunk LoadList="'TravisCI_1' 'TravisCI_2'" TRAVIS_SCRIPT=travisCI.st
- ST=Squeak-Trunk LoadList="'TravisCI_3'" TRAVIS_SCRIPT=travisCI.st
Expand Down
2 changes: 1 addition & 1 deletion .../Metacello-Core.package/MetacelloScriptGitBasedDownloadNotification.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
],
"classvars" : [
],
"commentStamp" : "",
"commentStamp" : "dkh 09/29/2014 12:27",
"instvars" : [
"projectPath",
"versionString" ],
Expand Down
2 changes: 1 addition & 1 deletion ....class/instance/collectAllVersionsFromVersionImportPragmasInto.using.satisfiedPragmas..st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ collectAllVersionsFromVersionImportPragmasInto: versionMap using: executionBlock
ifTrue: [ ^ ex pass ]
ifFalse: [
self errorMap at: versionSpec versionString put: ex.
done := true.

defined := false ] ].
defined
ifTrue: [
Expand Down
2 changes: 1 addition & 1 deletion repository/Metacello-Core.package/MetacelloVersionConstructor.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"instance" : {
"calculate:project:" : "dkh 6/22/2012 12:43",
"collectAllSymbolicVersionsFromVersionPragmasInto:using:" : "dkh 6/5/2012 19:01:24",
"collectAllVersionsFromVersionImportPragmasInto:using:satisfiedPragmas:" : "dkh 9/6/2012 03:05",
"collectAllVersionsFromVersionImportPragmasInto:using:satisfiedPragmas:" : "pad 8/25/2015 13:30",
"collectAllVersionsFromVersionPragmasInto:using:" : "dkh 6/5/2012 19:01:24",
"collectDefaultSymbolicVersionsFromVersionPragmasFrom:into:using:" : "dkh 6/5/2012 19:01:24",
"commonDefaultSymbolicVersionResolverBlock" : "dkh 6/5/2012 19:01:24",
Expand Down
2 changes: 1 addition & 1 deletion repository/Metacello-Core.package/monticello.meta/version
View file
Open in desktop

Large diffs are not rendered by default.

39 changes: 22 additions & 17 deletions ...atform.squeak.package/MetacelloSqueakPlatform.class/instance/defaultPlatformAttributes.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
attributes
defaultPlatformAttributes
| attributes versionString |
| attributes |
attributes := OrderedCollection with: #squeakCommon with: #squeak.
Smalltalk
at: #SystemVersion
ifPresent: [:cl |
versionString := cl current version.
(versionString beginsWith: 'Squeak3.10')
ifTrue: [attributes add: #'squeak3.10.x'].
(versionString beginsWith: 'Squeak4')
ifTrue: [attributes add: #'squeak4.x'.
(versionString beginsWith: 'Squeak4.1')
ifTrue: [attributes add: #'squeak4.1.x']
ifFalse: [(versionString beginsWith: 'Squeak4.2')
ifTrue: [attributes add: #'squeak4.2.x']
ifFalse: [(versionString beginsWith: 'Squeak4.3')
ifTrue: [attributes add: #'squeak4.3.x']
ifFalse: [(versionString beginsWith: 'Squeak4.4')
ifTrue: [attributes add: #'squeak4.4.x']
ifFalse: [(versionString beginsWith: 'Squeak4.5')
ifTrue: [attributes add: #'squeak4.5.x']]]]]]].
ifPresent: [:cl | |versionString|
versionString := cl current version asString.
" Major version "
#( 'Squeak3.10' (#'squeak3.10.x' ())
'Squeak4' (#'squeak4.x' (
'Squeak4.1' #'squeak4.1.x'
'Squeak4.2' #'squeak4.2.x'
'Squeak4.3' #'squeak4.3.x'
'Squeak4.4' #'squeak4.4.x'
'Squeak4.5' #'squeak4.5.x'
'Squeak4.6' #'squeak4.6.x'))
'Squeak5' (#'squeak5.x' (
'Squeak5.0' #'squeak5.0.x')))
pairsDo: [:major :allAttributes |
(versionString beginsWith: major) ifTrue: [
attributes add: allAttributes first.
allAttributes second ifNotEmpty: [:minorVersions |
minorVersions pairsDo: [:minor :attribute |
(versionString beginsWith: minor) ifTrue: [
attributes add: attribute.
^ attributes]]]]]].
^ attributes
3 changes: 2 additions & 1 deletion ...ory/Metacello-Platform.squeak.package/MetacelloSqueakPlatform.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
"collection:do:displaying:" : "dkh 6/12/2012 10:18:46.076",
"copyClass:as:inCategory:" : "dkh 6/12/2012 10:18:46.076",
"createRepository:" : "dkh 6/12/2012 10:18:46.076",
"defaultPlatformAttributes" : "dkh 3/21/2013 14:01",
"defaultPlatformAttributes" : "pad 8/21/2015 09:57",
"directoryFromPath:relativeTo:" : "tfel 7/29/2014 14:39",
"do:displaying:" : "dkh 6/12/2012 10:18:46.076",
"downloadJSON:username:pass:" : "dkh 10/14/2014 17:20:25",
"downloadZipArchive:to:" : "tfel 09/29/2014 09:54:55",
"extractRepositoryFrom:to:" : "tfel 7/29/2014 14:42",
"extractTypeFromDescription:" : "dkh 6/12/2012 10:18:46.076",
Expand Down
2 changes: 1 addition & 1 deletion repository/Metacello-Platform.squeak.package/monticello.meta/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(name 'Metacello-Platform.squeak-tfel.27' message 'Issue #277: rename platform downloadFile:to: to downloadZipArchive:to:' id '2c8d0272-2594-4d26-8afe-7af4a6687994' date '10/14/2014' time '17:20:25' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-tfel.26' message 'merged by GitFileTree-MergeDriver' id '2bac8707-a5ba-4095-a6e8-2130e283528b' date '09/29/2014' time '09:54:55' author 'tfel' ancestors ((name 'Metacello-Platform.squeak-tfel.25' message '- fix ZipArchive extraction (needs a FileDirectory)- fix trailing slash on Windows' id 'a0fcf7a4-7574-c449-a4a9-23f96c2aec36' date '07/29/2014' time '02:43:09' author 'tfel' ancestors ((name 'Metacello-Platform.squeak-tfel.24' message 'Replace commandline tools for downloading and unzipping with WebClient and ZipArchive' id '0b831d53-880b-f341-a1c5-97859962e09b' date '07/29/2014' time '01:54:19' author 'tfel' ancestors ((name 'Metacello-Platform.squeak-dkh.23' message 'fix google Issue 184: github zip download failures due to filesystem issues' id '78a6c3b5-5bc8-4089-b5ee-0084b55cb0a1' date '07/01/2013' time '10:25:17' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.22' message 'merge in changes for Metacello-Platform.squeak-dkh.21 and get Metacello-Platform.squeak-dkh.21 into the ancestry ...' id '1214fa6a-315f-4904-8829-794d716288f1' date '05/05/2013' time '03:12:00' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.18' message 'switch to using #select and #unselect for MetacelloPlatform' id '9c552a06-cfbe-48e6-86ab-7683c5c680d0' date '05/05/2013' time '01:55:23' author 'dkh' ancestors () stepChildren ())(name 'Metacello-Platform.squeak-dkh.21' message 'force change in MetacelloSqueakPlatform class>>initiliaze as a temp hack to bootstrap Metacello Preview (see https://github.com/dalehenrich/metacello-work/issues/151)' id 'f52c2c82-fc54-4671-b293-826d29aa7706' date '05/05/2013' time '02:51:38' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.20' message 'really add squeak4.5.x as platform attribute' id '9e83dd3b-4537-45a1-8ed5-b0bef4b6a006' date '05/05/2013' time '02:45:52' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.19' message 'add squeak4.5.x as platform attribute' id '6c4ff447-6495-4955-a3d2-c52053912351' date '05/05/2013' time '02:39:32' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.16' message 'new version for Squeak (Issue #39)' id '08000000-1508-621d-1508-621d14000000' date '02/27/2013' time '05:24:38' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.15' message 'fix for Issue #140 (including patch for introduced gemstone issue)' id '08000000-1508-0418-1508-041814000000' date '02/25/2013' time '05:19:47' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.14' message 'catch up with gemstone port' id '08000000-1508-5c17-1508-5c1714000000' date '07/10/2012' time '12:03:34' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.13' message 'checkpoint Issue #38' id '9aecf4d3-dbba-4b04-91b6-781938a502e3' date '06/12/2012' time '10:18:46' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.12' message 'checkpoint Isue #38' id 'f1f6b9a4-24e7-451c-a699-3bb8900f09fc' date '06/12/2012' time '09:33:39' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.11' message '1.0-beta.32 (dkh.662):- fix Issue 111: progress notification for Squeak http://code.google.com/p/metacello/issues/detail?id=111' id '5cf04623-a4fb-447a-96d8-21978c340f77' date '01/18/2012' time '04:57:04' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.10' message '- passing tests in Squeak3.10.2- 365 run, 365 passes' id 'e3af2d13-7aed-41ad-8788-2ea645f0cace' date '01/05/2011' time '05:03:59' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.9' message '- Squeak portability' id '6895c682-39ad-47d8-8206-2ed1bf117947' date '01/05/2011' time '04:09:03' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.8' message '- add Squeak attributes: #''squeak3.10.x'', #''squeak4.1.x'', and #''squeak4.2.x''' id '00f3028a-51a9-40fc-a409-c015a787779b' date '01/05/2011' time '03:39:28' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.7' message '- implement copyClass:as:inCategory:' id '2962dcae-a27e-4a64-906c-f076ff018c8d' date '11/18/2010' time '04:25:10' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.6' message '- implement copyClass:as:' id '8bc3449c-f0be-43ca-9d20-260ed0059df9' date '11/18/2010' time '03:37:16' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.5' message '- port to Squeak3.10.2-7179-basic' id '9a3caba5-a0cd-42cf-bb29-7b31e9b84fcb' date '02/05/2010' time '16:51:41' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.4' message '- fix Issue 14: http://code.google.com/p/metacello/issues/detail?id=14 Ftp repository for Squeak- add ftp support for Squeak' id 'b30549fa-52cb-424e-a7aa-329b15152b47' date '12/29/2009' time '04:17:21' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.3' message '- needs #initialize method' id 'b0033f12-24a1-4373-8a2c-211ccb6d061e' date '10/12/2009' time '01:30:44' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.2' message '- implement platform utility methods' id 'f4ca5554-cf53-4251-8066-5c2ae813ab09' date '10/12/2009' time '01:28:37' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.1' message '- Squeak-specific metacello support' id '7045edec-ac01-4485-bd21-efac82f0c9ef' date '08/09/2009' time '11:13:57' 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 ())) stepChildren ())) stepChildren ())) stepChildren ())
(name 'Metacello-Platform.squeak-pad.29' message 'Copy Tobais;s fix of the defaultPlatformAttributes' id 'cbcfa346-de50-44ad-8f98-55ae19315ed1' date '21 August 2015' time '9:57:42.682 am' author 'pad' ancestors ((name 'Metacello-Platform.squeak-pad.28' message 'copy tobias''s changes to MetacelloSqueakPlatform>>#defaultPlatformAttributesso Metacello works on Squeak 4.6 & 5.0' id '27bb3ca8-5bb9-40eb-aac1-7c80b39e3c0f' date '21 August 2015' time '9:07:59.587 am' author 'pad' ancestors ((name 'Metacello-Platform.squeak-tfel.27' message 'Issue #277: rename platform downloadFile:to: to downloadZipArchive:to:' id '2c8d0272-2594-4d26-8afe-7af4a6687994' date '14 October 2014' time '5:20:25 pm' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-tfel.26' message 'merged by GitFileTree-MergeDriver' id '2bac8707-a5ba-4095-a6e8-2130e283528b' date '29 September 2014' time '9:54:55 am' author 'tfel' ancestors ((name 'Metacello-Platform.squeak-tfel.25' message '- fix ZipArchive extraction (needs a FileDirectory)- fix trailing slash on Windows' id 'a0fcf7a4-7574-c449-a4a9-23f96c2aec36' date '29 July 2014' time '2:43:09 am' author 'tfel' ancestors ((name 'Metacello-Platform.squeak-tfel.24' message 'Replace commandline tools for downloading and unzipping with WebClient and ZipArchive' id '0b831d53-880b-f341-a1c5-97859962e09b' date '29 July 2014' time '1:54:19 am' author 'tfel' ancestors ((name 'Metacello-Platform.squeak-dkh.23' message 'fix google Issue 184: github zip download failures due to filesystem issues' id '78a6c3b5-5bc8-4089-b5ee-0084b55cb0a1' date '1 July 2013' time '10:25:17 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.22' message 'merge in changes for Metacello-Platform.squeak-dkh.21 and get Metacello-Platform.squeak-dkh.21 into the ancestry ...' id '1214fa6a-315f-4904-8829-794d716288f1' date '5 May 2013' time '3:12 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.18' message 'switch to using #select and #unselect for MetacelloPlatform' id '9c552a06-cfbe-48e6-86ab-7683c5c680d0' date '5 May 2013' time '1:55:23 am' author 'dkh' ancestors () stepChildren ())(name 'Metacello-Platform.squeak-dkh.21' message 'force change in MetacelloSqueakPlatform class>>initiliaze as a temp hack to bootstrap Metacello Preview (see https://github.com/dalehenrich/metacello-work/issues/151)' id 'f52c2c82-fc54-4671-b293-826d29aa7706' date '5 May 2013' time '2:51:38 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.20' message 'really add squeak4.5.x as platform attribute' id '9e83dd3b-4537-45a1-8ed5-b0bef4b6a006' date '5 May 2013' time '2:45:52 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.19' message 'add squeak4.5.x as platform attribute' id '6c4ff447-6495-4955-a3d2-c52053912351' date '5 May 2013' time '2:39:32 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.16' message 'new version for Squeak (Issue #39)' id '08000000-1508-621d-1508-621d14000000' date '27 February 2013' time '5:24:38 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.15' message 'fix for Issue #140 (including patch for introduced gemstone issue)' id '08000000-1508-0418-1508-041814000000' date '25 February 2013' time '5:19:47 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.14' message 'catch up with gemstone port' id '08000000-1508-5c17-1508-5c1714000000' date '10 July 2012' time '12:03:34 pm' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.13' message 'checkpoint Issue #38' id '9aecf4d3-dbba-4b04-91b6-781938a502e3' date '12 June 2012' time '10:18:46 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.12' message 'checkpoint Isue #38' id 'f1f6b9a4-24e7-451c-a699-3bb8900f09fc' date '12 June 2012' time '9:33:39 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.11' message '1.0-beta.32 (dkh.662):- fix Issue 111: progress notification for Squeak http://code.google.com/p/metacello/issues/detail?id=111' id '5cf04623-a4fb-447a-96d8-21978c340f77' date '18 January 2012' time '4:57:04 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.10' message '- passing tests in Squeak3.10.2- 365 run, 365 passes' id 'e3af2d13-7aed-41ad-8788-2ea645f0cace' date '5 January 2011' time '5:03:59 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.9' message '- Squeak portability' id '6895c682-39ad-47d8-8206-2ed1bf117947' date '5 January 2011' time '4:09:03 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.8' message '- add Squeak attributes: #''squeak3.10.x'', #''squeak4.1.x'', and #''squeak4.2.x''' id '00f3028a-51a9-40fc-a409-c015a787779b' date '5 January 2011' time '3:39:28 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.7' message '- implement copyClass:as:inCategory:' id '2962dcae-a27e-4a64-906c-f076ff018c8d' date '18 November 2010' time '4:25:10 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.6' message '- implement copyClass:as:' id '8bc3449c-f0be-43ca-9d20-260ed0059df9' date '18 November 2010' time '3:37:16 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.5' message '- port to Squeak3.10.2-7179-basic' id '9a3caba5-a0cd-42cf-bb29-7b31e9b84fcb' date '5 February 2010' time '4:51:41 pm' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.4' message '- fix Issue 14: http://code.google.com/p/metacello/issues/detail?id=14 Ftp repository for Squeak- add ftp support for Squeak' id 'b30549fa-52cb-424e-a7aa-329b15152b47' date '29 December 2009' time '4:17:21 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.3' message '- needs #initialize method' id 'b0033f12-24a1-4373-8a2c-211ccb6d061e' date '12 October 2009' time '1:30:44 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.2' message '- implement platform utility methods' id 'f4ca5554-cf53-4251-8066-5c2ae813ab09' date '12 October 2009' time '1:28:37 am' author 'dkh' ancestors ((name 'Metacello-Platform.squeak-dkh.1' message '- Squeak-specific metacello support' id '7045edec-ac01-4485-bd21-efac82f0c9ef' date '9 August 2009' time '11:13:57 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 ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
Expand Down