changeset
fixes several minor potential issues in configure script
Sat, 02 Sep 2023 19:07:25 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Sat, 02 Sep 2023 19:07:25 +0200
- changeset 34
- 4486849e6a6c
- parent 33
- b77d51b3c9bb
- child 35
- 57ea620a54ac
fixes several minor potential issues in configure script
| test/config.mk | file | annotate | diff | comparison | revisions | |
| test/configure | file | annotate | diff | comparison | revisions | |
| test/make/configure.vm | file | annotate | diff | comparison | revisions |
--- a/test/config.mk Sat Sep 02 18:39:09 2023 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -# -# config.mk generated by configure -# - -# general vars -HOST=m2.fritz.box -PREFIX=/Users/olaf/Projekte/uwproj/test/work -INSTALL_DIR=/Users/olaf/Projekte/uwproj/test/work - -EPREFIX=/Users/olaf/Projekte/uwproj/test/work - -BINDIR=/Users/olaf/Projekte/uwproj/test/work/bin -SBINDIR=/Users/olaf/Projekte/uwproj/test/work/sbin -LIBDIR=/Users/olaf/Projekte/uwproj/test/work/lib -LIBEXECDIR=/Users/olaf/Projekte/uwproj/test/work/libexec -DATADIR=/Users/olaf/Projekte/uwproj/test/work/share -SYSCONFDIR=/Users/olaf/Projekte/uwproj/test/work/etc -SHAREDSTATEDIR=/Users/olaf/Projekte/uwproj/test/work/com -LOCALSTATEDIR=/Users/olaf/Projekte/uwproj/test/work/var -INCLUDEDIR=/Users/olaf/Projekte/uwproj/test/work/include -INFODIR=/Users/olaf/Projekte/uwproj/test/work/info -MANDIR=/Users/olaf/Projekte/uwproj/test/work/man - -# toolchain -CC = clang -CXX = g++ -LD = clang - -include $(BUILD_ROOT)/make/clang.mk - - - -CFLAGS += -I/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include -LDFLAGS += -L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib -lxml2 -lz -lpthread -licucore -lm -lssl -lcrypto -
--- a/test/configure Sat Sep 02 18:39:09 2023 +0200 +++ b/test/configure Sat Sep 02 19:07:25 2023 +0200 @@ -22,21 +22,21 @@ OS_VERSION=`uname -r` TEMP_DIR=".tmp-`uname -n`" -mkdir -p $TEMP_DIR +mkdir -p "$TEMP_DIR" if [ $? -ne 0 ]; then - echo "Cannot create tmp dir" - echo "Abort" + echo "Cannot create tmp dir" + echo "Abort" fi -touch $TEMP_DIR/options -touch $TEMP_DIR/features +touch "$TEMP_DIR/options" +touch "$TEMP_DIR/features" # features # help text printhelp() { - echo "Usage: $0 [OPTIONS]..." - cat << __EOF__ + echo "Usage: $0 [OPTIONS]..." + cat << __EOF__ Installation directories: --prefix=PREFIX path prefix for architecture-independent files [/usr] @@ -63,64 +63,64 @@ } # -# parse arguments +# parse arguments # -for ARG in $@ +for ARG in "$@" do case "$ARG" in - "--prefix="*) PREFIX=${ARG#--prefix=} ;; - "--exec-prefix="*) EPREFIX=${ARG#--exec-prefix=} ;; - "--bindir="*) BINDIR=${ARG#----bindir=} ;; - "--sbindir="*) SBINDIR=${ARG#--sbindir=} ;; - "--libdir="*) LIBDIR=${ARG#--libdir=} ;; - "--libexecdir="*) LIBEXECDIR=${ARG#--libexecdir=} ;; - "--datadir="*) DATADIR=${ARG#--datadir=} ;; - "--sysconfdir="*) SYSCONFDIR=${ARG#--sysconfdir=} ;; - "--sharedstatedir="*) SHAREDSTATEDIR=${ARG#--sharedstatedir=} ;; - "--localstatedir="*) LOCALSTATEDIR=${ARG#--localstatedir=} ;; - "--includedir="*) INCLUDEDIR=${ARG#--includedir=} ;; - "--infodir="*) INFODIR=${ARG#--infodir=} ;; - "--mandir"*) MANDIR=${ARG#--mandir} ;; - "--help"*) printhelp; rm -Rf $TEMP_DIR; exit 1 ;; - "--enable-pg") FEATURE_PG=on ;; - "--disable-pg") unset FEATURE_PG ;; - "-"*) echo "unknown option: $ARG"; rm -Rf $TEMP_DIR; exit 1 ;; - esac + "--prefix="*) PREFIX=${ARG#--prefix=} ;; + "--exec-prefix="*) EPREFIX=${ARG#--exec-prefix=} ;; + "--bindir="*) BINDIR=${ARG#----bindir=} ;; + "--sbindir="*) SBINDIR=${ARG#--sbindir=} ;; + "--libdir="*) LIBDIR=${ARG#--libdir=} ;; + "--libexecdir="*) LIBEXECDIR=${ARG#--libexecdir=} ;; + "--datadir="*) DATADIR=${ARG#--datadir=} ;; + "--sysconfdir="*) SYSCONFDIR=${ARG#--sysconfdir=} ;; + "--sharedstatedir="*) SHAREDSTATEDIR=${ARG#--sharedstatedir=} ;; + "--localstatedir="*) LOCALSTATEDIR=${ARG#--localstatedir=} ;; + "--includedir="*) INCLUDEDIR=${ARG#--includedir=} ;; + "--infodir="*) INFODIR=${ARG#--infodir=} ;; + "--mandir"*) MANDIR=${ARG#--mandir} ;; + "--help"*) printhelp; rm -Rf "$TEMP_DIR"; exit 1 ;; + "--enable-pg") FEATURE_PG=on ;; + "--disable-pg") unset FEATURE_PG ;; + "-"*) echo "unknown option: $ARG"; rm -Rf "$TEMP_DIR"; exit 1 ;; + esac done # set dir variables if [ -z "$BINDIR" ]; then - BINDIR=$EPREFIX/bin + BINDIR=$EPREFIX/bin fi if [ -z "$SBINDIR" ]; then - SBINDIR=$EPREFIX/sbin + SBINDIR=$EPREFIX/sbin fi if [ -z "$LIBDIR" ]; then - LIBDIR=$EPREFIX/lib + LIBDIR=$EPREFIX/lib fi if [ -z "$LIBEXEC" ]; then - LIBEXECDIR=$EPREFIX/libexec + LIBEXECDIR=$EPREFIX/libexec fi if [ -z "$DATADIR" ]; then - DATADIR=$PREFIX/share + DATADIR=$PREFIX/share fi if [ -z "$SYSCONFDIR" ]; then - SYSCONFDIR=$PREFIX/etc + SYSCONFDIR=$PREFIX/etc fi if [ -z "$SHAREDSTATEDIR" ]; then - SHAREDSTATEDIR=$PREFIX/com + SHAREDSTATEDIR=$PREFIX/com fi if [ -z "$LOCALSTATEDIR" ]; then - LOCALSTATEDIR=$PREFIX/var + LOCALSTATEDIR=$PREFIX/var fi if [ -z "$INCLUDEDIR" ]; then - INCLUDEDIR=$PREFIX/include + INCLUDEDIR=$PREFIX/include fi if [ -z "$INFODIR" ]; then - INFODIR=$PREFIX/info + INFODIR=$PREFIX/info fi if [ -z "$MANDIR" ]; then - MANDIR=$PREFIX/man + MANDIR=$PREFIX/man fi which pkg-config > /dev/null @@ -133,19 +133,19 @@ # Simple uname based platform detection # $PLATFORM is used for platform dependent dependency selection printf "detect platform... " -if [ $OS = SunOS ]; then +if [ "$OS" = "SunOS" ]; then PLATFORM="solaris sunos unix svr4" fi -if [ $OS = Linux ]; then +if [ "$OS" = "Linux" ]; then PLATFORM="linux unix" fi -if [ $OS = FreeBSD ]; then +if [ "$OS" = "FreeBSD" ]; then PLATFORM="freebsd bsd unix" fi -if [ $OS = Darwin ]; then +if [ "$OS" = "Darwin" ]; then PLATFORM="macos osx bsd unix" fi -echo $OS | grep "MINGW" > /dev/null +echo "$OS" | grep -i "MINGW" > /dev/null if [ $? -eq 0 ]; then PLATFORM="windows mingw" fi @@ -156,8 +156,8 @@ for p in $PLATFORM do - PLATFORM_NAME=$p - break + PLATFORM_NAME=$p + break done echo $PLATFORM_NAME @@ -165,7 +165,7 @@ { for p in $PLATFORM do - if [ $p = $1 ]; then + if [ "$p" = "$1" ]; then return 0 fi done @@ -175,7 +175,7 @@ { for p in $PLATFORM do - if [ $p = $1 ]; then + if [ "$p" = "$1" ]; then return 1 fi done @@ -183,7 +183,7 @@ } # generate config.mk and config.h -cat > $TEMP_DIR/config.mk << __EOF__ +cat > "$TEMP_DIR/config.mk" << __EOF__ # # config.mk generated by configure # @@ -209,7 +209,7 @@ __EOF__ -echo > $TEMP_DIR/make.mk +echo > "$TEMP_DIR/make.mk" ENV_CFLAGS=$CFLAGS ENV_LDFLAGS=$LDFLAGS @@ -220,15 +220,15 @@ . make/toolchain.sh # add user specified flags to config.mk -echo >> $TEMP_DIR/config.mk -if [ ! -z "${ENV_CFLAGS}" ]; then - echo "CFLAGS += $ENV_CFLAGS" >> $TEMP_DIR/config.mk +echo >> "$TEMP_DIR/config.mk" +if [ -n "${ENV_CFLAGS}" ]; then + echo "CFLAGS += $ENV_CFLAGS" >> "$TEMP_DIR/config.mk" fi -if [ ! -z "${ENV_CXXFLAGS}" ]; then - echo "CXXFLAGS += $ENV_CXXFLAGS" >> $TEMP_DIR/config.mk +if [ -n "${ENV_CXXFLAGS}" ]; then + echo "CXXFLAGS += $ENV_CXXFLAGS" >> "$TEMP_DIR/config.mk" fi -if [ ! -z "${ENV_LDFLAGS}" ]; then - echo "LDFLAGS += $ENV_LDFLAGS" >> $TEMP_DIR/config.mk +if [ -n "${ENV_LDFLAGS}" ]; then + echo "LDFLAGS += $ENV_LDFLAGS" >> "$TEMP_DIR/config.mk" fi # @@ -242,20 +242,20 @@ while true do if [ -z "$PKG_CONFIG" ]; then - break + break fi - $PKG_CONFIG libpq + $PKG_CONFIG libpq if [ $? -ne 0 ] ; then break fi - CFLAGS="$CFLAGS `$PKG_CONFIG --cflags libpq`" - LDFLAGS="$LDFLAGS `$PKG_CONFIG --libs libpq`" - echo yes + TEMP_CFLAGS="$TEMP_CFLAGS `$PKG_CONFIG --cflags libpq`" + TEMP_LDFLAGS="$TEMP_LDFLAGS `$PKG_CONFIG --libs libpq`" + echo yes return 0 done - - echo no - return 1 + + echo no + return 1 } dependency_openssl() { @@ -264,31 +264,31 @@ while true do if [ -z "$PKG_CONFIG" ]; then - break + break fi - $PKG_CONFIG openssl + $PKG_CONFIG openssl if [ $? -ne 0 ] ; then break fi - CFLAGS="$CFLAGS `$PKG_CONFIG --cflags openssl`" - LDFLAGS="$LDFLAGS `$PKG_CONFIG --libs openssl`" - echo yes + TEMP_CFLAGS="$TEMP_CFLAGS `$PKG_CONFIG --cflags openssl`" + TEMP_LDFLAGS="$TEMP_LDFLAGS `$PKG_CONFIG --libs openssl`" + echo yes return 0 done - + # dependency openssl platform="bsd" while true do - if isnotplatform "bsd"; then + if isnotplatform "bsd"; then break fi - LDFLAGS="$LDFLAGS -lssl -lcrypto" - echo yes + TEMP_LDFLAGS="$TEMP_LDFLAGS -lssl -lcrypto" + echo yes return 0 done - - echo no - return 1 + + echo no + return 1 } dependency_libxml2() { @@ -296,72 +296,72 @@ # dependency libxml2 platform="macos" while true do - if isnotplatform "macos"; then + if isnotplatform "macos"; then break fi xml2-config --cflags > /dev/null if [ $? -eq 0 ]; then - CFLAGS="$CFLAGS `xml2-config --cflags`" + TEMP_CFLAGS="$TEMP_CFLAGS `xml2-config --cflags`" else break fi xml2-config --libs > /dev/null if [ $? -eq 0 ]; then - LDFLAGS="$LDFLAGS `xml2-config --libs`" + TEMP_LDFLAGS="$TEMP_LDFLAGS `xml2-config --libs`" else break fi - echo yes + echo yes return 0 done - + # dependency libxml2 while true do if [ -z "$PKG_CONFIG" ]; then - break + break fi - $PKG_CONFIG libxml-2.0 + $PKG_CONFIG libxml-2.0 if [ $? -ne 0 ] ; then break fi - CFLAGS="$CFLAGS `$PKG_CONFIG --cflags libxml-2.0`" - LDFLAGS="$LDFLAGS `$PKG_CONFIG --libs libxml-2.0`" - echo yes + TEMP_CFLAGS="$TEMP_CFLAGS `$PKG_CONFIG --cflags libxml-2.0`" + TEMP_LDFLAGS="$TEMP_LDFLAGS `$PKG_CONFIG --libs libxml-2.0`" + echo yes return 0 done - - echo no - return 1 + + echo no + return 1 } DEPENDENCIES_FAILED= ERROR=0 # general dependencies -CFLAGS= -LDFLAGS= +TEMP_CFLAGS= +TEMP_LDFLAGS= while true do while true do - - + + break done - + break done # add general dependency flags to config.mk -echo >> $TEMP_DIR/config.mk -if [ ! -z "${CFLAGS}" ]; then - echo "CFLAGS += $CFLAGS" >> $TEMP_DIR/config.mk +echo >> "$TEMP_DIR/config.mk" +if [ -n "${TEMP_CFLAGS}" ]; then + echo "CFLAGS += $TEMP_CFLAGS" >> $TEMP_DIR/config.mk fi -if [ ! -z "${CXXFLAGS}" ]; then - echo "CXXFLAGS += $CXXFLAGS" >> $TEMP_DIR/config.mk +if [ -n "${TEMP_CXXFLAGS}" ]; then + echo "CXXFLAGS += $TEMP_CXXFLAGS" >> $TEMP_DIR/config.mk fi -if [ ! -z "${LDFLAGS}" ]; then - echo "LDFLAGS += $LDFLAGS" >> $TEMP_DIR/config.mk +if [ -n "${TEMP_LDFLAGS}" ]; then + echo "LDFLAGS += $TEMP_LDFLAGS" >> $TEMP_DIR/config.mk fi # @@ -371,57 +371,57 @@ # # TARGETS # -CFLAGS= -CXXFLAGS= -LDFLAGS= +TEMP_CFLAGS= +TEMP_CXXFLAGS= +TEMP_LDFLAGS= # Target -CFLAGS= -LDFLAGS= -CXXFLAGS= +TEMP_CFLAGS= +TEMP_LDFLAGS= +TEMP_CXXFLAGS= dependency_libxml2 if [ $? -ne 0 ]; then - DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED libxml2 " - ERROR=1 + DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED libxml2 " + ERROR=1 fi dependency_openssl if [ $? -ne 0 ]; then - DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED openssl " - ERROR=1 + DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED openssl " + ERROR=1 fi # Features -if [ ! -z "$FEATURE_PG" ]; then - # check dependency - dependency_libpq - if [ $? -ne 0 ]; then - # "auto" features can fail and are just disabled in this case - if [ $FEATURE_PG != "auto" ]; then - DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED libpq " - ERROR=1 - fi - fi +if [ -n "$FEATURE_PG" ]; then + # check dependency + dependency_libpq + if [ $? -ne 0 ]; then + # "auto" features can fail and are just disabled in this case + if [ "$FEATURE_PG" != "auto" ]; then + DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED libpq " + ERROR=1 + fi + fi fi -echo >> $TEMP_DIR/config.mk -if [ ! -z "${CFLAGS}" ]; then - echo "CFLAGS += $CFLAGS" >> $TEMP_DIR/config.mk +echo >> "$TEMP_DIR/config.mk" +if [ -n "${TEMP_CFLAGS}" ]; then + echo "CFLAGS += $TEMP_CFLAGS" >> "$TEMP_DIR/config.mk" fi -if [ ! -z "${CXXFLAGS}" ]; then - echo "CXXFLAGS += $CXXFLAGS" >> $TEMP_DIR/config.mk +if [ -n "${TEMP_CXXFLAGS}" ]; then + echo "CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/config.mk" fi -if [ ! -z "${LDFLAGS}" ]; then - echo "LDFLAGS += $LDFLAGS" >> $TEMP_DIR/config.mk +if [ -n "${TEMP_LDFLAGS}" ]; then + echo "LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/config.mk" fi if [ $ERROR -ne 0 ]; then - echo - echo "Error: Unresolved dependencies" - echo $DEPENDENCIES_FAILED - rm -Rf $TEMP_DIR - exit 1 + echo + echo "Error: Unresolved dependencies" + echo "$DEPENDENCIES_FAILED" + rm -Rf "$TEMP_DIR" + exit 1 fi echo "configure finished" @@ -430,7 +430,7 @@ echo " PREFIX: $PREFIX" echo " TOOLCHAIN: $TOOLCHAIN_NAME" echo -cat $TEMP_DIR/config.mk $TEMP_DIR/make.mk > config.mk -rm -Rf $TEMP_DIR +cat "$TEMP_DIR/config.mk" "$TEMP_DIR/make.mk" > config.mk +rm -Rf "$TEMP_DIR"
--- a/test/make/configure.vm Sat Sep 02 18:39:09 2023 +0200 +++ b/test/make/configure.vm Sat Sep 02 19:07:25 2023 +0200 @@ -53,13 +53,13 @@ OS_VERSION=`uname -r` TEMP_DIR=".tmp-`uname -n`" -mkdir -p $TEMP_DIR +mkdir -p "$TEMP_DIR" if [ $? -ne 0 ]; then echo "Cannot create tmp dir" echo "Abort" fi -touch $TEMP_DIR/options -touch $TEMP_DIR/features +touch "$TEMP_DIR/options" +touch "$TEMP_DIR/features" # features #foreach( $feature in $features ) @@ -114,10 +114,10 @@ } # -# parse arguments +# parse arguments # #set( $D = '$' ) -for ARG in $@ +for ARG in "$@" do case "$ARG" in "--prefix="*) PREFIX=${D}{ARG#--prefix=} ;; @@ -133,7 +133,7 @@ "--includedir="*) INCLUDEDIR=${D}{ARG#--includedir=} ;; "--infodir="*) INFODIR=${D}{ARG#--infodir=} ;; "--mandir"*) MANDIR=${D}{ARG#--mandir} ;; - "--help"*) printhelp; rm -Rf $TEMP_DIR; exit 1 ;; + "--help"*) printhelp; rm -Rf "$TEMP_DIR"; exit 1 ;; #foreach( $opt in $options ) "--${opt.getArgument()}="*) ${opt.getVarName()}=${D}{ARG#--${opt.getArgument()}=} ;; #end @@ -141,7 +141,7 @@ "--enable-${feature.arg}") ${feature.getVarName()}=on ;; "--disable-${feature.arg}") unset ${feature.getVarName()} ;; #end - "-"*) echo "unknown option: $ARG"; rm -Rf $TEMP_DIR; exit 1 ;; + "-"*) echo "unknown option: $ARG"; rm -Rf "$TEMP_DIR"; exit 1 ;; esac done @@ -190,19 +190,19 @@ # Simple uname based platform detection # $PLATFORM is used for platform dependent dependency selection printf "detect platform... " -if [ $OS = SunOS ]; then +if [ "$OS" = "SunOS" ]; then PLATFORM="solaris sunos unix svr4" fi -if [ $OS = Linux ]; then +if [ "$OS" = "Linux" ]; then PLATFORM="linux unix" fi -if [ $OS = FreeBSD ]; then +if [ "$OS" = "FreeBSD" ]; then PLATFORM="freebsd bsd unix" fi -if [ $OS = Darwin ]; then +if [ "$OS" = "Darwin" ]; then PLATFORM="macos osx bsd unix" fi -echo $OS | grep "MINGW" > /dev/null +echo "$OS" | grep -i "MINGW" > /dev/null if [ $? -eq 0 ]; then PLATFORM="windows mingw" fi @@ -222,7 +222,7 @@ { for p in $PLATFORM do - if [ $p = $1 ]; then + if [ "$p" = "$1" ]; then return 0 fi done @@ -232,7 +232,7 @@ { for p in $PLATFORM do - if [ $p = $1 ]; then + if [ "$p" = "$1" ]; then return 1 fi done @@ -240,7 +240,7 @@ } # generate config.mk and config.h -cat > $TEMP_DIR/config.mk << __EOF__ +cat > "$TEMP_DIR/config.mk" << __EOF__ # # config.mk generated by configure # @@ -293,7 +293,7 @@ __EOF__ -echo > $TEMP_DIR/make.mk +echo > "$TEMP_DIR/make.mk" ENV_CFLAGS=$CFLAGS ENV_LDFLAGS=$LDFLAGS @@ -304,15 +304,15 @@ . make/toolchain.sh # add user specified flags to config.mk -echo >> $TEMP_DIR/config.mk -if [ ! -z "${ENV_CFLAGS}" ]; then - echo "CFLAGS += $ENV_CFLAGS" >> $TEMP_DIR/config.mk +echo >> "$TEMP_DIR/config.mk" +if [ -n "${ENV_CFLAGS}" ]; then + echo "CFLAGS += $ENV_CFLAGS" >> "$TEMP_DIR/config.mk" fi -if [ ! -z "${ENV_CXXFLAGS}" ]; then - echo "CXXFLAGS += $ENV_CXXFLAGS" >> $TEMP_DIR/config.mk +if [ -n "${ENV_CXXFLAGS}" ]; then + echo "CXXFLAGS += $ENV_CXXFLAGS" >> "$TEMP_DIR/config.mk" fi -if [ ! -z "${ENV_LDFLAGS}" ]; then - echo "LDFLAGS += $ENV_LDFLAGS" >> $TEMP_DIR/config.mk +if [ -n "${ENV_LDFLAGS}" ]; then + echo "LDFLAGS += $ENV_LDFLAGS" >> "$TEMP_DIR/config.mk" fi # @@ -343,7 +343,7 @@ fi #end #foreach( $test in $sub.tests ) - $test > /dev/null + $test > /dev/null if [ $? -ne 0 ]; then break fi @@ -365,19 +365,19 @@ break fi #else - TEMP_$flags.varName="$TEMP_$flags.varName $flags.value" + TEMP_$flags.varName="$TEMP_$flags.varName $flags.value" #end #end #if ( $sub.make.length() > 0 ) cat >> $TEMP_DIR/make.mk << __EOF__ -# Dependency: $dependency.name +# Dependency: $dependency.name $sub.make __EOF__ #end echo yes return 0 done - + #end echo no return 1 @@ -423,7 +423,7 @@ TEMP_CFLAGS="$TEMP_CFLAGS `$PKG_CONFIG --cflags $pkg.getPkgConfigParam()`" TEMP_LDFLAGS="$TEMP_LDFLAGS `$PKG_CONFIG --libs $pkg.getPkgConfigParam()`" #end - + #foreach( $flags in $dependency.flags ) #if( $flags.exec ) $flags.value > /dev/null @@ -434,31 +434,31 @@ break fi #else - TEMP_$flags.varName="$TEMP_$flags.varName $flags.value" + TEMP_$flags.varName="$TEMP_$flags.varName $flags.value" #end #end #if ( $dependency.make.length() > 0 ) - cat >> $TEMP_DIR/make.mk << __EOF__ + cat >> "$TEMP_DIR/make.mk" << __EOF__ $dependency.make __EOF__ #end - + break done - + break done #end # add general dependency flags to config.mk -echo >> $TEMP_DIR/config.mk -if [ ! -z "${TEMP_CFLAGS}" ]; then +echo >> "$TEMP_DIR/config.mk" +if [ -n "${TEMP_CFLAGS}" ]; then echo "CFLAGS += $TEMP_CFLAGS" >> $TEMP_DIR/config.mk fi -if [ ! -z "${TEMP_CXXFLAGS}" ]; then +if [ -n "${TEMP_CXXFLAGS}" ]; then echo "CXXFLAGS += $TEMP_CXXFLAGS" >> $TEMP_DIR/config.mk fi -if [ ! -z "${TEMP_LDFLAGS}" ]; then +if [ -n "${TEMP_LDFLAGS}" ]; then echo "LDFLAGS += $TEMP_LDFLAGS" >> $TEMP_DIR/config.mk fi #end @@ -484,7 +484,7 @@ TEMP_CFLAGS="$TEMP_CFLAGS ${def.toFlags()}" #end #if( $val.hasMake() ) - cat >> $TEMP_DIR/make.mk << __EOF__ + cat >> "$TEMP_DIR/make.mk" << __EOF__ $val.make __EOF__ #end @@ -520,13 +520,13 @@ # Features #foreach( $feature in $target.features ) -if [ ! -z "$${feature.getVarName()}" ]; then +if [ -n "$${feature.getVarName()}" ]; then #foreach( $dependency in $feature.dependencies ) # check dependency dependency_$dependency if [ $? -ne 0 ]; then # "auto" features can fail and are just disabled in this case - if [ $${feature.getVarName()} != "auto" ]; then + if [ "$${feature.getVarName()}" != "auto" ]; then DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED ${dependency} " ERROR=1 fi @@ -538,8 +538,8 @@ #foreach( $opt in $target.options ) # Option: --${opt.argument} if [ -z ${D}${opt.getVarName()} ]; then - SAVED_ERROR=$ERROR - SAVED_DEPENDENCIES_FAILED=$DEPENDENCIES_FAILED + SAVED_ERROR="$ERROR" + SAVED_DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED" ERROR=0 while true do @@ -549,7 +549,7 @@ #end $optdef.func if [ $? -eq 0 ]; then - echo " ${opt.argument}: ${optdef.valueName}" >> $TEMP_DIR/options + echo " ${opt.argument}: ${optdef.valueName}" >> "$TEMP_DIR/options" ERROR=0 break fi @@ -562,13 +562,13 @@ if [ $ERROR -ne 0 ]; then SAVED_ERROR=1 fi - ERROR=$SAVED_ERROR - DEPENDENCIES_FAILED=$SAVED_DEPENDENCIES_FAILED= + ERROR="$SAVED_ERROR" + DEPENDENCIES_FAILED="$SAVED_DEPENDENCIES_FAILED" else if false; then false #foreach( $optval in $opt.values ) - elif [ ${D}${opt.getVarName()} = "${optval.value}" ]; then + elif [ "${D}${opt.getVarName()}" = "${optval.value}" ]; then echo " ${opt.argument}: ${D}${opt.getVarName()}" >> $TEMP_DIR/options $optval.func if [ $? -ne 0 ]; then @@ -579,23 +579,23 @@ fi #end -echo >> $TEMP_DIR/config.mk -if [ ! -z "${TEMP_CFLAGS}" ]; then - echo "${target.getCFlags()} += $TEMP_CFLAGS" >> $TEMP_DIR/config.mk +echo >> "$TEMP_DIR/config.mk" +if [ -n "${TEMP_CFLAGS}" ]; then + echo "${target.getCFlags()} += $TEMP_CFLAGS" >> "$TEMP_DIR/config.mk" fi -if [ ! -z "${TEMP_CXXFLAGS}" ]; then - echo "${target.getCXXFlags()} += $TEMP_CXXFLAGS" >> $TEMP_DIR/config.mk +if [ -n "${TEMP_CXXFLAGS}" ]; then + echo "${target.getCXXFlags()} += $TEMP_CXXFLAGS" >> "$TEMP_DIR/config.mk" fi -if [ ! -z "${TEMP_LDFLAGS}" ]; then - echo "${target.getLDFlags()} += $TEMP_LDFLAGS" >> $TEMP_DIR/config.mk +if [ -n "${TEMP_LDFLAGS}" ]; then + echo "${target.getLDFlags()} += $TEMP_LDFLAGS" >> "$TEMP_DIR/config.mk" fi #end if [ $ERROR -ne 0 ]; then echo echo "Error: Unresolved dependencies" - echo $DEPENDENCIES_FAILED - rm -Rf $TEMP_DIR + echo "$DEPENDENCIES_FAILED" + rm -Rf "$TEMP_DIR" exit 1 fi @@ -606,10 +606,10 @@ echo " TOOLCHAIN: $TOOLCHAIN_NAME" #if ( $options.size() > 0 ) echo "Options:" -cat $TEMP_DIR/options +cat "$TEMP_DIR/options" #end echo -cat $TEMP_DIR/config.mk $TEMP_DIR/make.mk > config.mk -rm -Rf $TEMP_DIR +cat "$TEMP_DIR/config.mk" "$TEMP_DIR/make.mk" > config.mk +rm -Rf "$TEMP_DIR"
