projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_2.3.24] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
build.sh
diff --git
a/automated-tests/build.sh
b/automated-tests/build.sh
index
6c817ae
..
a56cd87
100755
(executable)
--- a/
automated-tests/build.sh
+++ b/
automated-tests/build.sh
@@
-1,5
+1,6
@@
#!/bin/bash
#!/bin/bash
+
TEMP=`getopt -o rn --long rebuild,no-gen \
-n 'genmake' -- "$@"`
TEMP=`getopt -o rn --long rebuild,no-gen \
-n 'genmake' -- "$@"`
@@
-31,7
+32,13
@@
function build
(cd src/$1; ../../scripts/tcheadgen.sh tct-$1-core.h)
if [ $? -ne 0 ]; then echo "Aborting..."; exit 1; fi
fi
(cd src/$1; ../../scripts/tcheadgen.sh tct-$1-core.h)
if [ $? -ne 0 ]; then echo "Aborting..."; exit 1; fi
fi
- (cd build ; cmake .. -DMODULE=$1 ; make -j7 )
+ BUILDSYSTEM="Unix Makefiles"
+ BUILDCMD=make
+ if [ -e ../build/tizen/build.ninja ] ; then
+ BUILDSYSTEM="Ninja"
+ BUILDCMD=ninja
+ fi
+ (cd build ; cmake .. -DMODULE=$1 -G "$BUILDSYSTEM" ; $BUILDCMD -j7 )
}
if [ -n "$1" ] ; then
}
if [ -n "$1" ] ; then
@@
-43,6
+50,10
@@
else
if [ $mod != 'common' ] && [ $mod != 'manual' ]; then
echo BUILDING $mod
build $mod
if [ $mod != 'common' ] && [ $mod != 'manual' ]; then
echo BUILDING $mod
build $mod
+ if [ $? -ne 0 ]; then echo "Build failed" ; exit 1; fi
fi
done
fi
fi
done
fi
+
+echo "Build succeeded"
+exit 0