Mercurial > hg > uwproj / changeset

changeset

fixes a regression for issue #765 default tip

Wed, 24 Dec 2025 14:25:24 +0100

author
Mike Becker <universe@uap-core.de>
date
Wed, 24 Dec 2025 14:25:24 +0100
changeset 179
ba9431028671
parent 178
c52a13d1e989

fixes a regression for issue #765

src/main/resources/make/configure.vm file | annotate | diff | comparison | revisions
test/configure file | annotate | diff | comparison | revisions
test/configure2 file | annotate | diff | comparison | revisions
test/make/configure.vm file | annotate | diff | comparison | revisions 
--- a/src/main/resources/make/configure.vm	Wed Dec 24 13:53:03 2025 +0100
+++ b/src/main/resources/make/configure.vm	Wed Dec 24 14:25:24 2025 +0100
@@ -86,7 +86,7 @@
 printhelp()
 {
     echo "Usage: $0 [OPTIONS]..."
-    if [ $has_config_vars__ -eq 1 ] ; then
+    if [ $has_overridable_config_vars__ -eq 1 ] ; then
         echo
         echo "Configuration:"
     fi
@@ -150,7 +150,7 @@
 touch "$TEMP_DIR/features"
 
 # config variables
-has_config_vars__=0
+has_overridable_config_vars__=0
 #foreach( $cfg in $config )
 if true \
 #if( $cfg.platform )
@@ -163,7 +163,9 @@
     :
     #foreach( $var in $cfg.vars )
     if [ -z "${D}${var.varName}__initialized__" ] ; then
-        has_config_vars__=1
+        #if( $var.overridable )
+        has_overridable_config_vars__=1
+        #end
         ${var.varName}__initialized__=1
         #if( $var.exec )
         ${var.varName}=`${var.value}`
@@ -309,15 +311,11 @@
 ## End of unparsed content **
 
 # generate vars.mk
-if [ ${D}has_config_vars__ -eq 1 ]; then
-    echo '# configuration' > "$TEMP_DIR/vars.mk"
-    #foreach( $var in $vars )
-    echo "${var.varName}=${D}${var.varName}" >> "$TEMP_DIR/vars.mk"
-    #end
-    echo >> "$TEMP_DIR/vars.mk"
-else
-    echo > "$TEMP_DIR/vars.mk"
-fi
+echo '# configuration' > "$TEMP_DIR/vars.mk"
+#foreach( $var in $vars )
+echo "${var.varName}=${D}${var.varName}" >> "$TEMP_DIR/vars.mk"
+#end
+echo >> "$TEMP_DIR/vars.mk"
 
 #
 # DEPENDENCIES
@@ -720,7 +718,7 @@
 if [ -n "$TOOLCHAIN_CSTD" ]; then
     echo "  default C std:  $TOOLCHAIN_CSTD"
 fi
-if [ ${D}has_config_vars__ -eq 1 ]; then
+if [ ${D}has_overridable_config_vars__ -eq 1 ]; then
     echo
     echo "Config:"
 #foreach( $var in $vars )
--- a/test/configure	Wed Dec 24 13:53:03 2025 +0100
+++ b/test/configure	Wed Dec 24 14:25:24 2025 +0100
@@ -85,7 +85,7 @@
 printhelp()
 {
     echo "Usage: $0 [OPTIONS]..."
-    if [ $has_config_vars__ -eq 1 ] ; then
+    if [ $has_overridable_config_vars__ -eq 1 ] ; then
         echo
         echo "Configuration:"
     fi
@@ -148,27 +148,26 @@
 touch "$TEMP_DIR/features"
 
 # config variables
-has_config_vars__=0
+has_overridable_config_vars__=0
 if true \
       ; then
     :
     if [ -z "$prefix__initialized__" ] ; then
-        has_config_vars__=1
+        has_overridable_config_vars__=1
         prefix__initialized__=1
         prefix='/usr'
     fi
     if [ -z "$exec_prefix__initialized__" ] ; then
-        has_config_vars__=1
+        has_overridable_config_vars__=1
         exec_prefix__initialized__=1
         exec_prefix=''
     fi
     if [ -z "$libdir__initialized__" ] ; then
-        has_config_vars__=1
+        has_overridable_config_vars__=1
         libdir__initialized__=1
         libdir=''
     fi
     if [ -z "$HOST__initialized__" ] ; then
-        has_config_vars__=1
         HOST__initialized__=1
         HOST=`uname -n`
     fi
@@ -178,7 +177,6 @@
       ; then
     :
     if [ -z "$PWD__initialized__" ] ; then
-        has_config_vars__=1
         PWD__initialized__=1
         PWD='pwd'
     fi
@@ -188,7 +186,6 @@
       ; then
     :
     if [ -z "$PWD__initialized__" ] ; then
-        has_config_vars__=1
         PWD__initialized__=1
         PWD='pwd -W'
     fi
@@ -315,17 +312,13 @@
 
 
 # generate vars.mk
-if [ $has_config_vars__ -eq 1 ]; then
-    echo '# configuration' > "$TEMP_DIR/vars.mk"
-    echo "prefix=$prefix" >> "$TEMP_DIR/vars.mk"
-    echo "exec_prefix=$exec_prefix" >> "$TEMP_DIR/vars.mk"
-    echo "libdir=$libdir" >> "$TEMP_DIR/vars.mk"
-    echo "HOST=$HOST" >> "$TEMP_DIR/vars.mk"
-    echo "PWD=$PWD" >> "$TEMP_DIR/vars.mk"
-    echo >> "$TEMP_DIR/vars.mk"
-else
-    echo > "$TEMP_DIR/vars.mk"
-fi
+echo '# configuration' > "$TEMP_DIR/vars.mk"
+echo "prefix=$prefix" >> "$TEMP_DIR/vars.mk"
+echo "exec_prefix=$exec_prefix" >> "$TEMP_DIR/vars.mk"
+echo "libdir=$libdir" >> "$TEMP_DIR/vars.mk"
+echo "HOST=$HOST" >> "$TEMP_DIR/vars.mk"
+echo "PWD=$PWD" >> "$TEMP_DIR/vars.mk"
+echo >> "$TEMP_DIR/vars.mk"
 
 #
 # DEPENDENCIES
@@ -695,7 +688,7 @@
 if [ -n "$TOOLCHAIN_CSTD" ]; then
     echo "  default C std:  $TOOLCHAIN_CSTD"
 fi
-if [ $has_config_vars__ -eq 1 ]; then
+if [ $has_overridable_config_vars__ -eq 1 ]; then
     echo
     echo "Config:"
     if [ -n "$prefix__initialized__" ]; then
--- a/test/configure2	Wed Dec 24 13:53:03 2025 +0100
+++ b/test/configure2	Wed Dec 24 14:25:24 2025 +0100
@@ -85,7 +85,7 @@
 printhelp()
 {
     echo "Usage: $0 [OPTIONS]..."
-    if [ $has_config_vars__ -eq 1 ] ; then
+    if [ $has_overridable_config_vars__ -eq 1 ] ; then
         echo
         echo "Configuration:"
     fi
@@ -179,52 +179,51 @@
 touch "$TEMP_DIR/features"
 
 # config variables
-has_config_vars__=0
+has_overridable_config_vars__=0
 if true \
       ; then
     :
     if [ -z "$prefix__initialized__" ] ; then
-        has_config_vars__=1
+        has_overridable_config_vars__=1
         prefix__initialized__=1
         prefix='`pwd`/work'
     fi
     if [ -z "$exec_prefix__initialized__" ] ; then
-        has_config_vars__=1
+        has_overridable_config_vars__=1
         exec_prefix__initialized__=1
         exec_prefix=''
     fi
     if [ -z "$libdir__initialized__" ] ; then
-        has_config_vars__=1
+        has_overridable_config_vars__=1
         libdir__initialized__=1
         libdir=''
     fi
     if [ -z "$datarootdir__initialized__" ] ; then
-        has_config_vars__=1
+        has_overridable_config_vars__=1
         datarootdir__initialized__=1
         datarootdir=''
     fi
     if [ -z "$datadir__initialized__" ] ; then
-        has_config_vars__=1
+        has_overridable_config_vars__=1
         datadir__initialized__=1
         datadir=''
     fi
     if [ -z "$localstatedir__initialized__" ] ; then
-        has_config_vars__=1
+        has_overridable_config_vars__=1
         localstatedir__initialized__=1
         localstatedir='/var'
     fi
     if [ -z "$libdatadir__initialized__" ] ; then
-        has_config_vars__=1
+        has_overridable_config_vars__=1
         libdatadir__initialized__=1
         libdatadir='$prefix/libdata'
     fi
     if [ -z "$SRCDIR__initialized__" ] ; then
-        has_config_vars__=1
         SRCDIR__initialized__=1
         SRCDIR=`pwd`
     fi
     if [ -z "$TOOLKIT_HOME__initialized__" ] ; then
-        has_config_vars__=1
+        has_overridable_config_vars__=1
         TOOLKIT_HOME__initialized__=1
         TOOLKIT_HOME='/usr'
     fi
@@ -357,21 +356,17 @@
 
 
 # generate vars.mk
-if [ $has_config_vars__ -eq 1 ]; then
-    echo '# configuration' > "$TEMP_DIR/vars.mk"
-    echo "prefix=$prefix" >> "$TEMP_DIR/vars.mk"
-    echo "exec_prefix=$exec_prefix" >> "$TEMP_DIR/vars.mk"
-    echo "libdir=$libdir" >> "$TEMP_DIR/vars.mk"
-    echo "datarootdir=$datarootdir" >> "$TEMP_DIR/vars.mk"
-    echo "datadir=$datadir" >> "$TEMP_DIR/vars.mk"
-    echo "localstatedir=$localstatedir" >> "$TEMP_DIR/vars.mk"
-    echo "libdatadir=$libdatadir" >> "$TEMP_DIR/vars.mk"
-    echo "SRCDIR=$SRCDIR" >> "$TEMP_DIR/vars.mk"
-    echo "TOOLKIT_HOME=$TOOLKIT_HOME" >> "$TEMP_DIR/vars.mk"
-    echo >> "$TEMP_DIR/vars.mk"
-else
-    echo > "$TEMP_DIR/vars.mk"
-fi
+echo '# configuration' > "$TEMP_DIR/vars.mk"
+echo "prefix=$prefix" >> "$TEMP_DIR/vars.mk"
+echo "exec_prefix=$exec_prefix" >> "$TEMP_DIR/vars.mk"
+echo "libdir=$libdir" >> "$TEMP_DIR/vars.mk"
+echo "datarootdir=$datarootdir" >> "$TEMP_DIR/vars.mk"
+echo "datadir=$datadir" >> "$TEMP_DIR/vars.mk"
+echo "localstatedir=$localstatedir" >> "$TEMP_DIR/vars.mk"
+echo "libdatadir=$libdatadir" >> "$TEMP_DIR/vars.mk"
+echo "SRCDIR=$SRCDIR" >> "$TEMP_DIR/vars.mk"
+echo "TOOLKIT_HOME=$TOOLKIT_HOME" >> "$TEMP_DIR/vars.mk"
+echo >> "$TEMP_DIR/vars.mk"
 
 #
 # DEPENDENCIES
@@ -941,7 +936,7 @@
 if [ -n "$TOOLCHAIN_CSTD" ]; then
     echo "  default C std:  $TOOLCHAIN_CSTD"
 fi
-if [ $has_config_vars__ -eq 1 ]; then
+if [ $has_overridable_config_vars__ -eq 1 ]; then
     echo
     echo "Config:"
     if [ -n "$prefix__initialized__" ]; then
--- a/test/make/configure.vm	Wed Dec 24 13:53:03 2025 +0100
+++ b/test/make/configure.vm	Wed Dec 24 14:25:24 2025 +0100
@@ -86,7 +86,7 @@
 printhelp()
 {
     echo "Usage: $0 [OPTIONS]..."
-    if [ $has_config_vars__ -eq 1 ] ; then
+    if [ $has_overridable_config_vars__ -eq 1 ] ; then
         echo
         echo "Configuration:"
     fi
@@ -150,7 +150,7 @@
 touch "$TEMP_DIR/features"
 
 # config variables
-has_config_vars__=0
+has_overridable_config_vars__=0
 #foreach( $cfg in $config )
 if true \
 #if( $cfg.platform )
@@ -163,7 +163,9 @@
     :
     #foreach( $var in $cfg.vars )
     if [ -z "${D}${var.varName}__initialized__" ] ; then
-        has_config_vars__=1
+        #if( $var.overridable )
+        has_overridable_config_vars__=1
+        #end
         ${var.varName}__initialized__=1
         #if( $var.exec )
         ${var.varName}=`${var.value}`
@@ -309,15 +311,11 @@
 ## End of unparsed content **
 
 # generate vars.mk
-if [ ${D}has_config_vars__ -eq 1 ]; then
-    echo '# configuration' > "$TEMP_DIR/vars.mk"
-    #foreach( $var in $vars )
-    echo "${var.varName}=${D}${var.varName}" >> "$TEMP_DIR/vars.mk"
-    #end
-    echo >> "$TEMP_DIR/vars.mk"
-else
-    echo > "$TEMP_DIR/vars.mk"
-fi
+echo '# configuration' > "$TEMP_DIR/vars.mk"
+#foreach( $var in $vars )
+echo "${var.varName}=${D}${var.varName}" >> "$TEMP_DIR/vars.mk"
+#end
+echo >> "$TEMP_DIR/vars.mk"
 
 #
 # DEPENDENCIES
@@ -720,7 +718,7 @@
 if [ -n "$TOOLCHAIN_CSTD" ]; then
     echo "  default C std:  $TOOLCHAIN_CSTD"
 fi
-if [ ${D}has_config_vars__ -eq 1 ]; then
+if [ ${D}has_overridable_config_vars__ -eq 1 ]; then
     echo
     echo "Config:"
 #foreach( $var in $vars )

Mercurial Repository: uwproj

mercurial