From cfde12ad6d7e75187a088ca7d2192069b4b46053 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Wed, 18 Jan 2012 20:45:21 +0100 Subject: [PATCH] Switch Linux release build to "SHARED_SIMGEAR". --- .gitignore | 3 +++ hudson_build_release.sh | 14 ++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6380c51..930f8e0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ install boost_1_44_0 InstallConfig.iss Output +output +fgBuild +sgBuild diff --git a/hudson_build_release.sh b/hudson_build_release.sh index 5d569e9..0be787c 100755 --- a/hudson_build_release.sh +++ b/hudson_build_release.sh @@ -1,17 +1,23 @@ #!/bin/sh +if [ "$WORKSPACE" == "" ]; then + echo "ERROR: Missing WORKSPACE environment variable." + exit 1 +fi + +##################################################################################### # remove old and create fresh build directories rm -rf sgBuild rm -rf fgBuild mkdir -p sgBuild mkdir -p fgBuild mkdir -p output -# clear output directory rm -rf output/* +##################################################################################### echo "Starting on SimGear" cd sgBuild -cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist ../simgear +cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" ../simgear # compile make @@ -27,10 +33,10 @@ make install make package_source cp simgear-*.tar.bz2 ../output/. +##################################################################################### echo "Starting on FlightGear" - cd ../fgBuild -cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist ../flightgear +cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" ../flightgear # compile make