X Tutup
Skip to content

Commit fc89d8b

Browse files
dalehenrichdalehenrich
committed
Merge branch 'master' of https://github.com/GsDevKit/Grease 
2 parents d7b88fe + 042a0a0 commit fc89d8b

File tree

292 files changed

+1600
-311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

292 files changed

+1600
-311
lines changed

‎repository/BaselineOfGrease.package/.filetree‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2-
"noMethodMetaData" : true,
32
"separateMethodMetaAndSource" : false,
4-
"useCypressPropertiesFile" : true }
3+
"noMethodMetaData" : true,
4+
"useCypressPropertiesFile" : true
5+
}

‎repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineCommon..st‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
baselines
22
baselineCommon: spec
3+
34
spec
45
for: #common
56
do: [ spec blessing: #baseline.

‎repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
baselines
22
baselineGemStone: spec
3+
34
spec
45
for: #'gemstone'
56
do: [

‎repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ baselinePharo: spec
6262
requires: #('Grease-Pharo100-Core');
6363
includes: #('Grease-Tests-Pharo-Core') ];
6464
package: 'Grease-Pharo100-Core' with: [ spec requires: #('Grease-Core') ];
65-
package: 'Grease-Pharo90-Slime' with: [ spec requires: #('Grease-Core') ];
66-
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo90-Slime') ].
65+
package: 'Grease-Pharo110-Slime' with: [ spec requires: #('Grease-Core') ];
66+
package: 'Grease-Tests-Pharo-Slime' with: [ spec requires: #('Grease-Pharo110-Slime') ].
6767

6868
spec
69-
group: 'Slime' with: #('Grease-Pharo90-Slime');
70-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ]
69+
group: 'Slime' with: #('Grease-Pharo110-Slime');
70+
group: 'Slime Tests' with: #('Grease-Tests-Pharo-Slime') ]

‎repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineSqueak..st‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,7 @@ baselineSqueak: spec
2222
package: 'Grease-Tests-Squeak-Core'
2323
with: [ spec requires: #('Grease-Tests-Core') ];
2424
package: 'Grease-Tests-Squeak5-Core'
25-
with: [ spec requires: #('Grease-Tests-Squeak-Core') ];
26-
package: 'Grease-Slime'
27-
with: [ spec requires: #('Refactoring-Core' 'Grease-Core') ];
28-
package: 'Grease-Tests-Slime'
29-
with: [ spec requires: #('Grease-Slime') ].
30-
spec
31-
group: 'Slime' with: #('Grease-Slime');
32-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
25+
with: [ spec requires: #('Grease-Tests-Squeak-Core') ] ].
3326
spec
3427
for: #(#'squeak6.x')
3528
do: [
@@ -52,11 +45,4 @@ baselineSqueak: spec
5245
package: 'Grease-Tests-Squeak-Core'
5346
with: [ spec requires: #('Grease-Tests-Core') ];
5447
package: 'Grease-Tests-Squeak6-Core'
55-
with: [ spec requires: #('Grease-Tests-Squeak-Core') ];
56-
package: 'Grease-Slime'
57-
with: [ spec requires: #('Refactoring-Core' 'Grease-Core') ];
58-
package: 'Grease-Tests-Slime'
59-
with: [ spec requires: #('Grease-Slime') ].
60-
spec
61-
group: 'Slime' with: #('Grease-Slime');
62-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ]
48+
with: [ spec requires: #('Grease-Tests-Squeak-Core') ] ]

‎repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
{
2-
"category" : "BaselineOfGrease",
3-
"classinstvars" : [
4-
],
5-
"classvars" : [
6-
],
72
"commentStamp" : "",
8-
"instvars" : [
9-
],
10-
"name" : "BaselineOfGrease",
11-
"pools" : [
12-
],
133
"super" : "BaselineOf",
14-
"type" : "normal" }
4+
"category" : "BaselineOfGrease",
5+
"classinstvars" : [ ],
6+
"pools" : [ ],
7+
"classvars" : [ ],
8+
"instvars" : [ ],
9+
"name" : "BaselineOfGrease",
10+
"type" : "normal"
11+
}

‎repository/BaselineOfGrease.package/monticello.meta/categories.st‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
SystemOrganization addCategory: #BaselineOfGrease!
2-
SystemOrganization addCategory: #'BaselineOfGrease-Manifest'!

‎repository/BaselineOfGrease.package/properties.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{
2-
}
1+
{ }

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ resolveWith: aDictionary
1717
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo90-') ifAbsent: [
1818
"try -Pharo100-"
1919
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo100-') ifAbsent: [
20-
"try -Squeak-"
21-
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
22-
"try -Squeak5-"
23-
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
24-
"try -Squeak6-"
25-
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [
26-
"specific for Grease-Slime"
27-
aDictionary at: (each copyReplaceAll: 'Grease-Pharo-Slime' with: 'Grease-Slime') ifAbsent: [
28-
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ] ] ]
20+
"try -Pharo110-"
21+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo110-') ifAbsent: [
22+
"try -Squeak-"
23+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
24+
"try -Squeak5-"
25+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
26+
"try -Squeak6-"
27+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [
28+
"specific for Grease-Slime"
29+
aDictionary at: (each copyReplaceAll: 'Grease-Pharo-Slime' with: 'Grease-Slime') ifAbsent: [
30+
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ] ] ] ]

‎repository/Grease-Core.package/GRPlatform.class/instance/newTemporaryFile.st‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
files
2+
newTemporaryFile
3+
"Create a new temporary file in the systems temp directory and answer its pathString.
4+
It is the users responsibility to delete or move the file, it will not be cleaned up automatically
5+
(unless the host system has a policy for it)."
6+
^ self subclassResponsibility

0 commit comments

Comments
 (0)
X Tutup