Skip to content

Commit

Permalink
Simplify roassal baseline and fix problem in other version than P11
Browse files Browse the repository at this point in the history 
The baseline of roassal was redefining everything for every version of Pharo. I propose to have a common one and then to only add the specificities for each version of Pharo. 
Also this fixes a bug in Pharo 8, 9, 10, 12 that was loading some packages that were supposed to be only for P11.
  • Loading branch information
@jecisc
jecisc committed Mar 12, 2024
1 parent 5d00570 commit f227c7a
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 145 deletions.
199 changes: 62 additions & 137 deletions src/BaselineOfRoassal/BaselineOfRoassal.class.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,80 +24,75 @@ BaselineOfRoassal >> athensSVG: spec [

{ #category : #baselines }
BaselineOfRoassal >> baseline: spec [
<baseline>
"https://github.com/pharo-graphics/Roassal"
"pharo7 not supported"
spec
for: #'pharo8.x' do: [ self baselineForPharo8: spec ];
for: #'pharo9.x' do: [ self baselineForPharo9: spec ];
for: #'pharo10.x' do: [ self baselineForPharo10: spec ];
for: #'pharo11.x' do: [ self baselineForPharo11: spec ];
for: #'pharo12.x' do: [ self baselineForPharo12: spec ];
for: #'common' do: [ self baselineForCommon: spec ].
]

{ #category : #baselines }
BaselineOfRoassal >> baselineForCommon: spec [
self baselineForPharo11: spec
]

{ #category : #baselines }
BaselineOfRoassal >> baselineForPharo10: spec [
self dependencies: spec.
self registerPackages: spec.
spec package: #'Roassal-Pharo'.
spec package: #'Roassal-Pharo10'.
self roassalGroups: spec
core: self corePackagesNames, #('Roassal-Pharo' 'Roassal-Pharo10')
examples: self examplePackagesNames
tests: self testPackagesNames.
]

{ #category : #baselines }
BaselineOfRoassal >> baselineForPharo11: spec [
self dependencies: spec.
self registerPackages: spec.
spec package: #'Roassal-Pharo'.
self roassalGroups: spec
core: self corePackagesNames, #('Roassal-Pharo')
examples: self examplePackagesNames
tests: self testPackagesNames.
]
"pharo7 not supported"

{ #category : #baselines }
BaselineOfRoassal >> baselineForPharo12: spec [
self dependencies: spec.
self registerPackages: spec.
spec package: #'Roassal-Pharo12'.
self roassalGroups: spec
core: self corePackagesNames, #('Roassal-Pharo12')
examples: self examplePackagesNames
tests: self testPackagesNames.
]
<baseline>
self baselineOfCommon: spec.

{ #category : #baselines }
BaselineOfRoassal >> baselineForPharo8: spec [
self dependencies: spec.
self registerPackages: spec.
spec package: #'Roassal-Pharo8'.
spec package: #'Roassal-Spec-Obsolete'.
spec package: #'Roassal-Pharo'.
self roassalGroups: spec
core: self corePackagesNames, #('Roassal-Pharo8' 'Roassal-Spec-Obsolete' 'Roassal-Pharo')
examples: self examplePackagesNames
tests: self testPackagesNames.
spec
for: #( #'pharo8.x' #'pharo9.x' #'pharo10.x' #'pharo11.x' ) do: [
spec package: #'Roassal-Pharo'.
spec group: 'Core' with: #( 'Roassal-Pharo' ) ];
for: #'pharo8.x' do: [
spec package: #'Roassal-Pharo8'.
spec package: #'Roassal-Spec-Obsolete'.
spec group: 'Core' with: #( 'Roassal-Pharo8' 'Roassal-Spec-Obsolete' ) ];
for: #'pharo9.x' do: [
spec package: #'Roassal-Pharo9'.
spec group: 'Core' with: #( 'Roassal-Pharo9' ) ];
for: #'pharo10.x' do: [
spec package: #'Roassal-Pharo10'.
spec group: 'Core' with: #( 'Roassal-Pharo10' ) ];
for: #'pharo12.x' do: [
spec package: #'Roassal-Pharo12'.
spec group: 'Core' with: #( 'Roassal-Pharo12' ) ]
]

{ #category : #baselines }
BaselineOfRoassal >> baselineForPharo9: spec [
self dependencies: spec.
self registerPackages: spec.
spec package: #'Roassal-Pharo9'.
spec package: #'Roassal-Pharo'.
self roassalGroups: spec
core: self corePackagesNames, #('Roassal-Pharo9' 'Roassal-Pharo')
examples: self examplePackagesNames
tests: self testPackagesNames.
BaselineOfRoassal >> baselineOfCommon: spec [

spec for: #common do: [
self
bloc: spec;
athensSVG: spec;
geometry: spec;
numeric: spec;
subProcess: spec;
dataFrame: spec;
aiDatasets: spec;
layouts: spec;
rtree: spec.

spec package: #Roassal with: [ spec requires: #( 'Geometry' 'NumericScales' 'RoassalLayouts' 'RTree' ) ].

self corePackagesNames , self examplePackagesNames , self testPackagesNames , self extraPackagesNames do: [ :name | spec package: name ].

spec
package: #'Roassal-Bloc' with: [ spec requires: #( 'Bloc' ) ];
package: #'Roassal-SVG' with: [ spec requires: #( 'Athens-SVG-PathConverter' ) ];
package: #'Roassal-SVG-Tests';
package: #'Roassal-SVG-Examples';
package: #'Roassal-SVG-Importer' with: [ spec requires: #( 'AthensSVG' ) ];
package: #'Roassal-GraphViz' with: [ spec requires: #( 'OSSubprocess' ) ];
package: #'Roassal-Gtk';
package: #'Roassal-Spec-Gtk';
package: #'Roassal-Chart-DataFrame' with: [ spec requires: #( 'DataFrame' 'AIDatasets' ) ].

spec
group: 'Core' with: #( 'Roassal' ) , self corePackagesNames;
group: 'Examples' with: #( 'Core' ) , self examplePackagesNames;
group: 'Tests' with: #( 'Core' ) , self testPackagesNames;
group: 'SVGExamples' with: #( 'Examples' 'Roassal-SVG-Examples' );
group: 'SVGImporter' with: #( 'SVGExamples' 'Roassal-SVG-Importer' );
group: 'Gtk' with: #( 'Roassal-Gtk' 'Roassal-Spec-Gtk' );
group: 'Mini' with: #( 'Tests' 'SVGExamples' );
group: 'Full' with: #( 'Mini' ) , self extraPackagesNames;
group: 'GraphViz' with: #( 'Full' 'Roassal-GraphViz' );
group: 'BlocFull' with: #( 'Full' 'Roassal-Bloc' );
group: 'default' with: #( 'Mini' );
group: 'Full-DataFrame' with: #( 'Full' 'Roassal-Chart-DataFrame' ) ]
]

{ #category : #dependencies }
Expand Down Expand Up @@ -140,20 +135,6 @@ BaselineOfRoassal >> dataFrame: spec [
with: [ spec repository: 'github://PolyMathOrg/DataFrame/src' ]
]

{ #category : #dependencies }
BaselineOfRoassal >> dependencies: spec [
self
bloc: spec;
athensSVG: spec;
geometry: spec;
numeric: spec;
subProcess: spec;
dataFrame: spec;
aiDatasets: spec;
layouts: spec;
rtree: spec
]

{ #category : #'API-packages' }
BaselineOfRoassal >> examplePackagesNames [
^ #(
Expand Down Expand Up @@ -197,62 +178,6 @@ BaselineOfRoassal >> numeric: spec [
spec repository: 'github://pharo-graphics/NumericScales:v1.03/src' ].
]

{ #category : #baselines }
BaselineOfRoassal >> registerPackages: spec [
"The packages to use, but not load"
spec package: #'Roassal' with: [
spec requires:
#('Geometry'
'NumericScales'
'RoassalLayouts'
'RTree') ].
self corePackagesNames,
self examplePackagesNames,
self testPackagesNames,
self extraPackagesNames do: [ :name | spec package: name ].

spec
package: #'Roassal-Bloc' with: [ spec requires: #('Bloc') ];

package: #'Roassal-SVG' with: [ spec requires: #('Athens-SVG-PathConverter') ];
package: #'Roassal-SVG-Tests';
package: #'Roassal-SVG-Examples';
package: #'Roassal-SVG-Importer' with: [ spec requires: #('AthensSVG') ].

spec package: #'Roassal-GraphViz' with: [ spec requires: #('OSSubprocess') ].

spec package: #'Roassal-Gtk'.
spec package: #'Roassal-Spec-Gtk'.

spec package: #'Roassal-Chart-DataFrame' with: [ spec requires: #('DataFrame' 'AIDatasets') ].






]

{ #category : #baselines }
BaselineOfRoassal >> roassalGroups: spec core: arr1 examples: arr2 tests: arr3 [
| core |
core := #('Core').
spec
group: 'Core' with: #('Roassal'), arr1;
group: 'Examples' with: core, arr2;
group: 'Tests' with: core, arr3;
group: 'SVGExamples' with: #('Examples' 'Roassal-SVG-Examples');
group: 'SVGImporter' with: #('SVGExamples' 'Roassal-SVG-Importer');
group: 'Gtk' with: #('Roassal-Gtk' 'Roassal-Spec-Gtk');

group: 'Mini' with: #('Tests' 'SVGExamples');
group: 'Full' with: #('Mini'), self extraPackagesNames;
group: 'GraphViz' with: #('Full' 'Roassal-GraphViz');
group: 'BlocFull' with: #('Full' 'Roassal-Bloc');
group: 'default' with: #('Mini');
group: 'Full-DataFrame' with: #('Full' 'Roassal-Chart-DataFrame')
]

{ #category : #dependencies }
BaselineOfRoassal >> rtree: spec [
spec
Expand Down
9 changes: 1 addition & 8 deletions src/Roassal/Class.extension.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,7 @@ Class >> dependentClassesWithOccurences [
"We unify a class and its metaclass"
self methods , self classSide methods do: [ :m |
m literalsDo: [ :l | "We also check if the method is not an extension"
(l isVariableBinding and: [
l value isNotNil and: [
l value isBehavior and: [
m protocolName isNotEmpty and: [
m protocolName first ~= $*
] ] ] ]) ifTrue: [ cll add: l value ].
]
].
(l isVariableBinding and: [ l value isNotNil and: [ l value isBehavior and: [ m isExtension ] ] ]) ifTrue: [ cll add: l value ] ] ].
^ cll asArray
]

Expand Down

0 comments on commit f227c7a

Please sign in to comment.