Merge pull request #8 from JanBliznicenko/spec2

Partial port of GTExtensions for P9+, removed configuration
pharo-contributions · May 7, 2024 · 2aa720c · 2aa720c
2 parents 8fef5c8 + bcea7a3
commit 2aa720c
Show file tree

Hide file tree

Showing 39 changed files with 551 additions and 2,459 deletions.
diff --git a/src/BaselineOfXPath/BaselineOfXPath.class.st b/src/BaselineOfXPath/BaselineOfXPath.class.st
@@ -11,61 +11,48 @@ Class {
 BaselineOfXPath >> baselineOf: spec [
 
 	<baseline>
-	spec
-		for: #common
-		do: [
-
-			self 
-				xmlParserOn: spec;	
-				xmlWriterOn: spec.
-
-			"Packages"
-			spec 
-				package: 'XPath-Core' with: [ spec requires: #('XMLParser') ];
-
-				package: 'XPath-Tests' with: [ spec requires: #('XMLParser Tests' 'XPath-Core') ].
-			spec
-				for: #'pharo8.x'
-				do: [ spec package: 'XPath-GTExtensions' 
-							with: [ spec requires: #('XMLWriter' 'XPath-Core') ]].
-
-			"Groups"
-			spec
-				group: 'Core' with: #('XPath-Core');
-				group: 'Tools' with: #('XMLParser Tools'); 
-				group: 'P8Tools' with: #('XMLParser Tools' 'XPath-GTExtensions' ); 
-				group: 'Tests' with: #('XPath-Tests');	
-				group: 'all' with: #('Core' 'Tools' 'Tests');
-				group: 'default' with: #('all')	
-	]
-]
+	spec for: #common do: [
+		self xmlParserOn: spec.
 
-{ #category : #baseline }
-BaselineOfXPath >> xmlParserOn: spec [
+		"Packages"
+		spec
+			package: 'XPath-Core' with: [ spec requires: #( 'XMLParser' ) ];
+			package: 'XPath-Tests'
+			with: [ spec requires: #( 'XMLParser Tests' 'XPath-Core' ) ];
+			package: 'XPath-Inspector'
+			with: [ spec requires: #( 'XMLParser Tools' 'XPath-Core' ) ].
 
-	spec
-		baseline: 'XMLParser'
-      with: [ 
+		"Core group"
+		spec group: 'Core' with: #( 'XPath-Core' ).
+
+		"Tools group"
+		spec group: 'Tools' with: #( 'XPath-Inspector' ).
+		spec for: #( #'pharo8.x' #'pharo7.x' #'pharo6.x' ) do: [
 			spec
-				loads: #('Core');
-				repository: 'github://pharo-contributions/XML-XMLParser:v3.6.0/src' ]. 
-
-	spec 
-		project: 'XMLParser Tests' copyFrom: 'XMLParser' with: [ spec loads: #('Tests') ]; 	
-		project: 'XMLParser Tools' copyFrom: 'XMLParser' with: [ spec loads: #('Tools') ] 
+				package: 'XPath-GTExtensions'
+				with: [ spec requires: #( 'XMLParser Tools' 'XPath-Core' ) ];
+				group: 'Tools' with: #( 'XPath-GTExtensions' ) ].
+
+		"Other groups"
+		spec
+			group: 'Tests' with: #( 'XPath-Tests' );
+			group: 'all' with: #( 'Tools' 'Tests' );
+			group: 'default' with: #( 'all' ) ]
 ]
 
 { #category : #baseline }
-BaselineOfXPath >> xmlWriterOn: spec [
+BaselineOfXPath >> xmlParserOn: spec [
+
+	spec baseline: 'XMLParser' with: [
+		spec
+			loads: #( 'Core' );
+			repository: 'github://pharo-contributions/XML-XMLParser:v3.6.1/src' ].
 
 	spec
-		baseline: 'XMLWriter'
-      with: [ 
-			spec
-				loads: #('Core');
-				repository: 'github://pharo-contributions/XML-XMLWriter:v3.1.0/src' ]. 
-
-	spec 
-		project: 'XMLWriter Tests' copyFrom: 'XMLWriter' with: [ spec loads: #('Tests') ]; 	
-		project: 'XMLWriter Tools' copyFrom: 'XMLWriter' with: [ spec loads: #('Tools') ] 
+		project: 'XMLParser Tests'
+		copyFrom: 'XMLParser'
+		with: [ spec loads: #( 'Tests' ) ];
+		project: 'XMLParser Tools'
+		copyFrom: 'XMLParser'
+		with: [ spec loads: #( 'Tools' ) ]
 ]