LUA option added to automatic builds

This commit is contained in:
Bertrand Songis
2016-05-19 07:00:27 +02:00
parent 7a98a85bc5
commit 32576b6f72
2 changed files with 13 additions and 10 deletions
+6 -5
View File
@@ -10,7 +10,8 @@ rmdir build /s /q
mkdir build
cd build
SET COMMON_OPTIONS=-DCMAKE_PREFIX_PATH=C:\Qt\5.6\msvc2015 -DALLOW_NIGHTLY_BUILDS=YES -DVERSION_SUFFIX=%1
SET COMMON_OPTIONS=-DCMAKE_PREFIX_PATH=C:\Qt\5.6\msvc2015 -DALLOW_NIGHTLY_BUILDS=YES -DVERSION_SUFFIX=%1 -DGVARS=YES -DHELI=YES
SET STM32_OPTIONS=%COMMON_OPTIONS% -DLUA=YES
cmake %COMMON_OPTIONS% -DPCB=9X %SRCDIR%
"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" radio\src\targets\simu\libsimulator.vcxproj /t:Rebuild /p:Configuration=Release
@@ -27,15 +28,15 @@ cmake %COMMON_OPTIONS% -DPCB=SKY9X %SRCDIR%
cmake %COMMON_OPTIONS% -DPCB=9XRPRO %SRCDIR%
"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" radio\src\targets\simu\libsimulator.vcxproj /t:Rebuild /p:Configuration=Release
cmake %COMMON_OPTIONS% -DPCB=TARANIS %SRCDIR%
cmake %STM32_OPTIONS% -DPCB=TARANIS %SRCDIR%
"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" radio\src\targets\simu\libsimulator.vcxproj /t:Rebuild /p:Configuration=Release
cmake %COMMON_OPTIONS% -DPCB=TARANIS -DPCBREV=REVPLUS %SRCDIR%
cmake %STM32_OPTIONS% -DPCB=TARANIS -DPCBREV=REVPLUS %SRCDIR%
"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" radio\src\targets\simu\libsimulator.vcxproj /t:Rebuild /p:Configuration=Release
cmake %COMMON_OPTIONS% -DPCB=TARANIS -DPCBREV=REV9E %SRCDIR%
cmake %STM32_OPTIONS% -DPCB=TARANIS -DPCBREV=REV9E %SRCDIR%
"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" radio\src\targets\simu\libsimulator.vcxproj /t:Rebuild /p:Configuration=Release
cmake %COMMON_OPTIONS% -DPCB=HORUS %SRCDIR%
cmake %STM32_OPTIONS% -DPCB=HORUS %SRCDIR%
"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" radio\src\targets\simu\libsimulator.vcxproj /t:Rebuild /p:Configuration=Release
"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" companion\src\installer.vcxproj /t:Rebuild /p:Configuration=Release
+7 -5
View File
@@ -7,8 +7,10 @@ set -x
SRCDIR=$1
OUTDIR=$2
COMMON_OPTIONS="-DALLOW_NIGHTLY_BUILDS=YES -DVERSION_SUFFIX=$3"
COMMON_OPTIONS="-DALLOW_NIGHTLY_BUILDS=YES -DVERSION_SUFFIX=$3 -DGVARS=YES -DHELI=YES"
STM32_OPTIONS="${COMMON_OPTIONS} -DLUA=YES"
rm -rf build
mkdir build
cd build
@@ -27,16 +29,16 @@ make -j2 libsimulator
cmake ${COMMON_OPTIONS} -DPCB=9XRPRO ${SRCDIR}
make -j2 libsimulator
cmake ${COMMON_OPTIONS} -DPCB=TARANIS ${SRCDIR}
cmake ${STM32_OPTIONS} -DPCB=TARANIS ${SRCDIR}
make -j2 libsimulator
cmake ${COMMON_OPTIONS} -DPCB=TARANIS -DPCBREV=REVPLUS ${SRCDIR}
cmake ${STM32_OPTIONS} -DPCB=TARANIS -DPCBREV=REVPLUS ${SRCDIR}
make -j2 libsimulator
cmake ${COMMON_OPTIONS} -DPCB=TARANIS -DPCBREV=REV9E ${SRCDIR}
cmake ${STM32_OPTIONS} -DPCB=TARANIS -DPCBREV=REV9E ${SRCDIR}
make -j2 libsimulator
cmake ${COMMON_OPTIONS} -DPCB=HORUS ${SRCDIR}
cmake ${STM32_OPTIONS} -DPCB=HORUS ${SRCDIR}
make -j2 libsimulator
make -j2 package