--- a/make/configure.vm Mon Feb 04 17:49:50 2019 +0100
+++ b/make/configure.vm Sat Nov 14 20:58:20 2020 +0100
@@ -1,19 +1,53 @@
#!/bin/sh
-PREFIX=/usr
-EPREFIX=$PREFIX
+#foreach( $var in $vars )
+#if( $var.exec )
+${var.name}=`${var.value}`
+#else
+${var.name}=${var.value}
+#end
+#end
+#if ( ! $project.hasVar("PREFIX") )
+PREFIX=/usr
+#end
+#if ( ! $project.hasVar("EPREFIX") )
+EPREFIX=$PREFIX
+#end
+
+#if ( ! $project.hasVar("BINDIR") )
BINDIR=
+#end
+#if ( ! $project.hasVar("SBINDIR") )
SBINDIR=
+#end
+#if ( ! $project.hasVar("LIBDIR") )
LIBDIR=
+#end
+#if ( ! $project.hasVar("LIBEXECDIR") )
LIBEXECDIR=
+#end
+#if ( ! $project.hasVar("DATADIR") )
DATADIR=
+#end
+#if ( ! $project.hasVar("SYSCONFDIR") )
SYSCONFDIR=
+#end
+#if ( ! $project.hasVar("SHAREDSTATEDIR") )
SHAREDSTATEDIR=
+#end
+#if ( ! $project.hasVar("LOCALSTATEDIR") )
LOCALSTATEDIR=
+#end
+#if ( ! $project.hasVar("INCLUDEDIR") )
INCLUDEDIR=
+#end
+#if ( ! $project.hasVar("INFODIR") )
INFODIR=
+#end
+#if ( ! $project.hasVar("MANDIR") )
MANDIR=
+#end
OS=`uname -s`
OS_VERSION=`uname -r`
@@ -85,85 +119,69 @@
#set( $D = '$' )
for ARG in $@
do
- if [[ $ARG == --prefix=* ]]; then
- PREFIX=${D}{ARG:9}
- elif [[ $ARG = --exec-prefix=* ]]; then
- EPREFIX=${D}{ARG:14}
- elif [[ $ARG = --bindir=* ]]; then
- BINDIR=${D}{ARG:9}
- elif [[ $ARG = --sbindir=* ]]; then
- SBINDIR=${D}{ARG:10}
- elif [[ $ARG = --libdir=* ]]; then
- LIBDIR=${D}{ARG:9}
- elif [[ $ARG = --libexecdir=* ]]; then
- LIBEXECDIR=${D}{ARG:13}
- elif [[ $ARG = --datadir=* ]]; then
- DATADIR=${D}{ARG:10}
- elif [[ $ARG = --sysconfdir=* ]]; then
- SYSCONFDIR=${D}{ARG:13}
- elif [[ $ARG = --sharedstatedir=* ]]; then
- SHAREDSTATEDIR=${D}{ARG:17}
- elif [[ $ARG = --localstatedir=* ]]; then
- LOCALSTATEDIR=${D}{ARG:16}
- elif [[ $ARG = --includedir=* ]]; then
- INCLUDEDIR=${D}{ARG:12}
- elif [[ $ARG = --infodir=* ]]; then
- INFODIR=${D}{ARG:10}
- elif [[ $ARG = --mandir=* ]]; then
- MANDIR=${D}{ARG:9}
- elif [ $ARG = "--help" ]; then
- printhelp
- exit 0
- #foreach( $opt in $options )
- elif [[ $ARG == --${opt.getArgument()}=* ]]; then
- ${opt.getVarName()}=${opt.getArgValue()}
+ case "$ARG" in
+ "--prefix="*) PREFIX=${D}{ARG#--prefix=} ;;
+ "--exec-prefix="*) EPREFIX=${D}{ARG#--exec-prefix=} ;;
+ "--bindir="*) BINDIR=${D}{ARG#----bindir=} ;;
+ "--sbindir="*) SBINDIR=${D}{ARG#--sbindir=} ;;
+ "--libdir="*) LIBDIR=${D}{ARG#--libdir=} ;;
+ "--libexecdir="*) LIBEXECDIR=${D}{ARG#--libexecdir=} ;;
+ "--datadir="*) DATADIR=${D}{ARG#--datadir=} ;;
+ "--sysconfdir="*) SYSCONFDIR=${D}{ARG#--sysconfdir=} ;;
+ "--sharedstatedir="*) SHAREDSTATEDIR=${D}{ARG#--sharedstatedir=} ;;
+ "--localstatedir="*) LOCALSTATEDIR=${D}{ARG#--localstatedir=} ;;
+ "--includedir="*) INCLUDEDIR=${D}{ARG#--includedir=} ;;
+ "--infodir="*) INFODIR=${D}{ARG#--infodir=} ;;
+ "--mandir"*) MANDIR=${D}{ARG#--mandir} ;;
+ "--help"*) printhelp; exit 1 ;;
+ #foreach( $opt in $options )
+ "--${opt.getArgument()}="*) ${opt.getVarName()}={ARG#${opt.getArgument()}=} ;;
#end
- #foreach( $feature in $features )
- elif [[ $ARG == --enable-${feature.arg} ]]; then
- ${feature.getVarName()}=on
- elif [[ $ARG == --disable-${feature.arg} ]]; then
- unset ${feature.getVarName()}
- #end
- fi
+ #foreach( $feature in $features )
+ "--enable-${feature.arg}") ${feature.getVarName()}=on ;;
+ "--disable-${feature.arg}") unset ${feature.getVarName()} ;;
+ #end
+ "-"*) echo "unknown option: $ARG"; exit 1 ;;
+ esac
done
# set dir variables
-if [ -z $BINDIR ]; then
+if [ -z "$BINDIR" ]; then
BINDIR=$EPREFIX/bin
fi
-if [ -z $SBINDIR ]; then
+if [ -z "$SBINDIR" ]; then
SBINDIR=$EPREFIX/sbin
fi
-if [ -z $LIBDIR ]; then
- LIBDIRDIR=$EPREFIX/lib
+if [ -z "$LIBDIR" ]; then
+ LIBDIR=$EPREFIX/lib
fi
-if [ -z $LIBEXEC ]; then
- LIBExECDIR=$EPREFIX/libexec
+if [ -z "$LIBEXEC" ]; then
+ LIBEXECDIR=$EPREFIX/libexec
fi
-if [ -z $DATADIR ]; then
+if [ -z "$DATADIR" ]; then
DATADIR=$PREFIX/share
fi
-if [ -z $SYSCONFDIR]; then
+if [ -z "$SYSCONFDIR" ]; then
SYSCONFDIR=$PREFIX/etc
fi
-if [ -z $SHAREDSTATEDIR ]; then
+if [ -z "$SHAREDSTATEDIR" ]; then
SHAREDSTATEDIR=$PREFIX/com
fi
-if [ -z $LOCALSTATEDIR ]; then
+if [ -z "$LOCALSTATEDIR" ]; then
LOCALSTATEDIR=$PREFIX/var
fi
-if [ -z $INCLUDEDIR ]; then
+if [ -z "$INCLUDEDIR" ]; then
INCLUDEDIR=$PREFIX/include
fi
-if [ -z $INFODIR ]; then
+if [ -z "$INFODIR" ]; then
INFODIR=$PREFIX/info
fi
-if [ -z $MANDIR ]; then
+if [ -z "$MANDIR" ]; then
MANDIR=$PREFIX/man
fi
which pkg-config > /dev/null
-if [ $? -ne 0 ]; then
+if [ $? -eq 0 ]; then
PKG_CONFIG=pkg-config
else
PKG_CONFIG=false
@@ -210,12 +228,69 @@
done
return 1
}
+isnotplatform()
+{
+ for p in $PLATFORM
+ do
+ if [ $p = $1 ]; then
+ return 1
+ fi
+ done
+ return 0
+}
# generate config.mk and config.h
cat > $TEMP_DIR/config.mk << __EOF__
#
# config.mk generated by configure
#
+
+# general vars
+#foreach( $var in $vars )
+${var.name}=$${var.name}
+#end
+
+#if ( ! $project.hasVar("PREFIX") )
+PREFIX=$PREFIX
+#end
+#if ( ! $project.hasVar("EPREFIX") )
+EPREFIX=$EPREFIX
+#end
+
+#if ( ! $project.hasVar("BINDIR") )
+BINDIR=$BINDIR
+#end
+#if ( ! $project.hasVar("SBINDIR") )
+SBINDIR=$SBINDIR
+#end
+#if ( ! $project.hasVar("LIBDIR") )
+LIBDIR=$LIBDIR
+#end
+#if ( ! $project.hasVar("LIBEXECDIR") )
+LIBEXECDIR=$LIBEXECDIR
+#end
+#if ( ! $project.hasVar("DATADIR") )
+DATADIR=$DATADIR
+#end
+#if ( ! $project.hasVar("SYSCONFDIR") )
+SYSCONFDIR=$SYSCONFDIR
+#end
+#if ( ! $project.hasVar("SHAREDSTATEDIR") )
+SHAREDSTATEDIR=$SHAREDSTATEDIR
+#end
+#if ( ! $project.hasVar("LOCALSTATEDIR") )
+LOCALSTATEDIR=$LOCALSTATEDIR
+#end
+#if ( ! $project.hasVar("INCLUDEDIR") )
+INCLUDEDIR=$INCLUDEDIR
+#end
+#if ( ! $project.hasVar("INFODIR") )
+INFODIR=$INFODIR
+#end
+#if ( ! $project.hasVar("MANDIR") )
+MANDIR=$MANDIR
+#end
+
__EOF__
echo > $TEMP_DIR/make.mk
@@ -226,17 +301,17 @@
# Toolchain detection
# this will insert make vars to config.mk
-source make/toolchain.sh
+. make/toolchain.sh
# add user specified flags to config.mk
echo >> $TEMP_DIR/config.mk
-if [[ ! -z ${ENV_CFLAGS} ]]; then
+if [ ! -z "${ENV_CFLAGS}" ]; then
echo "CFLAGS += $ENV_CFLAGS" >> $TEMP_DIR/config.mk
fi
-if [[ ! -z ${ENV_CXXFLAGS} ]]; then
+if [ ! -z "${ENV_CXXFLAGS}" ]; then
echo "CXXFLAGS += $ENV_CXXFLAGS" >> $TEMP_DIR/config.mk
fi
-if [[ ! -z ${ENV_LDFLAGS} ]]; then
+if [ ! -z "${ENV_LDFLAGS}" ]; then
echo "LDFLAGS += $ENV_LDFLAGS" >> $TEMP_DIR/config.mk
fi
@@ -253,32 +328,38 @@
while true
do
#if( $sub.platform )
- if ! isplatform "${sub.platform}"; then
+ if isnotplatform "${sub.platform}"; then
break
fi
#end
+ #foreach( $not in $sub.getNotList() )
+ if isplatform "${not}"; then
+ break
+ fi
+ #end
#if( $sub.pkgconfig.size() > 0 )
- if [ -z "PKG_CONFIG" ]; then
+ if [ -z "$PKG_CONFIG" ]; then
break
fi
#end
#foreach( $pkg in $sub.pkgconfig )
- if ! pkg-config $pkg.getPkgConfigParam() ; then
+ $PKG_CONFIG $pkg.getPkgConfigParam()
+ if [ $? -ne 0 ] ; then
break
fi
- CFLAGS+=" `pkg-config --cflags $pkg.getPkgConfigParam()`"
- LDFLAGS+=" `pkg-config --libs $pkg.getPkgConfigParam()`"
+ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags $pkg.getPkgConfigParam()`"
+ LDFLAGS="$LDFLAGS `$PKG_CONFIG --libs $pkg.getPkgConfigParam()`"
#end
#foreach( $flags in $sub.flags )
#if( $flags.exec )
$flags.value > /dev/null
if [ $? -eq 0 ]; then
- $flags.varName+=" `$flags.value`"
+ $flags.varName="$$flags.varName `$flags.value`"
else
break
fi
#else
- $flags.varName+="$flags.value"
+ $flags.varName="$$flags.varName $flags.value"
#end
#end
#foreach( $test in $sub.tests )
@@ -287,7 +368,13 @@
break
fi
#end
- echo yes
+ #if ( $sub.make.length() > 0 )
+ cat >> $TEMP_DIR/make.mk << __EOF__
+# Dependency: $dependency.name
+$sub.make
+__EOF__
+ #end
+ echo yes
return 0
done
@@ -307,42 +394,53 @@
while true
do
#if( $dependency.platform )
- if ! isplatform "${sub.platform}"; then
+ if isnotplatform "${dependency.platform}"; then
break
fi
#end
+ #foreach( $not in $dependency.getNotList() )
+ if isplatform "${not}"; then
+ break
+ fi
+ #end
while true
do
#if( $dependency.pkgconfig.size() > 0 )
- if [ -z "PKG_CONFIG" ]; then
+ if [ -z "$PKG_CONFIG" ]; then
ERROR=1
break
fi
#end
#foreach( $pkg in $dependency.pkgconfig )
printf "checking for pkg-config package $pkg.getPkgConfigParam()... "
- if ! pkg-config $pkg.getPkgConfigParam() ; then
+ $PKG_CONFIG $pkg.getPkgConfigParam()
+ if [ $? -ne 0 ]; then
echo no
ERROR=1
break
fi
echo yes
- CFLAGS+=" `pkg-config --cflags $pkg.getPkgConfigParam()`"
- LDFLAGS+=" `pkg-config --libs $pkg.getPkgConfigParam()`"
+ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags $pkg.getPkgConfigParam()`"
+ LDFLAGS="$LDFLAGS `$PKG_CONFIG --libs $pkg.getPkgConfigParam()`"
#end
#foreach( $flags in $dependency.flags )
#if( $flags.exec )
$flags.value > /dev/null
if [ $? -ne 0 ]; then
- $flags.varName+=" `$flags.value`"
+ $flags.varName="$$flags.varName `$flags.value`"
else
ERROR=1
break
fi
#else
- $flags.varName+="$flags.value"
+ $flags.varName="$$flags.varName $flags.value"
+ #end
#end
+ #if ( $dependency.make.length() > 0 )
+ cat >> $TEMP_DIR/make.mk << __EOF__
+$dependency.make
+__EOF__
#end
break
@@ -354,13 +452,13 @@
# add general dependency flags to config.mk
echo >> $TEMP_DIR/config.mk
-if [[ ! -z ${CFLAGS} ]]; then
+if [ ! -z "${CFLAGS}" ]; then
echo "CFLAGS += $CFLAGS" >> $TEMP_DIR/config.mk
fi
-if [[ ! -z ${CXXFLAGS} ]]; then
+if [ ! -z "${CXXFLAGS}" ]; then
echo "CXXFLAGS += $CXXFLAGS" >> $TEMP_DIR/config.mk
fi
-if [[ ! -z ${LDFLAGS} ]]; then
+if [ ! -z "${LDFLAGS}" ]; then
echo "LDFLAGS += $LDFLAGS" >> $TEMP_DIR/config.mk
fi
#end
@@ -383,7 +481,7 @@
return 1
fi
#foreach( $def in $val.defines )
- CFLAGS+=" ${def.toFlags()}"
+ CFLAGS="$CFLAGS ${def.toFlags()}"
#end
#if( $val.hasMake() )
cat >> $TEMP_DIR/make.mk << __EOF__
@@ -415,11 +513,28 @@
#foreach( $dependency in $target.dependencies )
dependency_$dependency
if [ $? -ne 0 ]; then
- DEPENDENCIES_FAILED+="${dependency} "
+ DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED ${dependency} "
ERROR=1
fi
#end
+# Features
+#foreach( $feature in $target.features )
+if [ ! -z "$${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
+ DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED ${dependency} "
+ ERROR=1
+ fi
+ fi
+#end
+fi
+#end
+
#foreach( $opt in $target.options )
# Option: --${opt.argument}
if [ -z ${D}${opt.getVarName()} ]; then
@@ -465,13 +580,13 @@
#end
echo >> $TEMP_DIR/config.mk
-if [[ ! -z ${CFLAGS} ]]; then
+if [ ! -z "${CFLAGS}" ]; then
echo "${target.getCFlags()} += $CFLAGS" >> $TEMP_DIR/config.mk
fi
-if [[ ! -z ${CXXFLAGS} ]]; then
+if [ ! -z "${CXXFLAGS}" ]; then
echo "${target.getCXXFlags()} += $CXXFLAGS" >> $TEMP_DIR/config.mk
fi
-if [[ ! -z ${LDFLAGS} ]]; then
+if [ ! -z "${LDFLAGS}" ]; then
echo "${target.getLDFlags()} += $LDFLAGS" >> $TEMP_DIR/config.mk
fi
@@ -479,7 +594,7 @@
if [ $ERROR -ne 0 ]; then
echo
echo "Error: Unresolved dependencies"
- echo $DEPENCIES_FAILED
+ echo $DEPENDENCIES_FAILED
rm -Rf $TEMP_DIR
exit 1
fi