X Tutup
Skip to content

Commit aef550f

Browse files
kronokrono
committed
Add Squeak6 to heurristic.
1 parent 934de58 commit aef550f

File tree

6 files changed

+76
-78
lines changed

6 files changed

+76
-78
lines changed

‎repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@ resolveWith: aDictionary
1919
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
2020
"try -Squeak5-"
2121
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
22-
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ]
22+
"try -Squeak6-"
23+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [
24+
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ]

‎repository/Grease-Core.package/GRPackage.class/methodProperties.json‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
{
2+
"class" : {
3+
"grPackages" : "JohanBrichau 12/15/2013 18:27",
4+
"greaseCore" : "pmm 9/12/2013 16:00" },
25
"instance" : {
6+
"addDependenciesTo:" : "lr 9/5/2009 18:35",
7+
"addDependency:" : "merged 10/20/2008 09:33",
8+
"allDependencies" : "lr 2/17/2010 15:18",
39
"dependencies" : "jf 3/15/2009 17:00",
4-
"license:" : "obi 10/8/2009 07:51",
10+
"description" : "merged 10/20/2008 09:23",
11+
"description:" : "lr 10/25/2009 11:26",
12+
"greaseUrl" : "pmm 9/12/2013 15:57",
513
"initialize" : "lr 2/17/2010 15:06",
14+
"isLGPL" : "lr 10/25/2009 15:19",
15+
"isMIT" : "lr 10/25/2009 15:19",
616
"license" : "lr 2/10/2010 11:18",
17+
"license:" : "obi 10/8/2009 07:51",
718
"name" : "lr 2/17/2010 15:18",
8-
"description:" : "lr 10/25/2009 11:26",
9-
"seasideUrl" : "pmm 9/12/2013 15:58",
10-
"allDependencies" : "lr 2/17/2010 15:18",
11-
"isLGPL" : "lr 10/25/2009 15:19",
12-
"seasideLGPLUrl" : "pmm 9/12/2013 15:59",
13-
"greaseUrl" : "pmm 9/12/2013 15:57",
1419
"name:" : "lr 10/25/2009 11:26",
15-
"description" : "merged 10/20/2008 09:23",
20+
"printOn:" : "merged 10/20/2008 09:24",
21+
"resolveWith:" : "topa 11/15/2017 17:31",
1622
"seasideAddonsUrl" : "pmm 9/12/2013 15:59",
17-
"resolveWith:" : "JohanBrichau 5/26/2017 15:56",
18-
"addDependency:" : "merged 10/20/2008 09:33",
23+
"seasideLGPLUrl" : "pmm 9/12/2013 15:59",
24+
"seasideUrl" : "pmm 9/12/2013 15:58",
1925
"url" : "lr 2/10/2010 11:18",
20-
"printOn:" : "merged 10/20/2008 09:24",
21-
"addDependenciesTo:" : "lr 9/5/2009 18:35",
22-
"url:" : "lr 2/17/2010 15:18",
23-
"isMIT" : "lr 10/25/2009 15:19"
24-
},
25-
"class" : {
26-
"greaseCore" : "pmm 9/12/2013 16:00",
27-
"grPackages" : "JohanBrichau 12/15/2013 18:27"
28-
}
29-
}
26+
"url:" : "lr 2/17/2010 15:18" } }

‎repository/Grease-Core.package/GRPackage.class/properties.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
{
2-
"commentStamp" : "pmm 9/14/2013 15:53",
3-
"super" : "GRObject",
42
"category" : "Grease-Core",
5-
"classinstvars" : [ ],
6-
"pools" : [ ],
7-
"classvars" : [ ],
3+
"classinstvars" : [
4+
],
5+
"classvars" : [
6+
],
7+
"commentStamp" : "pmm 9/14/2013 15:53",
88
"instvars" : [
99
"name",
1010
"description",
1111
"dependencies",
1212
"license",
13-
"url"
14-
],
13+
"url" ],
1514
"name" : "GRPackage",
16-
"type" : "normal"
17-
}
15+
"pools" : [
16+
],
17+
"super" : "GRObject",
18+
"type" : "normal" }

‎repository/Grease-Core.package/GRPlatform.class/methodProperties.json‎

Lines changed: 34 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,44 @@
11
{
2+
"class" : {
3+
"current" : "jgf 1/25/2009 12:06",
4+
"current:" : "jf 1/21/2009 17:08",
5+
"select" : "jf 9/30/2009 00:19",
6+
"unselect" : "jf 9/30/2009 00:19" },
27
"instance" : {
3-
"localNameOf:" : "pmm 8/19/2014 10:10",
4-
"stackDepth" : "jf 1/22/2009 02:11",
5-
"versionString" : "jf 2/9/2010 00:57",
6-
"semaphoreClass" : "jf 1/22/2009 02:10",
7-
"reducedConflictDictionary" : "jf 1/22/2009 02:39",
8+
"addToShutDownList:" : "jf 1/22/2009 02:11",
9+
"addToStartUpList:" : "jf 1/22/2009 02:10",
10+
"asMethodReturningByteArray:named:" : "jf 1/22/2009 02:11",
11+
"base64Decode:" : "pmm 8/27/2011 15:12",
12+
"bindingOf:" : "pmm 8/23/2014 11:42",
13+
"compile:into:classified:" : "jf 1/22/2009 02:11",
14+
"contentsOfFile:binary:" : "jf 1/22/2009 02:11",
15+
"convertToSmalltalkNewlines:" : "lr 4/15/2010 19:15",
16+
"deprecationExceptionSet" : "pmm 9/6/2014 12:17",
817
"directoriesIn:" : "NickAger 3/9/2012 11:29",
918
"doTransaction:" : "lr 7/25/2011 19:51",
10-
"terminateProcess:" : "jf 2/6/2009 16:00",
19+
"ensureExistenceOfFolder:" : "pmm 2/5/2011 09:54",
20+
"fileExists:" : "JohanBrichau 10/3/2014 20:02",
21+
"fileStreamOn:do:binary:" : "JohanBrichau 10/3/2014 20:00",
22+
"filesIn:" : "pmm 2/5/2011 09:54",
23+
"isProcessTerminated:" : "jf 2/6/2009 16:00",
24+
"label" : "jf 2/9/2010 00:57",
25+
"localNameOf:" : "pmm 8/19/2014 10:10",
26+
"newRandom" : "jf 9/25/2009 16:40",
27+
"newline" : "lr 4/15/2010 19:13",
1128
"openDebuggerOn:" : "jf 1/22/2009 02:11",
12-
"bindingOf:" : "pmm 8/23/2014 11:42",
13-
"convertToSmalltalkNewlines:" : "lr 4/15/2010 19:15",
14-
"writeCharacterStreamOn:" : "pmm 8/26/2011 09:45",
1529
"pathSeparator" : "pmm 2/5/2011 09:53",
16-
"compile:into:classified:" : "jf 1/22/2009 02:11",
17-
"weakDictionaryOfSize:" : "jf 1/22/2009 02:11",
18-
"write:toFile:inFolder:" : "pmm 8/19/2014 10:11",
19-
"base64Decode:" : "pmm 8/27/2011 15:12",
30+
"readWriteByteStream" : "lr 7/25/2011 19:51",
31+
"readWriteCharacterStream" : "lr 7/25/2011 19:51",
32+
"reducedConflictDictionary" : "jf 1/22/2009 02:39",
2033
"removeFromShutDownList:" : "jf 1/22/2009 02:11",
2134
"removeFromStartUpList:" : "jf 1/22/2009 02:11",
22-
"isProcessTerminated:" : "jf 2/6/2009 16:00",
23-
"label" : "jf 2/9/2010 00:57",
24-
"addToShutDownList:" : "jf 1/22/2009 02:11",
25-
"newRandom" : "jf 9/25/2009 16:40",
26-
"ensureExistenceOfFolder:" : "pmm 2/5/2011 09:54",
27-
"version" : "JohanBrichau 5/25/2017 17:46",
28-
"contentsOfFile:binary:" : "jf 1/22/2009 02:11",
29-
"addToStartUpList:" : "jf 1/22/2009 02:10",
3035
"removeSelector:from:" : "jf 1/22/2009 02:11",
3136
"secureHashFor:" : "jf 1/22/2009 02:11",
32-
"fileExists:" : "JohanBrichau 10/3/2014 20:02",
33-
"filesIn:" : "pmm 2/5/2011 09:54",
34-
"newline" : "lr 4/15/2010 19:13",
35-
"readWriteCharacterStream" : "lr 7/25/2011 19:51",
36-
"readWriteByteStream" : "lr 7/25/2011 19:51",
37-
"deprecationExceptionSet" : "pmm 9/6/2014 12:17",
38-
"asMethodReturningByteArray:named:" : "jf 1/22/2009 02:11",
39-
"fileStreamOn:do:binary:" : "JohanBrichau 10/3/2014 20:00"
40-
},
41-
"class" : {
42-
"current" : "jgf 1/25/2009 12:06",
43-
"unselect" : "jf 9/30/2009 00:19",
44-
"current:" : "jf 1/21/2009 17:08",
45-
"select" : "jf 9/30/2009 00:19"
46-
}
47-
}
37+
"semaphoreClass" : "jf 1/22/2009 02:10",
38+
"stackDepth" : "jf 1/22/2009 02:11",
39+
"terminateProcess:" : "jf 2/6/2009 16:00",
40+
"version" : "JohanBrichau 5/25/2017 17:46",
41+
"versionString" : "jf 2/9/2010 00:57",
42+
"weakDictionaryOfSize:" : "jf 1/22/2009 02:11",
43+
"write:toFile:inFolder:" : "pmm 8/19/2014 10:11",
44+
"writeCharacterStreamOn:" : "pmm 8/26/2011 09:45" } }

‎repository/Grease-Core.package/GRPlatform.class/properties.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
2-
"commentStamp" : "jf 2/6/2009 16:05",
3-
"super" : "GRObject",
42
"category" : "Grease-Core",
5-
"classinstvars" : [ ],
6-
"pools" : [ ],
3+
"classinstvars" : [
4+
],
75
"classvars" : [
8-
"Current"
9-
],
10-
"instvars" : [ ],
6+
"Current" ],
7+
"commentStamp" : "jf 2/6/2009 16:05",
8+
"instvars" : [
9+
],
1110
"name" : "GRPlatform",
12-
"type" : "normal"
13-
}
11+
"pools" : [
12+
],
13+
"super" : "GRObject",
14+
"type" : "normal" }

‎repository/Grease-Core.package/monticello.meta/version‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(name 'Grease-Core-pmm.108' message 'merged by GitFileTree-MergeDriver' id 'b20a4dcd-14ee-473d-b3bc-996004075c34' date '25 May 2017' time '2:20:17.202819 pm' author 'pmm' ancestors ((name 'Grease-Core-pmm.107' message '- revert SmallDictionary changes for now' id '32077c22-cc68-4a2f-a7f3-050277bd0b63' date '26 August 2016' time '3:59:50.285037 pm' author 'pmm' ancestors ((name 'Grease-Core-pmm.106' message '- add GRSmallOrderedSet' id 'e7933307-f87d-4929-9a43-ecb800b71ebf' date '25 August 2016' time '3:36:09.938199 pm' author 'pmm' ancestors ((name 'Grease-Core-pmm.105' message '- add new #keysAndAllValuesDo:' id 'b8c3f92f-2bc1-4e13-820b-3fc6c84eb5d8' date '25 August 2016' time '3:23:48.853034 pm' author 'pmm' ancestors ((name 'Grease-Core-pmm.104' message '- fix #greaseInteger
1+
(name 'Grease-Core-topa.109' message 'Add Squeak6 to heurristic.' id 'ff22e846-1f80-4ad6-9587-db8ac931c309' date '15 November 2017' time '5:35:29.81457 pm' author 'topa' ancestors ((name 'Grease-Core-pmm.108' message 'merged by GitFileTree-MergeDriver' id 'b20a4dcd-14ee-473d-b3bc-996004075c34' date '25 May 2017' time '2:20:17.202819 pm' author 'pmm' ancestors ((name 'Grease-Core-pmm.107' message '- revert SmallDictionary changes for now' id '32077c22-cc68-4a2f-a7f3-050277bd0b63' date '26 August 2016' time '3:59:50.285037 pm' author 'pmm' ancestors ((name 'Grease-Core-pmm.106' message '- add GRSmallOrderedSet' id 'e7933307-f87d-4929-9a43-ecb800b71ebf' date '25 August 2016' time '3:36:09.938199 pm' author 'pmm' ancestors ((name 'Grease-Core-pmm.105' message '- add new #keysAndAllValuesDo:' id 'b8c3f92f-2bc1-4e13-820b-3fc6c84eb5d8' date '25 August 2016' time '3:23:48.853034 pm' author 'pmm' ancestors ((name 'Grease-Core-pmm.104' message '- fix #greaseInteger
22
- add GRSmallOrderedSet' id '0cbaaf21-cd1f-4ec9-ae06-b5cd4b9f7d9a' date '25 August 2016' time '2:55:05.659616 pm' author 'pmm' ancestors ((name 'Grease-Core-pmm.103' message '- avoid association allocation in #addAll:' id '0c5392fa-dcef-4126-a29e-0ce5aaaa6ef7' date '25 August 2016' time '12:34:57.088428 pm' author 'pmm' ancestors ((name 'Grease-Core-pmm.102' message '- merge' id '145cda97-94f7-4983-9431-dbb190abaf5e' date '25 August 2016' time '12:22:52.508208 pm' author 'pmm' ancestors ((name 'Grease-Core-pmm.101' message '- lint fixes' id '4fb7fbee-57ad-4a6a-8995-fc771a1b550b' date '25 August 2016' time '11:31:09.647343 am' author 'pmm' ancestors ((name 'Grease-Core-pmm.100' message '- lint fixes' id 'aa8715ac-cb26-48fa-9848-844663b95a0a' date '25 August 2016' time '11:03:09.006107 am' author 'pmm' ancestors ((name 'Grease-Core-pmm.99' message 'Optimize GRSmallDictionary to a single array #875
33
- https://github.com/SeasideSt/Seaside/issues/875' id 'c93df209-d81b-4162-8f83-6e906d7cc04d' date '22 August 2016' time '12:39:19.148731 pm' author 'pmm' ancestors ((name 'Grease-Core-JohanBrichau.98' message 'Updated the Grease version method (forgot this a year ago... )' id '4b366145-692f-4fc1-a2ae-e67f5a121eb1' date '5 May 2016' time '12:56:41.101881 pm' author 'JohanBrichau' ancestors ((name 'Grease-Core-JohanBrichau.97' message 'Added resolve for Pharo5 in GRPackage resolveWith:' id '868988c3-e68d-41f6-8932-c172c82904fa' date '26 March 2016' time '3:55:55.690691 pm' author 'JohanBrichau' ancestors ((name 'Grease-Core-pmm.96' message '- empty merge commit' id '022a5a23-c294-437c-adc1-9a613ccbd2bb' date '12 July 2015' time '10:28:08 am' author 'pmm' ancestors ((name 'Grease-Core-pmm.95' message '- empty merge commit' id '9a9f3f50-c81b-4ed6-a41a-d0961b92c731' date '12 July 2015' time '10:26:31 am' author 'pmm' ancestors ((name 'Grease-Core-pmm.92' message '#820 Configurations should not hold on to classes' id 'd65501a6-b884-4310-881d-ec25dc7b0002' date '12 July 2015' time '10:23:24 am' author 'pmm' ancestors ((name 'Grease-Core-pmm.91' message '- lint fixes' id '6bbf6f41-4d71-47da-a07e-c7d630cfb445' date '19 August 2014' time '10:34:54 am' author 'pmm' ancestors ((name 'Grease-Core-pmm.90' message '- lint fixes' id '4c1849aa-9f03-4eca-8f9f-f3e98a70e0a3' date '19 August 2014' time '9:37:58 am' author 'pmm' ancestors ((name 'Grease-Core-JohanBrichau.89' message 'forgot the version number again...' id '6d882333-0356-45c9-851f-93312bce0b9e' date '20 July 2014' time '6:04:54.866362 pm' author 'JohanBrichau' ancestors ((name 'Grease-Core-JohanBrichau.88' message 'merged Grease-Core-JohanBrichau.87 and Grease-Core-StephanEggermont.87' id '8fc8f8bd-2317-4460-9abc-70752a9882b6' date '4 July 2014' time '10:54:46.225141 am' author 'JohanBrichau' ancestors ((name 'Grease-Core-JohanBrichau.87' message 'updated the version method' id '1fb6ae91-5efa-4517-bd7e-5a929c7d710f' date '11 June 2014' time '7:46:26.136116 am' author 'JohanBrichau' ancestors ((name 'Grease-Core-JohanBrichau.86' message 'merged Grease-Core-pmm.85 and Grease-Core-JohanBrichau.85' id '405a05a1-2041-4621-8412-9ff4b9842089' date '17 February 2014' time '6:51:26.464341 am' author 'JohanBrichau' ancestors ((name 'Grease-Core-JohanBrichau.85' message 'move GRCountingStream from Pharo-only package to Core' id 'ac4a44c6-5fdf-40b5-844a-eb61bc6cca48' date '16 February 2014' time '9:30:16.525052 pm' author 'JohanBrichau' ancestors ((name 'Grease-Core-pmm.84' message '- fix comment' id 'cfd4a0a1-464c-44f7-9ebf-8cad9f9ad388' date '1 February 2014' time '3:14:07 pm' author 'pmm' ancestors ((name 'Grease-Core-JohanBrichau.83' message 'Rename #packages to #grPackages (triggered to prevent a name collision in Pharo3.0)' id '33554268-7ad1-45f6-a0d9-4d0ed77d68d4' date '15 December 2013' time '6:30:54.565 pm' author 'JohanBrichau' ancestors ((name 'Grease-Core-pmm.82' message 'Issue 770: ScaledDecimal rendering support
44
http://code.google.com/p/seaside/issues/detail?id=770
@@ -46,4 +46,4 @@ GRPlatform>>#directoriesIn:
4646
to support recursing sub-directories for file to load into a file library.
4747

4848
Fix for: http://code.google.com/p/seaside/issues/detail?id=267' id '364dcb92-0613-4caf-8058-a8c25d65249c' date '9 March 2012' time '2:52:30 pm' author 'NickAger' ancestors ((id '0a3221fb-c5d8-4ce1-b139-0e6dc72481a2')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'Grease-Core-pmm.85' message 'Issue 781: Also catch platform deprecation signals
49-
- http://code.google.com/p/seaside/issues/detail?id=781' id '792050f8-aab9-4903-9d9d-64ef14554008' date '16 February 2014' time '11:16:53 pm' author 'pmm' ancestors ((id 'cfd4a0a1-464c-44f7-9ebf-8cad9f9ad388')) stepChildren ())) stepChildren ())) stepChildren ())(name 'Grease-Core-StephanEggermont.87' message 'Added resolve for Pharo4 in GRPackage resolveWith:' id 'fe861b91-7089-436d-98e4-06b764abe7fc' date '2 July 2014' time '7:03:08.283881 pm' author 'StephanEggermont' ancestors ((id '405a05a1-2041-4621-8412-9ff4b9842089')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'Grease-Core-JohanBrichau.94' message 'additional file library methods' id '5283728c-3883-45c2-8b4a-0d99c65632ca' date '3 October 2014' time '8:07:43.645747 pm' author 'JohanBrichau' ancestors ((name 'Grease-Core-pmm.93' message 'Issue 827: GRPlatform >> #deprecationExceptionSet should use ExceptionSet' id '7e4068d6-301d-4e9f-a271-332e6c6adf21' date '6 September 2014' time '12:18:17 pm' author 'pmm' ancestors ((name 'Grease-Core-jok.92' message '' id '7e3bfc78-1fb0-8d43-b65f-050e9d1bf700' date '23 August 2014' time '11:02:48.249694 am' author 'jok' ancestors ((id '6bbf6f41-4d71-47da-a07e-c7d630cfb445')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'Grease-Core-TravisCI.100' message 'h4x for Squeak' id '4ef84bab-74af-47fc-86ed-bc55367b9d2c' date '23 August 2016' time '11:02:57.719 am' author 'TravisCI' ancestors ((id 'c93df209-d81b-4162-8f83-6e906d7cc04d')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(id '4b366145-692f-4fc1-a2ae-e67f5a121eb1')) stepChildren ())
49+
- http://code.google.com/p/seaside/issues/detail?id=781' id '792050f8-aab9-4903-9d9d-64ef14554008' date '16 February 2014' time '11:16:53 pm' author 'pmm' ancestors ((id 'cfd4a0a1-464c-44f7-9ebf-8cad9f9ad388')) stepChildren ())) stepChildren ())) stepChildren ())(name 'Grease-Core-StephanEggermont.87' message 'Added resolve for Pharo4 in GRPackage resolveWith:' id 'fe861b91-7089-436d-98e4-06b764abe7fc' date '2 July 2014' time '7:03:08.283881 pm' author 'StephanEggermont' ancestors ((id '405a05a1-2041-4621-8412-9ff4b9842089')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'Grease-Core-JohanBrichau.94' message 'additional file library methods' id '5283728c-3883-45c2-8b4a-0d99c65632ca' date '3 October 2014' time '8:07:43.645747 pm' author 'JohanBrichau' ancestors ((name 'Grease-Core-pmm.93' message 'Issue 827: GRPlatform >> #deprecationExceptionSet should use ExceptionSet' id '7e4068d6-301d-4e9f-a271-332e6c6adf21' date '6 September 2014' time '12:18:17 pm' author 'pmm' ancestors ((name 'Grease-Core-jok.92' message '' id '7e3bfc78-1fb0-8d43-b65f-050e9d1bf700' date '23 August 2014' time '11:02:48.249694 am' author 'jok' ancestors ((id '6bbf6f41-4d71-47da-a07e-c7d630cfb445')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'Grease-Core-TravisCI.100' message 'h4x for Squeak' id '4ef84bab-74af-47fc-86ed-bc55367b9d2c' date '23 August 2016' time '11:02:57.719 am' author 'TravisCI' ancestors ((id 'c93df209-d81b-4162-8f83-6e906d7cc04d')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(id '4b366145-692f-4fc1-a2ae-e67f5a121eb1')) stepChildren ())) stepChildren ())

0 commit comments

Comments
 (0)
X Tutup