Fix bootstrap to handle overlays in a more generic way

[builder.git] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 9355b27e098264b0fc4d9de99d7a8f5f0f725c7a..02fbd33445a9735dd78e5c3c3d71f7446d54619d 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id$
 
 set -e
 
@@ -14,7 +13,7 @@ if [ "$MACHINE" = "x86_64" ]; then
 else
        MULTIARCH="i386-linux-gnu"
 fi
-if [ "$SYSTEM" = "Darwin" ]; then
+if [ "$SYSTEM" = "Darwin" -o "$SYSTEM" = "FreeBSD" ]; then
        if which clang++ >/dev/null; then
                COMPILER="clang++"
        else
@@ -46,6 +45,18 @@ while [ "$1" ]; do
        --keep-temp)
                KEEP_TEMP=yes
                ;;
+       --compiler)
+               shift
+               COMPILER="$1"
+               CUSTOM_COMPILER=yes
+               ;;
+       --compiler=*)
+               COMPILER="${1#--compiler=}"
+               CUSTOM_COMPILER=yes
+               ;;
+       --debug)
+               DEBUG=-g
+               ;;
        *)
                echo "Unknown option $1"
                exit 1
@@ -63,13 +74,30 @@ mkdir -p "$INCLUDEDIR/msp"
 
 sources=source/*.cpp
 
+use_overlays="unix generic"
 missing=""
 for i in $REQUIRED; do
        path=`ls -1d $LIBPATH/*$i* 2>/dev/null | head -n1`
        if [ -z "$path"  -o ! -d "$path/source" ]; then
                missing="$missing msp$i"
        else
-               headers=`find $path/source \( -name windows -prune \) -o \( -name '*.h' -print \)`
+               if [ "`echo $path/source/*.cpp`" = "$path/source/*.cpp" ]; then
+                       subdirs=`find "$path/source" -mindepth 1 -maxdepth 1 -type d`
+               else
+                       subdirs="$path/source"
+               fi
+
+               check_overlay=""
+               for j in $use_overlays; do
+                       [ -z "$check_overlay" ] || check_overlay="$check_overlay -o "
+                       check_overlay="${check_overlay}-name $j"
+               done
+               findargs="$subdirs"
+               if [ "$check_overlay" ]; then
+                       findargs="$findargs -mindepth 1 ( -type d ! ( $check_overlay ) -prune ) ,"
+               fi
+
+               headers=`find $findargs -name '*.h'`
                for j in $headers; do
                        rel=${j#$path/source/}
                        comp=${rel%%/*}
@@ -79,7 +107,7 @@ for i in $REQUIRED; do
                        mkdir -p "$INCLUDEDIR/msp/$comp"
                        ln -sf $j "$INCLUDEDIR/msp/$comp/"
                done
-               sources="$sources `find $path/source \( -name windows -prune \) -o \( -name '*.cpp' -print \)`"
+               sources="$sources `find $findargs -name '*.cpp'`"
        fi
 done
 
@@ -97,12 +125,15 @@ for i in $sources; do
        mv $obj $obj.o
        obj=$obj.o
        dir=${i%/*}
-       dir=${dir%/unix}
        flags="$CFLAGS"
-       if [ -d "$dir/unix" ]; then
-               flags="$flags -iquote $dir -iquote $dir/unix"
-       fi
-       $COMPILER -c $i -o $obj $flags
+       for j in $use_overlays; do
+               dir=${dir%/$j}
+               if [ -d "$dir/$j" ]; then
+                       flags="$flags -iquote $dir -iquote $dir/$j"
+                       break
+               fi
+       done
+       $COMPILER -c $DEBUG $i -o $obj $flags
        objects="$objects $obj"
 done
 $COMPILER $objects -o builder-stage1 $LIBS
@@ -117,4 +148,7 @@ ARGS=
 if [ "$PREFIX" ]; then
        ARGS="$ARGS --prefix='$PREFIX'"
 fi
+if [ "$CUSTOM_COMPILER" = "yes" ]; then
+       ARGS="$ARGS CXX=$COMPILER"
+fi
 eval "./builder-stage1 $ARGS"