Linux builder: use Ninja

This commit is contained in:
Automatic Release Builder
2020-09-16 17:21:46 +01:00
parent d3828f3d68
commit 7d8d08097c

View File

@@ -5,6 +5,8 @@ if [ "$WORKSPACE" == "" ]; then
exit 1
fi
cmakeGenerator=Ninja
cmakeCommonArgs="-DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo"
VERSION=`cat flightgear/flightgear-version`
#####################################################################################
@@ -22,39 +24,39 @@ rm -rf output/*
#####################################################################################
echo "Starting on SimGear"
cd sgBuild
cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DENABLE_DNS:BOOL="ON" -DSIMGEAR_SHARED:BOOL="ON" ../simgear
cmake -G $cmakeGenerator $cmakeCommonArgs ../simgear
# compile
make
ninja
if [ $? -ne '0' ]; then
echo "make simgear failed"
exit 1
fi
make install
ninja install
# build source package and copy to output
make package_source
ninja package_source
cp simgear-*.tar.bz2 ../output/.
#####################################################################################
echo "Starting on FlightGear"
cd ../fgBuild
cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" -DENABLE_SWIFT:BOOL=ON -DFG_BUILD_TYPE=Release ../flightgear
cmake -G $cmakeGenerator $cmakeCommonArgs -DENABLE_SWIFT:BOOL=ON -DFG_BUILD_TYPE=Release ../flightgear
# compile
make
ninja
if [ $? -ne '0' ]; then
echo "make flightgear failed"
exit 1
fi
make install
ninja install
# build source package and copy to output
make package_source
ninja package_source
cp flightgear-*.tar.bz2 ../output/.
#####################################################################################