Mercurial > hg > uwproj / changeset

--- a/src/main/resources/make/configure.vm	Sat Jan 20 14:56:50 2024 +0100
+++ b/src/main/resources/make/configure.vm	Sat Jan 20 15:37:16 2024 +0100
@@ -224,6 +224,26 @@
     done
     return 0
 }
+istoolchain()
+{
+    for t in $TOOLCHAIN
+    do
+        if [ "$t" = "$1" ]; then
+            return 0
+        fi
+    done
+    return 1
+}
+notistoolchain()
+{
+    for t in $TOOLCHAIN
+    do
+        if [ "$t" = "$1" ]; then
+            return 1
+        fi
+    done
+    return 0
+}
 ]]#
 ## End of unparsed content **
 
@@ -252,6 +272,7 @@
 
 # toolchain detection utilities
 . make/toolchain.sh
+TOOLCHAIN="${D}{TOOLCHAIN_NAME}"
 
 #
 # DEPENDENCIES
@@ -303,8 +324,13 @@
             break
         fi
         #end
+        #if( $sub.toolchain )
+        if notistoolchain "${sub.toolchain}"; then
+            break
+        fi
+        #end
         #foreach( $np in $sub.notList )
-        if isplatform "${np}"; then
+        if isplatform "${np}" || istoolchain "${np}"; then
             break
         fi
         #end
@@ -380,8 +406,13 @@
         break
     fi
     #end
+    #if( $dependency.toolchain )
+    if notistoolchain "${dependency.toolchain}"; then
+        break
+    fi
+    #end
     #foreach( $np in $dependency.notList )
-    if isplatform "${np}"; then
+    if isplatform "${np}" || istoolchain "${np}"; then
         break
     fi
     #end

--- a/src/main/resources/make/uwproj.xsd	Sat Jan 20 14:56:50 2024 +0100
+++ b/src/main/resources/make/uwproj.xsd	Sat Jan 20 15:37:16 2024 +0100
@@ -102,9 +102,11 @@
                 </p>
                 <p>
                     The optional <code>platform</code> attribute may specify a <em>single</em> platform identifier and
-                    the optional <code>not</code> attribute may specify a comma-separated list of platform identifiers.
-                    The configure script shall skip this dependency declaration if the detected platform is not
-                    matching the filter specification of these attributes.
+                    the optional <code>toolchain</code> attribute may specify a <em>single</em> toolchain.
+                    The optional <code>not</code> attribute may specify a comma-separated list of platform and/or
+                    toolchain identifiers.
+                    The configure script shall skip this dependency declaration if the detected platform and toolchain
+                    is not matching the filter specification of these attributes.
                 </p>
             </xs:documentation>
         </xs:annotation>
@@ -125,6 +127,7 @@
         </xs:choice>
         <xs:attribute name="name" type="xs:string"/>
         <xs:attribute name="platform" type="xs:string"/>
+        <xs:attribute name="toolchain" type="xs:string"/>
         <xs:attribute name="not" type="xs:string"/>
     </xs:complexType>
 

--- a/test/make/configure.vm	Sat Jan 20 14:56:50 2024 +0100
+++ b/test/make/configure.vm	Sat Jan 20 15:37:16 2024 +0100
@@ -204,8 +204,6 @@
 PLATFORM_NAME=`echo "$PLATFORM" | cut -f1 -d' ' -`
 echo "$PLATFORM_NAME"
 
-TOOLCHAIN=
-
 isplatform()
 {
     for p in $PLATFORM
@@ -274,6 +272,7 @@
 
 # toolchain detection utilities
 . make/toolchain.sh
+TOOLCHAIN="${D}{TOOLCHAIN_NAME}"
 
 #
 # DEPENDENCIES
@@ -287,7 +286,6 @@
     lang_${lang}=1
 fi
 #end
-TOOLCHAIN=$TOOLCHAIN_NAME
 
 # create buffer for make variables required by dependencies
 echo > "$TEMP_DIR/make.mk"

--- a/test/make/uwproj.xsd	Sat Jan 20 14:56:50 2024 +0100
+++ b/test/make/uwproj.xsd	Sat Jan 20 15:37:16 2024 +0100
@@ -102,9 +102,11 @@
                 </p>
                 <p>
                     The optional <code>platform</code> attribute may specify a <em>single</em> platform identifier and
-                    the optional <code>not</code> attribute may specify a comma-separated list of platform identifiers.
-                    The configure script shall skip this dependency declaration if the detected platform is not
-                    matching the filter specification of these attributes.
+                    the optional <code>toolchain</code> attribute may specify a <em>single</em> toolchain.
+                    The optional <code>not</code> attribute may specify a comma-separated list of platform and/or
+                    toolchain identifiers.
+                    The configure script shall skip this dependency declaration if the detected platform and toolchain
+                    is not matching the filter specification of these attributes.
                 </p>
             </xs:documentation>
         </xs:annotation>
@@ -125,6 +127,7 @@
         </xs:choice>
         <xs:attribute name="name" type="xs:string"/>
         <xs:attribute name="platform" type="xs:string"/>
+        <xs:attribute name="toolchain" type="xs:string"/>
         <xs:attribute name="not" type="xs:string"/>
     </xs:complexType>