piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

3djc/build revise handling sdcard.version (#3897)

Browse Source 
* Move opentx.sdcard.version creation to server build process

* opentx.sdcard.version should not exist prior, but just in case ...
This commit is contained in:
3djc
2016-10-12 17:38:24 +02:00
committed by Bertrand Songis
parent f0608f4837
commit 515c122521
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
-2
View File
@@ -10,8 +10,6 @@ message(STATUS "OpenTX ${VERSION}")
set(SDCARD_REVISION "0003")
set(SDCARD_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION})
file(WRITE radio/sdcard/horus/opentx.sdcard.version ${SDCARD_VERSION})
file(WRITE radio/sdcard/taranis/opentx.sdcard.version ${SDCARD_VERSION})
cmake_minimum_required(VERSION 2.8)
cmake_policy(SET CMP0020 NEW)
radio/sdcard/horus/opentx.sdcard.version
-1
View File
@@ -1 +0,0 @@
2.2V0003
radio/sdcard/taranis/opentx.sdcard.version
-1
View File
@@ -1 +0,0 @@
2.2V0003
tools/nightly22/build-sdcard.sh
+4 -2
View File
@@ -1,5 +1,5 @@
#!/bin/bash
set -e
branch=next
@@ -7,10 +7,12 @@ workdir=/home/opentx/nightly22
output=/var/www/html/2.2/nightly
# Handle opentx.sdcard.version
grep 'set(SDCARD_REVISION' ${workdir}/code/CMakeLists.txt | grep -o '".*"' | sed 's/"//g' > ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version
grep 'set(SDCARD_REVISION' ${workdir}/code/CMakeLists.txt | grep -o '".*"' | sed 's/"//g' > ${workdir}/code/radio/sdcard/taranis/opentx.sdcard.version
if cmp --silent ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version ${workdir}/opentx.sdcard.version
then
exit
else
else
cp -r ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version ${workdir}
cd ${workdir}