Linux builder: use Ninja
This commit is contained in:
+10
-8
@@ -5,6 +5,8 @@ if [ "$WORKSPACE" == "" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cmakeGenerator=Ninja
|
||||||
|
cmakeCommonArgs="-DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DCMAKE_BUILD_TYPE=RelWithDebInfo"
|
||||||
VERSION=`cat flightgear/flightgear-version`
|
VERSION=`cat flightgear/flightgear-version`
|
||||||
|
|
||||||
#####################################################################################
|
#####################################################################################
|
||||||
@@ -22,39 +24,39 @@ rm -rf output/*
|
|||||||
#####################################################################################
|
#####################################################################################
|
||||||
echo "Starting on SimGear"
|
echo "Starting on SimGear"
|
||||||
cd sgBuild
|
cd sgBuild
|
||||||
cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DENABLE_DNS:BOOL="ON" -DSIMGEAR_SHARED:BOOL="ON" ../simgear
|
cmake -G $cmakeGenerator $cmakeCommonArgs ../simgear
|
||||||
|
|
||||||
# compile
|
# compile
|
||||||
make
|
ninja
|
||||||
|
|
||||||
if [ $? -ne '0' ]; then
|
if [ $? -ne '0' ]; then
|
||||||
echo "make simgear failed"
|
echo "make simgear failed"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
make install
|
ninja install
|
||||||
|
|
||||||
# build source package and copy to output
|
# build source package and copy to output
|
||||||
make package_source
|
ninja package_source
|
||||||
cp simgear-*.tar.bz2 ../output/.
|
cp simgear-*.tar.bz2 ../output/.
|
||||||
|
|
||||||
#####################################################################################
|
#####################################################################################
|
||||||
echo "Starting on FlightGear"
|
echo "Starting on FlightGear"
|
||||||
cd ../fgBuild
|
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
|
# compile
|
||||||
make
|
ninja
|
||||||
|
|
||||||
if [ $? -ne '0' ]; then
|
if [ $? -ne '0' ]; then
|
||||||
echo "make flightgear failed"
|
echo "make flightgear failed"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
make install
|
ninja install
|
||||||
|
|
||||||
# build source package and copy to output
|
# build source package and copy to output
|
||||||
make package_source
|
ninja package_source
|
||||||
cp flightgear-*.tar.bz2 ../output/.
|
cp flightgear-*.tar.bz2 ../output/.
|
||||||
|
|
||||||
#####################################################################################
|
#####################################################################################
|
||||||
|
|||||||
Reference in New Issue
Block a user