Tools for 2.2 release handling (#4649)
* Scripts * No suffix for docker image * generate sdcard file to subdirectories to match companion changes * Massively increase options for simus backup lua_fields info for lua docs * Allow both nightly and release to be built * $ ambiguity * Cleanup * Tidy up * Cosmetics
This commit is contained in:
3djc
@@ -25,16 +25,13 @@ done
|
||||
SRCDIR=$1
|
||||
OUTDIR=$2
|
||||
|
||||
COMMON_OPTIONS="-DALLOW_NIGHTLY_BUILDS=YES -DVERSION_SUFFIX=$3 -DGVARS=YES -DHELI=YES"
|
||||
COMMON_OPTIONS="-DALLOW_NIGHTLY_BUILDS=YES -DGVARS=YES -DHELI=YES -DLUA=YES -DMULTIMODULE=YES -DTELEMETRY=FRSKY -DPPM_LIMITS_SYMETRICAL=YES -DVARIO=YES -DGAUGES=YES -DAUTOSWITCH=YES -DAUTOSOURCE=YES -DAUDIO=YES -DGPS=YES -DPPM_CENTER_ADJUSTABLE=YES -DFLIGHT_MODES=YES -DOVERRIDE_CHANNEL_FUNCTION=YES -DFRSKY_STICKS=YES"
|
||||
if [ "$(uname)" = "Darwin" ]; then
|
||||
COMMON_OPTIONS="${COMMON_OPTIONS} -DCMAKE_PREFIX_PATH=~/Qt/5.7/clang_64/ -DCMAKE_OSX_DEPLOYMENT_TARGET='10.9'"
|
||||
fi
|
||||
|
||||
STM32_OPTIONS="${COMMON_OPTIONS} -DLUA=YES"
|
||||
|
||||
if [ "$3" == "" ]; then
|
||||
echo "Usage $0 SRCDIR OUTDIR VERSION_SUFFIX"
|
||||
exit 1
|
||||
if [ "$3" != "" ]; then
|
||||
COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=$3"
|
||||
fi
|
||||
|
||||
rm -rf build
|
||||
@@ -56,22 +53,22 @@ make -j${JOBS} libsimulator
|
||||
cmake ${COMMON_OPTIONS} -DPCB=9XRPRO ${SRCDIR}
|
||||
make -j${JOBS} libsimulator
|
||||
|
||||
cmake ${STM32_OPTIONS} -DPCB=X7 ${SRCDIR}
|
||||
cmake ${COMMON_OPTIONS} -DPCB=X7 ${SRCDIR}
|
||||
make -j${JOBS} libsimulator
|
||||
|
||||
cmake ${STM32_OPTIONS} -DPCB=X9D ${SRCDIR}
|
||||
cmake ${COMMON_OPTIONS} -DPCB=X9D ${SRCDIR}
|
||||
make -j${JOBS} libsimulator
|
||||
|
||||
cmake ${STM32_OPTIONS} -DPCB=X9D+ ${SRCDIR}
|
||||
cmake ${COMMON_OPTIONS} -DPCB=X9D+ ${SRCDIR}
|
||||
make -j${JOBS} libsimulator
|
||||
|
||||
cmake ${STM32_OPTIONS} -DPCB=X9E ${SRCDIR}
|
||||
cmake ${COMMON_OPTIONS} -DPCB=X9E ${SRCDIR}
|
||||
make -j${JOBS} libsimulator
|
||||
|
||||
cmake ${STM32_OPTIONS} -DPCB=X10 ${SRCDIR}
|
||||
cmake ${COMMON_OPTIONS} -DPCB=X10 ${SRCDIR}
|
||||
make -j${JOBS} libsimulator
|
||||
|
||||
cmake ${STM32_OPTIONS} -DPCB=X12S ${SRCDIR}
|
||||
cmake ${COMMON_OPTIONS} -DPCB=X12S ${SRCDIR}
|
||||
make -j${JOBS} libsimulator
|
||||
|
||||
make -j${JOBS} package
|
||||
|
||||
@@ -8,9 +8,9 @@ output=/var/www/html/2.2/nightly
|
||||
|
||||
# Handle opentx.sdcard.version
|
||||
sdcard_version="2.2V"$(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
|
||||
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
|
||||
|
||||
if cmp --silent ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version ${workdir}/opentx.sdcard.version
|
||||
then
|
||||
@@ -40,8 +40,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/sdcard-horus-$sdcard_version.zip *
|
||||
cd ${workdir}/sdcard/taranis-x9 && zip -r ${output}/sdcard/sdcard-taranis-x9-$sdcard_version.zip *
|
||||
cd ${workdir}/sdcard/taranis-x7 && zip -r ${output}/sdcard/sdcard-taranis-x7-$sdcard_version.zip *
|
||||
cd ${workdir}/sdcard/horus && zip -r ${output}/sdcard/sdcard-horus-${sdcard_version}.zip *
|
||||
cd ${workdir}/sdcard/taranis-x9 && zip -r ${output}/sdcard/sdcard-taranis-x9-${sdcard_version}.zip *
|
||||
cd ${workdir}/sdcard/taranis-x7 && zip -r ${output}/sdcard/sdcard-taranis-x7-${sdcard_version}.zip *
|
||||
rm -Rf ${workdir}/sdcard
|
||||
fi
|
||||
|
||||
Executable
+54
@@ -0,0 +1,54 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
branch=master
|
||||
docker=release22
|
||||
workdir=/home/opentx/release22
|
||||
output=/var/www/html/2.2
|
||||
version=2.2.0
|
||||
|
||||
cd ${workdir}
|
||||
|
||||
# Create on-demand build environment
|
||||
cp code/radio/util/Dockerfile .
|
||||
docker build -t new-${docker} .
|
||||
docker rmi -f ${docker} || true
|
||||
docker tag new-${docker} ${docker}
|
||||
docker rmi -f new-${docker}
|
||||
|
||||
# Call sdcard generation
|
||||
code/tools/release22/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
|
||||
docker exec companion /opentx/code/tools/build-companion.sh /opentx/code /opentx/binaries/
|
||||
docker stop companion
|
||||
docker rm companion
|
||||
cp -f binaries/*.deb ${output}/companion/linux/companion22_${version}_amd64.deb
|
||||
cp -f binaries/radio/src/lua/lua_fields_*.txt ${output}/firmware
|
||||
|
||||
# Request companion compilation on Windows
|
||||
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
|
||||
chmod -f g+w companion-windows-${version.exe
|
||||
|
||||
# Request companion compilation on Mac OS X
|
||||
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
|
||||
chmod -f g+w opentx-companion-${version}.dmg
|
||||
|
||||
# Update stamps
|
||||
cp -f $workdir/binaries/stamp-opentx.txt ${output}/firmware
|
||||
rm -f ${output}/companion/windows/companion-windows.stamp
|
||||
echo "#define VERSION "'"2.2.0"' >> ${output}/companion/windows/companion-windows.stamp
|
||||
cp -f ${output}/companion/windows/companion-windows.stamp ${output}/companion/linux/companion-windows.stamp
|
||||
cp -f ${output}/companion/windows/companion-windows.stamp ${output}/companion/linux/companion-macosx.stamp
|
||||
|
||||
# Clean binaries It will be hosting built on demand firmware
|
||||
rm -rf $workdir/binaries/*
|
||||
rm -rf $workdir/binaries/.lock
|
||||
@@ -0,0 +1,47 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
branch=master
|
||||
workdir=/home/opentx/release22
|
||||
output=/var/www/html/2.2
|
||||
|
||||
# Handle opentx.sdcard.version
|
||||
sdcard_version="2.2V"$(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
|
||||
|
||||
if cmp --silent ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version ${workdir}/opentx.sdcard.version
|
||||
then
|
||||
exit
|
||||
else
|
||||
cp -r ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version ${workdir}
|
||||
cd ${workdir}
|
||||
|
||||
# Copy git sdcard data
|
||||
rm -Rf ${workdir}/sdcard
|
||||
cp -r ${workdir}/code/radio/sdcard .
|
||||
|
||||
# Get images for Horus
|
||||
mkdir -p ${workdir}/sdcard/horus/IMAGES
|
||||
cp /home/opentx/horus-bitmaps/* ${workdir}/sdcard/horus/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
|
||||
|
||||
# Create sdcards.zips for supported platforms
|
||||
mv /tmp/SOUNDS ${workdir}/sdcard/horus/
|
||||
mkdir ${workdir}/sdcard/taranis-x9/SOUNDS
|
||||
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 *
|
||||
rm -Rf ${workdir}/sdcard
|
||||
fi
|
||||
Executable
+104
@@ -0,0 +1,104 @@
|
||||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
|
||||
# This script is a modified version to support Linux TTS fiel genration using PicoTTS
|
||||
|
||||
# Sound pack maintainers (incomplete list) by language alphabetical order
|
||||
# Czech : Martin Hotar
|
||||
# French : Bertrand Songis & André Bernet
|
||||
# English : Rob Thompson & Martin Hotar
|
||||
# German : Romolo Manfredini (Some corrections by Peer)
|
||||
# Italian : Romolo Manfredini
|
||||
# Portuguese : Romolo Manfredini
|
||||
# Spanish : Romolo Manfredini (With the help of Jose Moreno)
|
||||
|
||||
# from __future__ import print_function
|
||||
|
||||
import os
|
||||
import sys
|
||||
import subprocess
|
||||
import zipfile
|
||||
from tts_common import *
|
||||
board = "taranis"
|
||||
|
||||
lib_path = os.path.abspath(os.path.join('code', 'radio', 'util'))
|
||||
sys.path.append(lib_path)
|
||||
|
||||
def generate(str, filename):
|
||||
|
||||
command = "pico2wave -l=" + voice + " -w=" + filename + " \"" + str + "\""
|
||||
os.system(command.encode('utf-8'))
|
||||
|
||||
################################################################
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
|
||||
if "en" in sys.argv:
|
||||
from tts_en import systemSounds, sounds
|
||||
|
||||
directory = "en"
|
||||
voice = "en-US"
|
||||
|
||||
elif "fr" in sys.argv:
|
||||
from tts_fr import systemSounds, sounds
|
||||
|
||||
directory = "fr"
|
||||
voice = "fr-FR"
|
||||
|
||||
elif "it" in sys.argv:
|
||||
from tts_it import systemSounds, sounds
|
||||
|
||||
directory = "it"
|
||||
voice = "it-IT"
|
||||
|
||||
elif "de" in sys.argv:
|
||||
from tts_de import systemSounds, sounds
|
||||
|
||||
directory = "de"
|
||||
voice = "de-DE"
|
||||
|
||||
elif "es" in sys.argv:
|
||||
from tts_es import systemSounds, sounds
|
||||
|
||||
directory = "es"
|
||||
voice = "es-ES"
|
||||
|
||||
else:
|
||||
print("which language?")
|
||||
exit()
|
||||
|
||||
if "csv" in sys.argv:
|
||||
path = "/tmp/SOUNDS/" + directory + "/SYSTEM/"
|
||||
if not os.path.exists(path):
|
||||
os.makedirs(path)
|
||||
os.chdir(path)
|
||||
with open("%s-%s.csv" % (voice, board), "wb") as csvFile:
|
||||
for s, f in systemSounds:
|
||||
if s and f:
|
||||
l = u""
|
||||
if board in ("sky9x", "taranis"):
|
||||
l += u"SOUNDS/%s/SYSTEM;" % directory
|
||||
l += f + u";" + s + u"\n"
|
||||
csvFile.write(l.encode("utf-8"))
|
||||
for s, f in sounds:
|
||||
if s and f:
|
||||
l = u""
|
||||
if board in ("sky9x", "taranis"):
|
||||
l += u"SOUNDS/%s;" % directory
|
||||
l += f + u";" + s + u"\n"
|
||||
csvFile.write(l.encode("utf-8"))
|
||||
|
||||
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)
|
||||
@@ -0,0 +1,14 @@
|
||||
NO_ALTERNATE = 1024
|
||||
PROMPT_CUSTOM_BASE = 256
|
||||
PROMPT_SYSTEM_BASE = 0
|
||||
board = "taranis"
|
||||
|
||||
import sys
|
||||
|
||||
def filename(idx, alternate=0):
|
||||
ext = ".wav"
|
||||
if isinstance(idx, int):
|
||||
result = "%04d%s" % (idx, ext)
|
||||
elif board in ('sky9x', 'taranis'):
|
||||
result = idx + ext
|
||||
return result
|
||||
Reference in New Issue
Block a user