Skip to content

Commit

Permalink
Merge pull request #527 from tom95/fix-squeak-platform-attributes
Browse files Browse the repository at this point in the history
Fixes precedence of Squeak's platform attributes
  • Loading branch information
krono authored Sep 16, 2020
2 parents f8a60d9 + df8ae1c commit 6775722
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ defaultPlatformAttributes

major := both upTo: $..
minor := both upToEnd.
attributes
add: ('squeak', major, '.x') asSymbol;
add: ('squeak', major, '.', minor, '.x') asSymbol.
(systemVersion version endsWith: 'alpha')
ifTrue: ["For alphas it is sensible to pretend to be the previous version,
so that things can be tested and then moved forward."
Expand All @@ -23,9 +20,12 @@ defaultPlatformAttributes
so for now use a list of known jumps or roll down to 10 "
| priorVersion priorMajor |
priorMajor := major asInteger - 1.
priorVersion := #(('1' '1.31') ('2' '2.8') ('3' '3.10') ('4' '4.5' "on purpose NOT 4.6") ('5' '5.1'))
priorVersion := #(('1' '1.31') ('2' '2.8') ('3' '3.10') ('4' '4.5' "on purpose NOT 4.6") ('5' '5.3'))
at: priorMajor ifAbsent: [{priorMajor asString . priorMajor asString, '.10'}].
attributes
add: ('squeak', priorVersion first, '.x') asSymbol;
add: ('squeak', priorVersion second, '.x') asSymbol]].
attributes
add: ('squeak', major, '.x') asSymbol;
add: ('squeak', major, '.', minor, '.x') asSymbol.
^ attributes
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"collection:do:displaying:" : "dkh 6/12/2012 10:18:46.076",
"copyClass:as:inCategory:" : "dkh 6/12/2012 10:18:46.076",
"createRepository:" : "tobe 5/6/2020 20:22",
"defaultPlatformAttributes" : "topa 11/8/2017 01:17",
"defaultPlatformAttributes" : "mt 9/15/2020 15:55",
"directoryFromPath:relativeTo:" : "tfel 7/29/2014 14:39",
"do:displaying:" : "dkh 6/12/2012 10:18:46.076",
"downloadJSON:eTagsCache:eTagsKey:username:pass:" : "tobe 5/7/2020 10:10",
Expand Down
Loading

0 comments on commit 6775722

Please sign in to comment.