--- a/make/configure.vm Sun Jan 28 12:39:08 2024 +0100
+++ b/make/configure.vm Sun Jan 28 13:10:18 2024 +0100
@@ -1,72 +1,59 @@
#!/bin/sh
+# create temporary directory
+TEMP_DIR=".tmp-`uname -n`"
+rm -Rf "$TEMP_DIR"
+if mkdir -p "$TEMP_DIR"; then
+ :
+else
+ echo "Cannot create tmp dir $TEMP_DIR"
+ echo "Abort"
+ exit 1
+fi
+touch "$TEMP_DIR/options"
+touch "$TEMP_DIR/features"
+
+# define standard variables
+# also define standard prefix (this is where we will search for config.site)
+prefix=/usr
+exec_prefix=
+bindir=
+sbindir=
+libdir=
+libexecdir=
+datarootdir=
+datadir=
+sysconfdir=
+sharedstatedir=
+localstatedir=
+runstatedir=
+includedir=
+infodir=
+localedir=
+mandir=
+
+# custom variables
#foreach( $var in $vars )
#if( $var.exec )
${var.varName}=`${var.value}`
#else
-${var.varName}=${var.value}
+${var.varName}="${var.value}"
#end
#end
-#if ( ! $project.hasVar("PREFIX") )
-PREFIX=/usr
+# features
+#foreach( $feature in $features )
+#if( ${feature.auto} )
+${feature.varName}=auto
#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`
-
-TEMP_DIR=".tmp-`uname -n`"
-mkdir -p "$TEMP_DIR"
-if [ $? -ne 0 ]; then
- echo "Cannot create tmp dir"
- echo "Abort"
-fi
-touch "$TEMP_DIR/options"
-touch "$TEMP_DIR/features"
-
-# features
-#foreach( $feature in $features )
-#if( ${feature.isDefault()} )
-${feature.getVarName()}=on
-#end
-#end
+# clean abort
+abort_configure()
+{
+ rm -Rf "$TEMP_DIR"
+ exit 1
+}
# help text
printhelp()
@@ -85,28 +72,28 @@
--sysconfdir=DIR system configuration files [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR run-time variable data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
--datadir=DIR read-only architecture-independent data [DATAROOTDIR]
--infodir=DIR info documentation [DATAROOTDIR/info]
--mandir=DIR man documentation [DATAROOTDIR/man]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
#if( $options.size() > 0 )
Options:
+ --debug add extra compile flags for debug builds
+ --release add extra compile flags for release builds
#foreach( $opt in $options )
- --${opt.getArgument()}=${opt.getValuesString()}
+ --${opt.argument}=${opt.valuesString}
#end
#end
#if( $features.size() > 0 )
Optional Features:
#foreach( $feature in $features )
-#if( $feature.default )
- --disable-${feature.arg}
-#else
- --enable-${feature.arg}
-#end
+${feature.helpText}
#end
#end
@@ -116,107 +103,106 @@
#
# parse arguments
#
+BUILD_TYPE="default"
#set( $D = '$' )
for ARG in "$@"
do
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; rm -Rf "$TEMP_DIR"; exit 1 ;;
+ "--prefix="*) prefix=${D}{ARG#--prefix=} ;;
+ "--exec-prefix="*) exec_prefix=${D}{ARG#--exec-prefix=} ;;
+ "--bindir="*) bindir=${D}{ARG#----bindir=} ;;
+ "--sbindir="*) sbindir=${D}{ARG#--sbindir=} ;;
+ "--libdir="*) libdir=${D}{ARG#--libdir=} ;;
+ "--libexecdir="*) libexecdir=${D}{ARG#--libexecdir=} ;;
+ "--datarootdir="*) datarootdir=${D}{ARG#--datarootdir=} ;;
+ "--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} ;;
+ "--localedir"*) localedir=${D}{ARG#--localedir} ;;
+ "--help"*) printhelp; abort_configure ;;
+ "--debug") BUILD_TYPE="debug" ;;
+ "--release") BUILD_TYPE="release" ;;
#foreach( $opt in $options )
- "--${opt.getArgument()}="*) ${opt.getVarName()}=${D}{ARG#--${opt.getArgument()}=} ;;
+ "--${opt.argument}="*) ${opt.varName}=${D}{ARG#--${opt.argument}=} ;;
#end
#foreach( $feature in $features )
- "--enable-${feature.arg}") ${feature.getVarName()}=on ;;
- "--disable-${feature.arg}") unset ${feature.getVarName()} ;;
+ "--enable-${feature.arg}") ${feature.varName}=on ;;
+ "--disable-${feature.arg}") unset ${feature.varName} ;;
#end
- "-"*) echo "unknown option: $ARG"; rm -Rf "$TEMP_DIR"; exit 1 ;;
+ "-"*) echo "unknown option: $ARG"; abort_configure ;;
esac
done
-# set dir variables
-if [ -z "$BINDIR" ]; then
- BINDIR=$EPREFIX/bin
-fi
-if [ -z "$SBINDIR" ]; then
- SBINDIR=$EPREFIX/sbin
-fi
-if [ -z "$LIBDIR" ]; then
- LIBDIR=$EPREFIX/lib
-fi
-if [ -z "$LIBEXEC" ]; then
- LIBEXECDIR=$EPREFIX/libexec
-fi
-if [ -z "$DATADIR" ]; then
- DATADIR=$PREFIX/share
-fi
-if [ -z "$SYSCONFDIR" ]; then
- SYSCONFDIR=$PREFIX/etc
-fi
-if [ -z "$SHAREDSTATEDIR" ]; then
- SHAREDSTATEDIR=$PREFIX/com
-fi
-if [ -z "$LOCALSTATEDIR" ]; then
- LOCALSTATEDIR=$PREFIX/var
-fi
-if [ -z "$INCLUDEDIR" ]; then
- INCLUDEDIR=$PREFIX/include
-fi
-if [ -z "$INFODIR" ]; then
- INFODIR=$PREFIX/info
-fi
-if [ -z "$MANDIR" ]; then
- MANDIR=$PREFIX/man
+## Begin unparsed content. **
+#[[
+
+# set defaults for dir variables
+: ${exec_prefix:="$prefix"}
+: ${bindir:='${exec_prefix}/bin'}
+: ${sbindir:='${exec_prefix}/sbin'}
+: ${libdir:='${exec_prefix}/lib'}
+: ${libexecdir:='${exec_prefix}/libexec'}
+: ${datarootdir:='${prefix}/share'}
+: ${datadir:='${datarootdir}'}
+: ${sysconfdir:='${prefix}/etc'}
+: ${sharedstatedir:='${prefix}/com'}
+: ${localstatedir:='${prefix}/var'}
+: ${runstatedir:='${localstatedir}/run'}
+: ${includedir:='${prefix}/include'}
+: ${infodir:='${datarootdir}/info'}
+: ${mandir:='${datarootdir}/man'}
+: ${localedir:='${datarootdir}/locale'}
+
+# check if a config.site exists and load it
+if [ -n "$CONFIG_SITE" ]; then
+ # CONFIG_SITE may contain space separated file names
+ for cs in $CONFIG_SITE; do
+ printf "loading defaults from $cs... "
+ . "$cs"
+ echo ok
+ done
+elif [ -f "$prefix/share/config.site" ]; then
+ printf "loading site defaults... "
+ . "$prefix/share/config.site"
+ echo ok
+elif [ -f "$prefix/etc/config.site" ]; then
+ printf "loading site defaults... "
+ . "$prefix/etc/config.site"
+ echo ok
fi
-which pkg-config > /dev/null
-if [ $? -eq 0 ]; then
- PKG_CONFIG=pkg-config
-else
- PKG_CONFIG=false
-fi
+# Test for availability of pkg-config
+PKG_CONFIG=`command -v pkg-config`
+: ${PKG_CONFIG:="false"}
# Simple uname based platform detection
# $PLATFORM is used for platform dependent dependency selection
+OS=`uname -s`
+OS_VERSION=`uname -r`
printf "detect platform... "
if [ "$OS" = "SunOS" ]; then
PLATFORM="solaris sunos unix svr4"
-fi
-if [ "$OS" = "Linux" ]; then
+elif [ "$OS" = "Linux" ]; then
PLATFORM="linux unix"
-fi
-if [ "$OS" = "FreeBSD" ]; then
+elif [ "$OS" = "FreeBSD" ]; then
PLATFORM="freebsd bsd unix"
-fi
-if [ "$OS" = "Darwin" ]; then
+elif [ "$OS" = "OpenBSD" ]; then
+ PLATFORM="openbsd bsd unix"
+elif [ "$OS" = "NetBSD" ]; then
+ PLATFORM="netbsd bsd unix"
+elif [ "$OS" = "Darwin" ]; then
PLATFORM="macos osx bsd unix"
-fi
-echo "$OS" | grep -i "MINGW" > /dev/null
-if [ $? -eq 0 ]; then
+elif echo "$OS" | grep -i "MINGW" > /dev/null; then
PLATFORM="windows mingw"
fi
-
-if [ -z "$PLATFORM" ]; then
- PLATFORM="unix"
-fi
+: ${PLATFORM:="unix"}
-for p in $PLATFORM
-do
- PLATFORM_NAME=$p
- break
-done
-echo $PLATFORM_NAME
+PLATFORM_NAME=`echo "$PLATFORM" | cut -f1 -d' ' -`
+echo "$PLATFORM_NAME"
isplatform()
{
@@ -228,7 +214,7 @@
done
return 1
}
-isnotplatform()
+notisplatform()
{
for p in $PLATFORM
do
@@ -238,102 +224,117 @@
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.varName}=$${var.varName}
-#end
+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 **
-#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
+# generate vars.mk
+cat > "$TEMP_DIR/vars.mk" << __EOF__
+prefix="$prefix"
+exec_prefix="$exec_prefix"
+bindir="$bindir"
+sbindir="$sbindir"
+libdir="$libdir"
+libexecdir="$libexecdir"
+datarootdir="$datarootdir"
+datadir="$datadir"
+sysconfdir="$sysconfdir"
+sharedstatedir="$sharedstatedir"
+localstatedir="$localstatedir"
+runstatedir="$runstatedir"
+includedir="$includedir"
+infodir="$infodir"
+mandir="$mandir"
+localedir="$localedir"
+#foreach( $var in $vars )
+${var.varName}="${D}${var.varName}"
#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"
-
-ENV_CFLAGS=$CFLAGS
-ENV_LDFLAGS=$LDFLAGS
-ENV_CXXFLAGS=$CXXFLAGS
-
-# Toolchain detection
-# this will insert make vars to config.mk
+# toolchain detection utilities
. make/toolchain.sh
-# add user specified flags to config.mk
-echo "# project specific flags" >> "$TEMP_DIR/config.mk"
-if [ -n "${ENV_CFLAGS}" ]; then
- echo "CFLAGS += $ENV_CFLAGS" >> "$TEMP_DIR/config.mk"
-fi
-if [ -n "${ENV_CXXFLAGS}" ]; then
- echo "CXXFLAGS += $ENV_CXXFLAGS" >> "$TEMP_DIR/config.mk"
-fi
-if [ -n "${ENV_LDFLAGS}" ]; then
- echo "LDFLAGS += $ENV_LDFLAGS" >> "$TEMP_DIR/config.mk"
-fi
-
#
# DEPENDENCIES
#
-#foreach( $dependency in $namedDependencies )
-dependency_${dependency.name}()
+# check languages
+lang_c=
+lang_cpp=
+#foreach( $lang in $languages )
+if detect_${lang}_compiler ; then
+ lang_${lang}=1
+fi
+#end
+
+# create buffer for make variables required by dependencies
+echo > "$TEMP_DIR/make.mk"
+
+test_pkg_config()
{
- printf "checking for ${dependency.name}... "
- #foreach( $sub in $dependency.getSubdependencies() )
- # dependency $sub.getFullName()
+ if "$PKG_CONFIG" --exists "$1" ; then :
+ else return 1 ; fi
+ if [ -z "$2" ] || "$PKG_CONFIG" --atleast-version="$2" "$1" ; then :
+ else return 1 ; fi
+ if [ -z "$3" ] || "$PKG_CONFIG" --exact-version="$3" "$1" ; then :
+ else return 1 ; fi
+ if [ -z "$4" ] || "$PKG_CONFIG" --max-version="$4" "$1" ; then :
+ else return 1 ; fi
+ return 0
+}
+
+print_check_msg()
+{
+ if [ -z "$1" ]; then
+ shift
+ printf "$@"
+ fi
+}
+
+#foreach( $dependency in $namedDependencies )
+dependency_error_${dependency.id}()
+{
+ print_check_msg "${D}dep_checked_${dependency.id}" "checking for ${dependency.name}... "
+ #foreach( $sub in $dependency.subdependencies )
+ # dependency $sub.fullName
while true
do
#if( $sub.platform )
- if isnotplatform "${sub.platform}"; then
+ if notisplatform "${sub.platform}"; then
break
fi
#end
- #foreach( $not in $sub.getNotList() )
- if isplatform "${not}"; then
+ #if( $sub.toolchain )
+ if notistoolchain "${sub.toolchain}"; then
+ break
+ fi
+ #end
+ #foreach( $np in $sub.notList )
+ if isplatform "${np}" || istoolchain "${np}"; then
+ break
+ fi
+ #end
+ #foreach( $lang in $sub.lang )
+ if [ -z "$lang_${lang}" ] ; then
break
fi
#end
@@ -343,24 +344,24 @@
fi
#end
#foreach( $test in $sub.tests )
- $test > /dev/null
- if [ $? -ne 0 ]; then
- break
+ if $test > /dev/null ; then
+ :
+ else
+ break
fi
#end
#foreach( $pkg in $sub.pkgconfig )
- $pkg.getPkgConfigTestQuery()
- if [ $? -ne 0 ] ; then
+ if test_pkg_config "$pkg.name" "$pkg.atleast" "$pkg.exact" "$pkg.max" ; then
+ TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags $pkg.name`"
+ TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs $pkg.name`"
+ else
break
fi
- TEMP_CFLAGS="$TEMP_CFLAGS `$PKG_CONFIG --cflags $pkg.name`"
- TEMP_LDFLAGS="$TEMP_LDFLAGS `$PKG_CONFIG --libs $pkg.name`"
#end
#foreach( $flags in $sub.flags )
#if( $flags.exec )
- $flags.value > /dev/null
- if [ $? -eq 0 ]; then
- TEMP_$flags.varName="$TEMP_$flags.varName `$flags.value`"
+ if tmp_flags=`$flags.value` ; then
+ TEMP_$flags.varName="$TEMP_$flags.varName $tmp_flags"
else
break
fi
@@ -374,37 +375,54 @@
$sub.make
__EOF__
#end
- echo yes
- return 0
+ print_check_msg "${D}dep_checked_${dependency.id}" "yes\n"
+ dep_checked_${dependency.id}=1
+ return 1
done
#end
- echo no
- return 1
+ print_check_msg "${D}dep_checked_${dependency.id}" "no\n"
+ dep_checked_${dependency.id}=1
+ return 0
}
#end
+# start collecting dependency information
+echo > "$TEMP_DIR/flags.mk"
+
DEPENDENCIES_FAILED=
ERROR=0
#if( $dependencies.size() > 0 )
-# general dependencies
+# unnamed dependencies
TEMP_CFLAGS=
+TEMP_CXXFLAGS=
TEMP_LDFLAGS=
#foreach( $dependency in $dependencies )
while true
do
#if( $dependency.platform )
- if isnotplatform "${dependency.platform}"; then
+ if notisplatform "${dependency.platform}"; then
break
fi
#end
- #foreach( $not in $dependency.getNotList() )
- if isplatform "${not}"; then
+ #if( $dependency.toolchain )
+ if notistoolchain "${dependency.toolchain}"; then
+ break
+ fi
+ #end
+ #foreach( $np in $dependency.notList )
+ if isplatform "${np}" || istoolchain "${np}"; then
break
fi
#end
while true
do
+ #foreach( $lang in $dependency.lang )
+ if [ -z "$lang_${lang}" ] ; then
+ ERROR=1
+ break
+ fi
+ #end
#if( $dependency.pkgconfig.size() > 0 )
if [ -z "$PKG_CONFIG" ]; then
ERROR=1
@@ -412,23 +430,25 @@
fi
#end
#foreach( $pkg in $dependency.pkgconfig )
- printf "checking for pkg-config package $pkg.name... "
- $pkg.getPkgConfigTestQuery()
- if [ $? -ne 0 ]; then
- echo no
+ print_check_msg "${D}dep_pkgconfig_checked_${pkg.id}" "checking for pkg-config package $pkg.name... "
+ if test_pkg_config "$pkg.name" "$pkg.atleast" "$pkg.exact" "$pkg.max" ; then
+ print_check_msg "${D}dep_pkgconfig_checked_${pkg.id}" "yes\n"
+ dep_pkgconfig_checked_${pkg.id}=1
+ TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags $pkg.name`"
+ TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs $pkg.name`"
+ else
+ print_check_msg "${D}dep_pkgconfig_checked_${pkg.id}" "no\n"
+ dep_pkgconfig_checked_${pkg.id}=1
ERROR=1
break
fi
- echo yes
- TEMP_CFLAGS="$TEMP_CFLAGS `$PKG_CONFIG --cflags $pkg.name`"
- TEMP_LDFLAGS="$TEMP_LDFLAGS `$PKG_CONFIG --libs $pkg.name`"
#end
#foreach( $flags in $dependency.flags )
#if( $flags.exec )
$flags.value > /dev/null
- if [ $? -ne 0 ]; then
- TEMP_$flags.varName="$TEMP_$flags.varName `$flags.value`"
+ if tmp_flags=`$flags.value` ; then
+ TEMP_$flags.varName="$TEMP_$flags.varName $tmp_flags"
else
ERROR=1
break
@@ -442,24 +462,22 @@
$dependency.make
__EOF__
#end
-
break
done
-
break
done
#end
-# add general dependency flags to config.mk
-echo >> "$TEMP_DIR/config.mk"
-if [ -n "${TEMP_CFLAGS}" ]; then
- echo "CFLAGS += $TEMP_CFLAGS" >> $TEMP_DIR/config.mk
+# add general dependency flags to flags.mk
+echo "# general flags" >> "$TEMP_DIR/flags.mk"
+if [ -n "${TEMP_CFLAGS}" ] && [ -n "$lang_c" ]; then
+ echo "CFLAGS += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk"
fi
-if [ -n "${TEMP_CXXFLAGS}" ]; then
- echo "CXXFLAGS += $TEMP_CXXFLAGS" >> $TEMP_DIR/config.mk
+if [ -n "${TEMP_CXXFLAGS}" ] && [ -n "$lang_cpp" ]; then
+ echo "CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk"
fi
if [ -n "${TEMP_LDFLAGS}" ]; then
- echo "LDFLAGS += $TEMP_LDFLAGS" >> $TEMP_DIR/config.mk
+ echo "LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk"
fi
#end
@@ -472,8 +490,7 @@
{
VERR=0
#foreach( $dep in $val.dependencies )
- dependency_$dep
- if [ $? -ne 0 ]; then
+ if dependency_error_$dep ; then
VERR=1
fi
#end
@@ -482,6 +499,7 @@
fi
#foreach( $def in $val.defines )
TEMP_CFLAGS="$TEMP_CFLAGS ${def.toFlags()}"
+ TEMP_CXXFLAGS="$TEMP_CXXFLAGS ${def.toFlags()}"
#end
#if( $val.hasMake() )
cat >> "$TEMP_DIR/make.mk" << __EOF__
@@ -496,23 +514,22 @@
#
# TARGETS
#
+
+#foreach( $target in $targets )
+echo >> "$TEMP_DIR/flags.mk"
+#if ( $target.name )
+echo "configuring target: $target.name"
+echo "# flags for target $target.name" >> "$TEMP_DIR/flags.mk"
+#else
+echo "configuring global target"
+echo "# flags for unnamed target" >> "$TEMP_DIR/flags.mk"
+#end
TEMP_CFLAGS=
TEMP_CXXFLAGS=
TEMP_LDFLAGS=
-#foreach( $target in $targets )
-#if ( $target.name )
-# Target: $target.name
-#else
-# Target
-#end
-TEMP_CFLAGS=
-TEMP_LDFLAGS=
-TEMP_CXXFLAGS=
-
#foreach( $dependency in $target.dependencies )
-dependency_$dependency
-if [ $? -ne 0 ]; then
+if dependency_error_$dependency; then
DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED ${dependency} "
ERROR=1
fi
@@ -520,35 +537,39 @@
# Features
#foreach( $feature in $target.features )
-if [ -n "$${feature.getVarName()}" ]; then
+if [ -n "${D}${feature.varName}" ]; then
#foreach( $dependency in $feature.dependencies )
# check dependency
- dependency_$dependency
- if [ $? -ne 0 ]; then
+ if dependency_error_$dependency ; then
# "auto" features can fail and are just disabled in this case
- if [ "$${feature.getVarName()}" != "auto" ]; then
+ if [ "${D}${feature.varName}" = "auto" ]; then
+ DISABLE_${feature.varName}=1
+ else
DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED ${dependency} "
ERROR=1
fi
fi
#end
+ if [ -n "$DISABLE_${feature.varName}" ]; then
+ unset ${feature.varName}
+ fi
fi
#end
#foreach( $opt in $target.options )
# Option: --${opt.argument}
-if [ -z ${D}${opt.getVarName()} ]; then
+if [ -z "${D}${opt.varName}" ]; then
+ echo "auto-detecting option '${opt.argument}'"
SAVED_ERROR="$ERROR"
SAVED_DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED"
- ERROR=0
+ ERROR=1
while true
do
#foreach( $optdef in $opt.defaults )
#if( $optdef.platform )
if isplatform "$optdef.platform"; then
#end
- $optdef.func
- if [ $? -eq 0 ]; then
+ if $optdef.func ; then
echo " ${opt.argument}: ${optdef.valueName}" >> "$TEMP_DIR/options"
ERROR=0
break
@@ -561,55 +582,92 @@
done
if [ $ERROR -ne 0 ]; then
SAVED_ERROR=1
+ SAVED_DEPENDENCIES_FAILED="option '${opt.argument}' $SAVED_DEPENDENCIES_FAILED"
fi
ERROR="$SAVED_ERROR"
DEPENDENCIES_FAILED="$SAVED_DEPENDENCIES_FAILED"
else
+ echo "checking option ${opt.argument} = ${D}${opt.varName}"
if false; then
false
#foreach( $optval in $opt.values )
- elif [ "${D}${opt.getVarName()}" = "${optval.value}" ]; then
- echo " ${opt.argument}: ${D}${opt.getVarName()}" >> $TEMP_DIR/options
- $optval.func
- if [ $? -ne 0 ]; then
+ elif [ "${D}${opt.varName}" = "${optval.value}" ]; then
+ echo " ${opt.argument}: ${D}${opt.varName}" >> $TEMP_DIR/options
+ if $optval.func ; then
+ :
+ else
ERROR=1
+ DEPENDENCIES_FAILED="option '${opt.argument}' $DEPENDENCIES_FAILED"
fi
#end
fi
fi
#end
-echo >> "$TEMP_DIR/config.mk"
-if [ -n "${TEMP_CFLAGS}" ]; then
- echo "${target.getCFlags()} += $TEMP_CFLAGS" >> "$TEMP_DIR/config.mk"
+if [ -n "${TEMP_CFLAGS}" ] && [ -n "$lang_c" ]; then
+ echo "${target.cFlags} += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk"
+fi
+if [ -n "${TEMP_CXXFLAGS}" ] && [ -n "$lang_cpp" ]; then
+ echo "${target.cxxFlags} += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk"
fi
-if [ -n "${TEMP_CXXFLAGS}" ]; then
- echo "${target.getCXXFlags()} += $TEMP_CXXFLAGS" >> "$TEMP_DIR/config.mk"
+if [ "$BUILD_TYPE" = "debug" ]; then
+ if [ -n "$lang_c" ]; then
+ echo '${target.cFlags} += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+ fi
+ if [ -n "$lang_cpp" ]; then
+ echo '${target.cxxFlags} += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+ fi
+fi
+if [ "$BUILD_TYPE" = "release" ]; then
+ if [ -n "$lang_c" ]; then
+ echo '${target.cFlags} += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+ fi
+ if [ -n "$lang_cpp" ]; then
+ echo '${target.cxxFlags} += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+ fi
fi
if [ -n "${TEMP_LDFLAGS}" ]; then
- echo "${target.getLDFlags()} += $TEMP_LDFLAGS" >> "$TEMP_DIR/config.mk"
+ echo "${target.ldFlags} += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk"
fi
#end
+
+# final result
if [ $ERROR -ne 0 ]; then
echo
echo "Error: Unresolved dependencies"
echo "$DEPENDENCIES_FAILED"
- rm -Rf "$TEMP_DIR"
- exit 1
+ abort_configure
fi
echo "configure finished"
echo
echo "Build Config:"
-echo " PREFIX: $PREFIX"
-echo " TOOLCHAIN: $TOOLCHAIN_NAME"
+echo " PREFIX: $prefix"
+echo " TOOLCHAIN: $TOOLCHAIN_NAME"
#if ( $options.size() > 0 )
echo "Options:"
cat "$TEMP_DIR/options"
#end
+#if ( $features.size() > 0 )
+echo "Features:"
+#foreach( $feature in $features )
+if [ -n "${D}${feature.varName}" ]; then
+echo " $feature.name: on"
+else
+echo " $feature.name: off"
+fi
+#end
+#end
echo
-cat "$TEMP_DIR/config.mk" "$TEMP_DIR/make.mk" > config.mk
+
+# generate the config.mk file
+cat > "$TEMP_DIR/config.mk" << __EOF__
+#
+# config.mk generated by configure
+#
+
+__EOF__
+write_toolchain_defaults "$TEMP_DIR/toolchain.mk"
+cat "$TEMP_DIR/vars.mk" "$TEMP_DIR/toolchain.mk" "$TEMP_DIR/flags.mk" "$TEMP_DIR/make.mk" > config.mk
rm -Rf "$TEMP_DIR"
-
-