From fc259e8398b9ddb49d9bb066c7b49dcc2c4d302e Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Fri, 3 Apr 2020 12:41:35 +0200 Subject: [PATCH] Do not load famix if it is already present. --- .../BaselineOfFamixTagging.class.st | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/BaselineOfFamixTagging/BaselineOfFamixTagging.class.st b/src/BaselineOfFamixTagging/BaselineOfFamixTagging.class.st index 47f9e8c..0b545bc 100644 --- a/src/BaselineOfFamixTagging/BaselineOfFamixTagging.class.st +++ b/src/BaselineOfFamixTagging/BaselineOfFamixTagging.class.st @@ -13,15 +13,13 @@ BaselineOfFamixTagging >> baseline: spec [ spec for: #common do: [ "Dependencies" - self - famix: spec; - materialColor: spec. + self materialColor: spec. "Packages" spec - package: 'Famix-Tagging' with: [ spec requires: #('MaterialColors' 'Famix') ]; - package: 'Famix-Tagging-Code' with: [ spec requires: #('Famix-Tagging' 'FamixTraits') ]; - package: 'Famix-Tagging-Tests-Generator' with: [ spec requires: #('FamixGenerator') ]; + package: 'Famix-Tagging' with: [ spec requires: #('MaterialColors') ]; + package: 'Famix-Tagging-Code' with: [ spec requires: #('Famix-Tagging') ]; + package: 'Famix-Tagging-Tests-Generator'; package: 'Famix-Tagging-Tests-Entities' with: [ spec requires: #('FamixTraits') ]; package: 'Famix-Tagging-Tests' with: [ spec requires: #('Famix-Tagging' 'Famix-Tagging-Code' 'Famix-Tagging-Tests-Entities') ]. @@ -29,7 +27,23 @@ BaselineOfFamixTagging >> baseline: spec [ spec group: 'TaggingMinimal' with: #('Famix-Tagging'); group: 'Tagging' with: #('TaggingMinimal' 'Famix-Tagging-Code'); - group: 'TaggingTests' with: #('Famix-Tagging-Tests') ] + group: 'TaggingTests' with: #('Famix-Tagging-Tests') ]. + + spec + for: #(#WithoutFamix) + do: [ self famix: spec. + spec + package: 'Famix-Tagging' with: [ spec requires: #('Famix') ]; + package: 'Famix-Tagging-Code' with: [ spec requires: #('FamixTraits') ]; + package: 'Famix-Tagging-Tests-Generator' with: [ spec requires: #('FamixGenerator') ] ] +] + +{ #category : #accessing } +BaselineOfFamixTagging >> customProjectAttributes [ + self class environment at: #BaselineOfFamixs ifAbsent: [ ^ #(#WithoutFamix) ]. + + ^ #() + ] { #category : #dependencies }