From 793e971460d09c2ba2bab8b9a09d9cd3e6b62a74 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 23 Jun 2018 10:22:12 +0200 Subject: [PATCH] early release prep --- tools/release22/build-release.sh | 10 +++++----- tools/release22/build-sdcard.sh | 30 +++++++++++++----------------- tools/release22/tts.py | 30 +++++++++++++++++------------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/tools/release22/build-release.sh b/tools/release22/build-release.sh index 23e78703f..df3b3eb8d 100755 --- a/tools/release22/build-release.sh +++ b/tools/release22/build-release.sh @@ -5,7 +5,7 @@ set -e branch=2.2 docker=release22 workdir=/home/opentx/release22 -output=/var/www/html/2.2 +output=/var/www/html/2.2/release version=2.2.2 cd ${workdir} @@ -24,7 +24,7 @@ code/tools/release22/build-sdcard.sh 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/companion22_${version}_amd64.deb ]; then docker exec companion /opentx/code/tools/build-companion-release.sh /opentx/code /opentx/binaries/ docker exec companion sh -c "cp /build/radio/src/lua/*.txt /opentx/binaries" cp -f binaries/*.deb ${output}/companion/linux/companion22_${version}_amd64.deb @@ -34,7 +34,7 @@ docker stop companion docker rm companion # Request companion compilation on Windows -if [ ! -f ${output}/companion/windows/companion-windows-${version}${suffix}.exe ]; then +if [ ! -f ${output}/companion/windows/companion-windows-${version}.exe ]; then cd ${output}/companion/windows wget -qO- http://winbox.open-tx.org/companion-builds/compile22.php?branch=${branch} wget -O companion-windows-${version}.exe http://winbox.open-tx.org/companion-builds/companion-windows-${version}.exe @@ -42,7 +42,7 @@ if [ ! -f ${output}/companion/windows/companion-windows-${version}${suffix}.exe fi # Request companion compilation on Mac OS X -if [ ! -f ${output}/companion/macosx/opentx-companion-${version}${suffix}.dmg ]; then +if [ ! -f ${output}/companion/macosx/opentx-companion-${version}.dmg ]; then cd ${output}/companion/macosx wget -qO- http://opentx.blinkt.de:8080/~opentx/build-opentx.py?branch=${branch} wget -O opentx-companion-${version}.dmg http://opentx.blinkt.de:8080/~opentx/builds/opentx-companion-${version}.dmg @@ -51,7 +51,7 @@ fi # Update stamps cp -f $workdir/binaries/stamp-opentx.txt ${output}/firmware -echo "#define VERSION "'"2.2.0"' > ${output}/companion/companion-windows.stamp +echo "#define VERSION "'"2.2.2"' > ${output}/companion/companion-windows.stamp cp -f ${output}/companion/companion-windows.stamp ${output}/companion/companion-macosx.stamp cp -f ${output}/companion/companion-windows.stamp ${output}/companion/companion-linux.stamp diff --git a/tools/release22/build-sdcard.sh b/tools/release22/build-sdcard.sh index 59019e8fa..7dd386c26 100644 --- a/tools/release22/build-sdcard.sh +++ b/tools/release22/build-sdcard.sh @@ -4,7 +4,7 @@ set -e branch=2.2 workdir=/home/opentx/release22 -output=/var/www/html/2.2 +output=/var/www/html/2.2/release # Handle opentx.sdcard.version sdcard_version="2.2V"$(grep 'set(SDCARD_REVISION' ${workdir}/code/CMakeLists.txt | grep -o '".*"' | sed 's/"//g') @@ -27,19 +27,15 @@ else mkdir -p ${workdir}/sdcard/horus/IMAGES cp /home/opentx/horus-bitmaps/* ${workdir}/sdcard/horus/IMAGES/ - # Get images for Taranis x9 - mkdir -p ${workdir}/sdcard/taranis-x9/IMAGES - cp /home/opentx/x9-bitmaps/* ${workdir}/sdcard/taranis-x9/IMAGES/ - # Request sound pack generation - python3 -B ${workdir}/code/tools/release22/tts.py en csv files - python3 -B ${workdir}/code/tools/release22/tts.py fr csv files - python3 -B ${workdir}/code/tools/release22/tts.py es csv files - python3 -B ${workdir}/code/tools/release22/tts.py it csv files - python3 -B ${workdir}/code/tools/release22/tts.py de csv files - python3 -B ${workdir}/code/tools/nightly22/tts.py cz csv files - python3 -B ${workdir}/code/tools/nightly22/tts.py pt csv files - python3 -B ${workdir}/code/tools/nightly22/tts.py ru csv psv files + ${workdir}/code/tools/release22/tts.py en csv files + ${workdir}/code/tools/release22/tts.py fr csv files + ${workdir}/code/tools/release22/tts.py es csv files + ${workdir}/code/tools/release22/tts.py it csv files + ${workdir}/code/tools/release22/tts.py de csv files + ${workdir}/code/tools/release22/tts.py cz csv files + ${workdir}/code/tools/release22/tts.py pt csv files + ${workdir}/code/tools/release22/tts.py ru csv psv files # Create sdcards.zips for supported platforms mv /tmp/SOUNDS ${workdir}/sdcard/horus/ @@ -47,8 +43,8 @@ else mkdir ${workdir}/sdcard/taranis-x7/SOUNDS cp -r ${workdir}/sdcard/horus/SOUNDS ${workdir}/sdcard/taranis-x9/ cp -r ${workdir}/sdcard/horus/SOUNDS ${workdir}/sdcard/taranis-x7/ - cd ${workdir}/sdcard/horus && zip -r ${output}/sdcard/x12/sdcard-horus-${sdcard_version}.zip * - cd ${workdir}/sdcard/taranis-x9 && zip -r ${output}/sdcard/x9/sdcard-taranis-x9-${sdcard_version}.zip * - cd ${workdir}/sdcard/taranis-x7 && zip -r ${output}/sdcard/x7/sdcard-taranis-x7-${sdcard_version}.zip * + cd ${workdir}/sdcard/horus && zip -r ${output}/sdcard/opentx-x12s/sdcard-horus-${sdcard_version}.zip * + cd ${workdir}/sdcard/taranis-x9 && zip -r ${output}/sdcard/opentx-x9d/sdcard-taranis-x9-${sdcard_version}.zip * + cd ${workdir}/sdcard/taranis-x7 && zip -r ${output}/sdcard/opentx-x7/sdcard-taranis-x7-${sdcard_version}.zip * rm -Rf ${workdir}/sdcard -fi +fi \ No newline at end of file diff --git a/tools/release22/tts.py b/tools/release22/tts.py index 38914dcb4..fc42cfeb6 100755 --- a/tools/release22/tts.py +++ b/tools/release22/tts.py @@ -23,6 +23,9 @@ from gtts import gTTS from tts_common import * board = "taranis" +reload(sys) +sys.setdefaultencoding('utf8') + SOURCE_DIRECTORY = os.path.dirname(os.path.realpath(__file__)) lib_path = os.path.abspath(os.path.join(SOURCE_DIRECTORY, '..', '..', 'radio', 'util')) sys.path.append(lib_path) @@ -101,7 +104,7 @@ if __name__ == "__main__": if "csv" in sys.argv: path = "/tmp/SOUNDS/" + directory + "/SYSTEM/" if not os.path.exists(path): - os.makedirs(path) + os.makedirs(path) os.chdir(path) with open("%s-%s.csv" % (voice, board), "wb") as csvFile: for s, f in systemSounds: @@ -122,7 +125,7 @@ if __name__ == "__main__": if "psv" in sys.argv: path = "/tmp/SOUNDS/" + directory + "/" if not os.path.exists(path): - os.makedirs(path) + os.makedirs(path) os.chdir(path) with open("%s-%s.psv" % (voice, board), "wb") as csvFile: for s, f in systemSounds: @@ -134,15 +137,16 @@ if __name__ == "__main__": l = u"|" + f.replace(".wav", "") + u"|" + s + u"\r\n" csvFile.write(l.encode("windows-1251")) + if "files" in sys.argv: - path = "/tmp/SOUNDS/" + directory + "/SYSTEM/" - if not os.path.exists(path): - os.makedirs(path) - os.chdir(path) - for s, f in systemSounds: - if s and f: - generate(s, f) - os.chdir("..") - for s, f in sounds: - if s and f: - generate(s, f) + path = "/tmp/SOUNDS/" + directory + "/SYSTEM/" + if not os.path.exists(path): + os.makedirs(path) + os.chdir(path) + for s, f in systemSounds: + if s and f: + generate(s, f) + os.chdir("..") + for s, f in sounds: + if s and f: + generate(s, f)