Commit 139306f3 authored by Emmanuel Promayon's avatar Emmanuel Promayon

FIXED remove temp directory at exit

parent 9ac2dfdd
......@@ -85,7 +85,7 @@ cleanup() {
cd
fi
# finally cleanup working dir
# TODO rm -rf $workingDir
rm -rf $workingDir
# use the backup value (otherwise the result of the "rm -rf" command above will
# be used, and that's probably always 0 !)
exit $currentExitValue
......@@ -139,9 +139,9 @@ echo "===== Uname is $unameOS ===== OS is $osName ====="
# check if current build is on windows debug version
if [ ! -f $camitkGenerator ]; then
echo "===== Not found: $camitkGenerator on $osName ====="
echo "===== Not found: $camitkGenerator on $osName ====="
if [[ "$osName" == "Windows" ]]; then
echo "===== camitk-cepgenerator binary not found, using Debug version on Windows ====="
echo "===== camitk-cepgenerator binary not found, using Debug version on Windows ====="
# try with debug postfix
camitkGenerator=$camitkGenerator-debug
camitkConfig=$camitkConfig-debug
......@@ -150,7 +150,7 @@ fi
getWorkingDirExtensionCount() {
if [[ "$osName" == "Windows" ]]; then
# no virtual X11
# no virtual X11
echo $($camitkConfig --config | grep "^ - \[W\] " | wc -l)
else
echo $(xvfb-run --auto-servernum --server-num=1 $camitkConfig --config | grep "^ - \[W\] " | wc -l)
......@@ -746,8 +746,8 @@ generateConfigureAndMake() {
mkdir build
cd build
if [[ "$osName" == "Windows" ]]; then
# no virtual X11 -DCMAKE_C_FLAGS:STRING="/MP" -DCMAKE_CXX_FLAGS="/MP"
cmake $CMAKE_OPTIONS -Wno-dev -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE:STRING=Debug ../$srcDirName > ../cmake-log 2> ../cmake-error
# no virtual X11 -DCMAKE_C_FLAGS:STRING="/MP" -DCMAKE_CXX_FLAGS="/MP"
cmake $CMAKE_OPTIONS -Wno-dev -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE:STRING=Debug ../$srcDirName > ../cmake-log 2> ../cmake-error
else
xvfb-run --auto-servernum --server-num=1 cmake $CMAKE_OPTIONS ../$srcDirName > ../cmake-log 2> ../cmake-error
fi
......@@ -758,8 +758,8 @@ generateConfigureAndMake() {
if [[ "$osName" == "Windows" ]]; then
cmake --build . --config Debug > ../make-log 2> ../make-error
else
# build (parallel)
make -j9 > ../make-log 2> ../make-error
# build (parallel)
make -j9 > ../make-log 2> ../make-error
fi
echo "===== make-log ====="
cat ../make-log
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment