2.3 nightlies

tools/build-opentx.py

@@ -25,7 +25,7 @@ def main():
     print ("""<!DOCTYPE html>
     <html>
     <body>
-    <h1>OpenTX 2.2 Companion build...</h1>
+    <h1>OpenTX 2.3 Companion build...</h1>
     """)
 
     form = cgi.FieldStorage()

tools/nightly23/build-nightly.sh

@@ -2,10 +2,10 @@
 
 set -e
 
-branch=2.2
-docker=nightly22
-workdir=/home/opentx/nightly22
-output=/var/www/html/2.2/nightlies
+branch=2.3
+docker=nightly23
+workdir=/home/opentx/nightly23
+output=/var/www/html/2.3/nightlies
 version=2.3.0
 
 # Incrementnightly index
@@ -23,15 +23,15 @@ docker tag new-${docker} ${docker}
 docker rmi -f new-${docker}
 
 # Call sdcard generation
-code/tools/nightly22/build-sdcard.sh
+code/tools/nightly23/build-sdcard.sh
 
 # Build Linux companion
 docker run -dit --name companion -v /home/opentx/${docker}:/opentx ${docker}
 docker exec companion sh -c "mkdir -p build && cd build && cmake /opentx/code && cp radio/src/stamp.h /opentx/binaries/stamp-opentx.txt"
 docker exec companion rm -rf build
-if [ ! -f ${output}/companion/linux/companion22_${version}${suffix}_amd64.deb ]; then
+if [ ! -f ${output}/companion/linux/companion23_${version}${suffix}_amd64.deb ]; then
   docker exec companion /opentx/code/tools/build-companion-nightly.sh /opentx/code /opentx/binaries/ ${suffix}
-  cp -f  binaries/*.deb ${output}/companion/linux/companion22_${version}${suffix}_amd64.deb
+  cp -f  binaries/*.deb ${output}/companion/linux/companion23_${version}${suffix}_amd64.deb
 fi
 docker stop companion
 docker rm companion
@@ -39,12 +39,11 @@ docker rm companion
 # Request companion compilation on Windows
 if [ ! -f ${output}/companion/windows/companion-windows-${version}${suffix}.exe ]; then
   cd ${output}/companion/windows
-  wget -qO- http://winbox.open-tx.org/companion-builds/compile22.php?branch=$branch\&suffix=${suffix}
+  wget -qO- http://winbox.open-tx.org/companion-builds/compile23.php?branch=$branch\&suffix=${suffix}
   wget -O companion-windows-${version}${suffix}.exe http://winbox.open-tx.org/companion-builds/companion-windows-${version}${suffix}.exe
   chmod -Rf g+w companion-windows-${version}${suffix}.exe
 fi
 
-
 # Request companion compilation on Mac OS X
 if [ ! -f ${output}/companion/macosx/opentx-companion-${version}${suffix}.dmg ]; then
   cd ${output}/companion/macosx

tools/nightly23/build-sdcard.sh

@@ -2,12 +2,12 @@
 
 set -e
 
-branch=2.2
-workdir=/home/opentx/nightly22
-output=/var/www/html/2.2/nightlies
+branch=2.3
+workdir=/home/opentx/nightly23
+output=/var/www/html/2.3/nightlies
 
 # Handle opentx.sdcard.version
-sdcard_version="2.2V"$(grep 'set(SDCARD_REVISION' ${workdir}/code/CMakeLists.txt | grep -o '".*"' | sed 's/"//g')
+sdcard_version="2.3V"$(grep 'set(SDCARD_REVISION' ${workdir}/code/CMakeLists.txt | grep -o '".*"' | sed 's/"//g')
 echo ${sdcard_version} > ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version
 echo ${sdcard_version} > ${workdir}/code/radio/sdcard/taranis-x9/opentx.sdcard.version
 echo ${sdcard_version} > ${workdir}/code/radio/sdcard/taranis-x7/opentx.sdcard.version
@@ -28,14 +28,14 @@ else
   cp /home/opentx/horus-bitmaps/* ${workdir}/sdcard/horus/IMAGES/
 
   # Request sound pack generation
-  ${workdir}/code/tools/nightly22/tts.py en csv files
-  ${workdir}/code/tools/nightly22/tts.py fr csv files
-  ${workdir}/code/tools/nightly22/tts.py es csv files
-  ${workdir}/code/tools/nightly22/tts.py it csv files
-  ${workdir}/code/tools/nightly22/tts.py de csv files
-  ${workdir}/code/tools/nightly22/tts.py cz csv files
-  ${workdir}/code/tools/nightly22/tts.py pt csv files
-  ${workdir}/code/tools/nightly22/tts.py ru csv psv files
+  ${workdir}/code/tools/nightly23/tts.py en csv files
+  ${workdir}/code/tools/nightly23/tts.py fr csv files
+  ${workdir}/code/tools/nightly23/tts.py es csv files
+  ${workdir}/code/tools/nightly23/tts.py it csv files
+  ${workdir}/code/tools/nightly23/tts.py de csv files
+  ${workdir}/code/tools/nightly23/tts.py cz csv files
+  ${workdir}/code/tools/nightly23/tts.py pt csv files
+  ${workdir}/code/tools/nightly23/tts.py ru csv psv files
 
   # Create sdcards.zips for supported platforms
   mv /tmp/SOUNDS ${workdir}/sdcard/horus/

tools/nightly23/build-sdcard.sh.winbox

@@ -2,9 +2,9 @@
 
 set -e
 
-branch=2.2
-workdir=/home/opentx/nightly22
-output=/var/www/html/2.2/nightly
+branch=2.3
+workdir=/home/opentx/nightly23
+output=/var/www/html/2.3/nightly
 
 cd ${workdir}
 
@@ -17,7 +17,7 @@ mkdir -p ${workdir}/sdcard/horus/IMAGES
 cp /home/opentx/horus-bitmaps/* ${workdir}/sdcard/horus/IMAGES/
 
 # Request sound pack generation
-wget -qO- http://winbox.open-tx.org/voice-builds/compile22.php?branch=${branch}
+wget -qO- http://winbox.open-tx.org/voice-builds/compile23.php?branch=${branch}
 
 # Get sounds
 cd sdcard