From: Mikko Rasa Date: Mon, 9 Mar 2015 16:58:40 +0000 (+0200) Subject: Fix bootstrap to handle overlays in a more generic way X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=c932c038879f7101eaba8ca123b39ef5c4330b65;p=builder.git Fix bootstrap to handle overlays in a more generic way --- diff --git a/bootstrap.sh b/bootstrap.sh index f198f6f..02fbd33 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,5 +1,4 @@ #!/bin/sh -# $Id$ set -e @@ -75,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%%/*} @@ -91,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 @@ -109,11 +125,14 @@ 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 + 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