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

feat(minor): Better showing of version info in firmware and cpn, remove seperate cpn32 build script (#1913)

Browse Source 
* fix: Prevent potential wordsplitting of variables

* chore: Remove need for separate cpn 32bit script

* Build script tag/branch/PR auto-detection

* Teach companion about VERSION_TAG

* Update some constant names

* Only one companion build script

* Actually use `VERSION_SUFFIX` in about screen 🤦

* Add space

* Remove line that was only for testing 32bit build

* Remove hyphen between win and bits

* Show codename in Settings -> Version

* cpn: Only show codename on tagged versions

* Update about screen also

* Double quotes around codename on colorlcd

* Update copyright year

* About screen should use VERSION_TAG when set
This commit is contained in:
Peter Feerick
2022-05-08 16:24:31 +10:00
committed by GitHub
parent 5196c2a916
commit b0e3cb015f
16 changed files with 80 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/linux_cpn.yml
+3 -3
View File
@@ -11,7 +11,7 @@ on:
paths:
- '.github/workflows/linux_cpn.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
pull_request:
branches:
@@ -21,7 +21,7 @@ on:
paths:
- '.github/workflows/linux_cpn.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
workflow_dispatch:
@@ -48,7 +48,7 @@ jobs:
shell: bash
run: |
mkdir output && \
tools/build-companion-nightly.sh "$(pwd)" "$(pwd)/output/"
tools/build-companion.sh "$(pwd)" "$(pwd)/output/"
- name: Compose release filename
# https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
.github/workflows/macosx_cpn.yml
+3 -3
View File
@@ -11,7 +11,7 @@ on:
paths:
- '.github/workflows/macosx_cpn.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
pull_request:
branches:
@@ -21,7 +21,7 @@ on:
paths:
- '.github/workflows/macosx_cpn.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
workflow_dispatch:
@@ -93,7 +93,7 @@ jobs:
shell: bash
run: |
mkdir output && \
tools/build-companion-nightly.sh "$(pwd)" "$(pwd)/output/"
tools/build-companion.sh "$(pwd)" "$(pwd)/output/"
- name: Compose release filename
# https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
.github/workflows/win-cpn-32.yml
+4 -4
View File
@@ -9,7 +9,7 @@ on:
paths:
- '.github/workflows/win_cpn-32.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
pull_request:
branches:
@@ -17,7 +17,7 @@ on:
paths:
- '.github/workflows/win_cpn-32.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
workflow_dispatch:
@@ -91,10 +91,10 @@ jobs:
run: |
mkdir output && \
CMAKE_PREFIX_PATH=$RUNNER_WORKSPACE/Qt/$QT_VERSION/$MINGW_PATH \
tools/build-companion-nightly-win32.sh "$(pwd)" "$(pwd)/output/"
tools/build-companion.sh "$(pwd)" "$(pwd)/output/"
- name: Compose release filename
# https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
run: echo "artifact_name=edgetx-cpn-win-32-${GITHUB_REF##*/}" >> $GITHUB_ENV
run: echo "artifact_name=edgetx-cpn-win32-${GITHUB_REF##*/}" >> $GITHUB_ENV
- name: Archive production artifacts
uses: actions/upload-artifact@v2
.github/workflows/win_cpn-64.yml
+4 -4
View File
@@ -11,7 +11,7 @@ on:
paths:
- '.github/workflows/win_cpn.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
pull_request:
branches:
@@ -21,7 +21,7 @@ on:
paths:
- '.github/workflows/win_cpn.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
workflow_dispatch:
@@ -94,11 +94,11 @@ jobs:
run: |
mkdir output && \
CMAKE_PREFIX_PATH=$RUNNER_WORKSPACE/Qt/$QT_VERSION/$MINGW_PATH \
tools/build-companion-nightly.sh "$(pwd)" "$(pwd)/output/"
tools/build-companion.sh "$(pwd)" "$(pwd)/output/"
- name: Compose release filename
# https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
run: echo "artifact_name=edgetx-cpn-win-64-${GITHUB_REF##*/}" >> $GITHUB_ENV
run: echo "artifact_name=edgetx-cpn-win64-${GITHUB_REF##*/}" >> $GITHUB_ENV
- name: Archive production artifacts
uses: actions/upload-artifact@v2
companion/src/constants.h
+1 -1
View File
@@ -83,6 +83,6 @@
#define CPN_STR_SW_INDICATOR_NEUT QCoreApplication::translate("RawSwitch", "-") // Switch neutral (middle) position indicator.
#define CPN_STR_SW_INDICATOR_REV QCoreApplication::translate("RawSwitch", "!") // Switch reversed logic (NOT) indicator.
#define OPENTX_HOME_PAGE_URL "https://edgetx.org"
#define EDGETX_HOME_PAGE_URL "https://edgetx.org"
#endif // _CONSTANTS_H_
companion/src/firmwares/opentx/opentxinterface.cpp
+1 -1
View File
@@ -1197,7 +1197,7 @@ QString OpenTxFirmware::getFirmwareUrl()
QString OpenTxFirmware::getReleaseNotesUrl()
{
return QString("%1/downloads").arg(OPENTX_HOME_PAGE_URL);
return QString("%1/downloads").arg(EDGETX_HOME_PAGE_URL);
}
QString OpenTxFirmware::getStampUrl()
companion/src/mainwindow.cpp
+7 -3
View File
@@ -65,7 +65,7 @@
#define INTERACTIVE_DOWNLOAD 4
#define AUTOMATIC_DOWNLOAD 8
#define OPENTX_DOWNLOADS_PAGE_URL QStringLiteral("https://edgetx.org/downloads")
#define EDGETX_DOWNLOADS_PAGE_URL QStringLiteral("https://edgetx.org/downloads")
#define DONATE_STR QStringLiteral("https://opencollective.com/edgetx/donate")
#ifdef Q_OS_MACOS
@@ -382,7 +382,7 @@ void MainWindow::checkForCompanionUpdateFinished(QNetworkReply * reply)
}
}
#else
QMessageBox::warning(this, tr("New release available"), tr("A new release of Companion is available, please check the <a href='%1'>EdgeTX website!</a>").arg(OPENTX_DOWNLOADS_PAGE_URL));
QMessageBox::warning(this, tr("New release available"), tr("A new release of Companion is available, please check the <a href='%1'>EdgeTX website!</a>").arg(EDGETX_DOWNLOADS_PAGE_URL));
#endif
}
else {
@@ -1023,9 +1023,13 @@ void MainWindow::about()
aboutStr.append("<br/><br/>");
aboutStr.append(tr("If you've found this program useful, please support by <a href='%1'>donating</a>").arg(DONATE_STR));
aboutStr.append("<br/><br/>");
aboutStr.append(QString("Version %1 \"%2\", %3").arg(VERSION).arg(CODENAME).arg(__DATE__));
#if defined(VERSION_TAG)
aboutStr.append(QString("Version %1 \"%2\", %3").arg(VERSION_TAG).arg(CODENAME).arg(__DATE__));
#else
aboutStr.append(QString("Version %1-%2, %3").arg(VERSION).arg(VERSION_SUFFIX).arg(__DATE__));
aboutStr.append("<br/>");
aboutStr.append(QString("Commit <a href='%1'>%2</a>").arg("https://github.com/EdgeTX/edgetx/commit/" GIT_STR).arg(GIT_STR));
#endif
aboutStr.append("<br/><br/>");
aboutStr.append(tr("File new <a href='%1'>Issue or Request</a>").arg("https://github.com/EdgeTX/edgetx/issues/new/choose"));
aboutStr.append("<br/><br/>");
companion/src/version.h.in
+1
View File
@@ -3,6 +3,7 @@
#define VERSION_MINOR @VERSION_MINOR@
#define VERSION_REVISION @VERSION_REVISION@
#define VERSION_SUFFIX "@VERSION_SUFFIX@"
#cmakedefine VERSION_TAG "@VERSION_TAG@"
#define CODENAME "@CODENAME@"
#define GIT_STR "@GIT_STR@"
radio/src/gui/128x64/view_about.cpp
+8 -4
View File
@@ -24,8 +24,12 @@
#define ABOUT_INDENT 4
const char ABOUT_VERSION_1[] = "EdgeTX " CODENAME "(" VERSION ")";
const char ABOUT_VERSION_2[] = "Copyright (C) 2021 EdgeTX";
#if defined(VERSION_TAG)
const char ABOUT_VERSION_1[] = "EdgeTX " "(" VERSION_TAG ")" "\036\"" CODENAME "\"";
#else
const char ABOUT_VERSION_1[] = "EdgeTX " "(" VERSION "-" VERSION_SUFFIX ")";
#endif
const char ABOUT_VERSION_2[] = "Copyright (C) 2022 EdgeTX";
const char ABOUT_VERSION_3[] = "https://edgetx.org";
void menuAboutView(event_t event)
@@ -41,6 +45,6 @@ void menuAboutView(event_t event)
lcdDrawText(1, 0, STR_ABOUTUS, DBLSIZE|INVERS);
lcdDrawText(ABOUT_INDENT, 22, ABOUT_VERSION_1, SMLSIZE);
lcdDrawText(ABOUT_INDENT, 30, ABOUT_VERSION_2, SMLSIZE);
lcdDrawText(ABOUT_INDENT, 38, ABOUT_VERSION_3, SMLSIZE);
lcdDrawText(ABOUT_INDENT, 38, ABOUT_VERSION_2, SMLSIZE);
lcdDrawText(ABOUT_INDENT, 46, ABOUT_VERSION_3, SMLSIZE);
}
radio/src/gui/212x64/view_about.cpp
+6 -2
View File
@@ -24,8 +24,12 @@
#define ABOUT_INDENT 6
const char ABOUT_VERSION_1[] = "EdgeTX " CODENAME "(" VERSION ")";
const char ABOUT_VERSION_2[] = "Copyright (C) 2021 EdgeTX";
#if defined(VERSION_TAG)
const char ABOUT_VERSION_1[] = "EdgeTX " "\"" CODENAME "\"" " (" VERSION_TAG ")";
#else
const char ABOUT_VERSION_1[] = "EdgeTX " "(" VERSION "-" VERSION_SUFFIX ")";
#endif
const char ABOUT_VERSION_2[] = "Copyright (C) 2022 EdgeTX";
const char ABOUT_VERSION_3[] = "https://edgetx.org";
void menuAboutView(event_t event)
radio/src/gui/colorlcd/view_about.cpp
+6 -2
View File
@@ -28,8 +28,12 @@ const uint8_t mask_qrcode[] = {
};
constexpr coord_t ABOUT_WIDTH = 220;
const std::string about_str = "EdgeTX" " " CODENAME " (" VERSION ")";
const std::string copyright_str = "Copyright (C) 2021 EdgeTX";
#if defined(VERSION_TAG)
const std::string about_str = "EdgeTX" " " "\"" CODENAME "\" (" VERSION_TAG ")";
#else
const std::string about_str = "EdgeTX" " (" VERSION "-" VERSION_SUFFIX ")";
#endif
const std::string copyright_str = "Copyright (C) 2022 EdgeTX";
AboutUs::AboutUs() :
MessageDialog(MainWindow::instance(), STR_ABOUT_US, "")
radio/src/stamp.cpp
+2 -2
View File
@@ -49,7 +49,7 @@
const char vers_stamp[] = "VERS" TAB ": Factory firmware (" GIT_STR ")";
#else
#if defined(VERSION_TAG)
const char vers_stamp[] = "VERS" TAB ": " VERSION_TAG DISPLAY_VERSION;
const char vers_stamp[] = "VERS" TAB ": " VERSION_TAG DISPLAY_VERSION "\"" CODENAME "\"";
#else
const char vers_stamp[] = "VERS" TAB ": " VERSION "-" VERSION_SUFFIX DISPLAY_VERSION " (" GIT_STR ")";
#endif
@@ -65,7 +65,7 @@
const char vers_stamp[] = "FW" TAB ": edgetx-" FLAVOUR "\036VERS" TAB ": Factory (" GIT_STR ")" "\036BUILT BY : EdgeTX" "\036DATE" TAB ": " DATE " " TIME "\036CFGV" TAB ": " CFGV_STR;
#else
#if defined(VERSION_TAG)
const char vers_stamp[] = "FW" TAB ": edgetx-" FLAVOUR "\036VERS" TAB ": " VERSION_TAG DISPLAY_VERSION "\036DATE" TAB ": " DATE " " TIME "\036CFGV" TAB ": " CFGV_STR;
const char vers_stamp[] = "FW" TAB ": edgetx-" FLAVOUR "\036VERS" TAB ": " VERSION_TAG DISPLAY_VERSION "\036NAME" ": " CODENAME "\036DATE" TAB ": " DATE " " TIME "\036CFGV" TAB ": " CFGV_STR;
#else
const char vers_stamp[] = "FW" TAB ": edgetx-" FLAVOUR "\036VERS" TAB ": " VERSION "-" VERSION_SUFFIX DISPLAY_VERSION "\036GIT#" TAB ": " GIT_STR "\036DATE" TAB ": " DATE " " TIME "\036CFGV" TAB ": " CFGV_STR;
#endif
tools/build-companion-nightly-win32.sh
-150
View File
@@ -1,150 +0,0 @@
#!/bin/bash
# Stops on first error, echo on
set -e
set -x
if [ "$(uname)" = "Darwin" ]; then
num_cpus=$(sysctl -n hw.ncpu)
: "${JOBS:=$num_cpus}"
else
JOBS=3
fi
while [ $# -gt 0 ]
do
case "$1" in
--jobs=*)
JOBS="${1#*=}";;
-j*)
JOBS="${1#*j}";;
-*)
echo >&2 "usage: $0 [-j<jobs>|--jobs=<jobs>] SRCDIR OUTDIR VERSION_SUFFIX"
exit 1;;
*)
break;; # terminate while loop
esac
shift
done
SRCDIR=$1
OUTDIR=$2
COMMON_OPTIONS="-DGVARS=YES -DHELI=YES -DLUA=YES -Wno-dev -DCMAKE_BUILD_TYPE=Release"
if [ "$(uname)" = "Darwin" ]; then
COMMON_OPTIONS="${COMMON_OPTIONS} -DCMAKE_OSX_DEPLOYMENT_TARGET='10.9'"
elif [ "$(uname)" != "Linux" ]; then
COMMON_OPTIONS="${COMMON_OPTIONS} -DSDL_LIBRARY_PATH=/mingw32/bin/"
fi
if [ "$3" != "" ]; then
COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=$3"
else
COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=nightly"
fi
rm -rf build
mkdir build
cd build
cmake ${COMMON_OPTIONS} -DPCB=X9LITE ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9LITES ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=ACCESS ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=T12 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=TX12 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=ZORRO ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=T8 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=TLITE ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=TPRO ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9D ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9D+ ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9D+ -DPCBREV=2019 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=XLITE ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=XLITES ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9E ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=NV14 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X10 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=T16 -DINTERNAL_MODULE_MULTI=YES ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=TX16S ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=T18 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=EXPRESS ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X12S ${SRCDIR}
make -j${JOBS} libsimulator
if [ "$(uname)" = "Darwin" ]; then
make -j${JOBS} package
cp *.dmg ${OUTDIR}
elif [ "$(uname)" = "Linux" ]; then
make -j${JOBS} package
cp *.AppImage ${OUTDIR}
else
make installer
cp companion/*.exe ${OUTDIR}
fi
tools/build-companion-release.sh
-134
View File
@@ -1,134 +0,0 @@
#!/bin/bash
# Stops on first error, echo on
set -e
set -x
if [ "$(uname)" = "Darwin" ]; then
num_cpus=$(sysctl -n hw.ncpu)
: "${JOBS:=$num_cpus}"
else
JOBS=3
fi
while [ $# -gt 0 ]
do
case "$1" in
--jobs=*)
JOBS="${1#*=}";;
-j*)
JOBS="${1#*j}";;
-*)
echo >&2 "usage: $0 [-j<jobs>|--jobs=<jobs>] SRCDIR OUTDIR VERSION_SUFFIX"
exit 1;;
*)
break;; # terminate while loop
esac
shift
done
SRCDIR=$1
OUTDIR=$2
COMMON_OPTIONS="-DGVARS=YES -DHELI=YES -DLUA=YES -DMULTIMODULE=YES -DTELEMETRY=FRSKY -DPPM_LIMITS_SYMETRICAL=YES -DVARIO=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
if [ "$3" != "" ]; then
COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=$3"
else
COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=release"
fi
rm -rf build
mkdir build
cd build
cmake ${COMMON_OPTIONS} -DPCB=X9LITE ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9LITES ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=ACCESS ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=T12 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=TX12 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=T8 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=TLITE ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9D ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9D+ ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9D+ -DPCBREV=2019 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=XLITE ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=XLITES ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9E ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X10 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=T16 -DINTERNAL_MODULE_MULTI=YES ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=TX16S ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=T18 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=EXPRESS ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X12S ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
make -j${JOBS} package
if [ "$(uname)" = "Darwin" ]; then
cp *.dmg ${OUTDIR}
else
cp *.deb ${OUTDIR}
fi
tools/build-companion-nightly.sh → tools/build-companion.sh
+29 -13
View File
@@ -19,7 +19,7 @@ do
-j*)
JOBS="${1#*j}";;
-*)
echo >&2 "usage: $0 [-j<jobs>|--jobs=<jobs>] SRCDIR OUTDIR VERSION_SUFFIX"
echo >&2 "usage: $0 [-j<jobs>|--jobs=<jobs>] SRCDIR OUTDIR"
exit 1;;
*)
break;; # terminate while loop
@@ -33,14 +33,30 @@ OUTDIR=$2
COMMON_OPTIONS="-DGVARS=YES -DHELI=YES -DLUA=YES -Wno-dev -DCMAKE_BUILD_TYPE=Release"
if [ "$(uname)" = "Darwin" ]; then
COMMON_OPTIONS="${COMMON_OPTIONS} -DCMAKE_OSX_DEPLOYMENT_TARGET='10.9'"
elif [ "$(uname)" != "Linux" ]; then
COMMON_OPTIONS="${COMMON_OPTIONS} -DSDL_LIBRARY_PATH=/mingw64/bin/"
elif [ "$(uname)" != "Linux" ]; then # Assume Windows and MSYS2
if [ "${MSYSTEM,,}" == "mingw32" ]; then # MSYS 32bit detected
COMMON_OPTIONS="${COMMON_OPTIONS} -DSDL_LIBRARY_PATH=/mingw32/bin/"
else # fallback to 64bit
COMMON_OPTIONS="${COMMON_OPTIONS} -DSDL_LIBRARY_PATH=/mingw64/bin/"
fi
fi
if [ "$3" != "" ]; then
COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=$3"
else
COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=nightly"
# Generate EDGETX_VERSION_SUFFIX if not already set
if [[ -z ${EDGETX_VERSION_SUFFIX} ]]; then
gh_type=$(echo "$GITHUB_REF" | awk -F / '{print $2}') #heads|tags|pull
if [[ $gh_type = "tags" ]]; then
# tags: refs/tags/<tag_name>
gh_tag=${GITHUB_REF##*/}
export EDGETX_VERSION_TAG=$gh_tag
elif [[ $gh_type = "pull" ]]; then
# pull: refs/pull/<pr_number>/merge
gh_pull_number=PR$(echo "$GITHUB_REF" | awk -F / '{print $3}')
export EDGETX_VERSION_SUFFIX=$gh_pull_number
elif [[ $gh_type = "heads" ]]; then
# heads: refs/heads/<branch_name>
gh_branch=${GITHUB_REF##*/}
export EDGETX_VERSION_SUFFIX=$gh_branch
fi
fi
rm -rf build
@@ -138,17 +154,17 @@ do
rm -f CMakeCache.txt native/CMakeCache.txt
cmake ${BUILD_OPTIONS} "${SRCDIR}"
cmake --build . --target native-configure
cmake --build native -j${JOBS} --target libsimulator
cmake --build native -j"${JOBS}" --target libsimulator
done
cmake --build . --target native-configure
if [ "$(uname)" = "Darwin" ]; then
cmake --build native -j${JOBS} --target package
cp native/*.dmg ${OUTDIR}
cmake --build native -j"${JOBS}" --target package
cp native/*.dmg "${OUTDIR}"
elif [ "$(uname)" = "Linux" ]; then
cmake --build native -j${JOBS} --target package
cp native/*.AppImage ${OUTDIR}
cmake --build native -j"${JOBS}" --target package
cp native/*.AppImage "${OUTDIR}"
else
cmake --build native --target installer
cp native/companion/*.exe ${OUTDIR}
cp native/companion/*.exe "${OUTDIR}"
fi
tools/build-gh.sh
+5 -5
View File
@@ -46,7 +46,7 @@ if [[ -n ${GCC_ARM} ]] ; then
export PATH=${GCC_ARM}:$PATH
fi
: ${SRCDIR:=$(dirname "$(pwd)/$0")/..}
: "${SRCDIR:=$(dirname "$(pwd)/$0")/..}"
# Generate EDGETX_VERSION_SUFFIX if not already set
if [[ -z ${EDGETX_VERSION_SUFFIX} ]]; then
@@ -66,13 +66,13 @@ if [[ -z ${EDGETX_VERSION_SUFFIX} ]]; then
fi
fi
: ${BUILD_TYPE:=Release}
: ${COMMON_OPTIONS:="-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_RULE_MESSAGES=OFF -Wno-dev "}
: ${EXTRA_OPTIONS:="$EXTRA_OPTIONS"}
: "${BUILD_TYPE:=Release}"
: "${COMMON_OPTIONS:="-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_RULE_MESSAGES=OFF -Wno-dev "}"
: "${EXTRA_OPTIONS:="$EXTRA_OPTIONS"}"
COMMON_OPTIONS+=${EXTRA_OPTIONS}
: ${FIRMARE_TARGET:="firmware-size"}
: "${FIRMARE_TARGET:="firmware-size"}"
# wipe build directory clean
rm -rf build && mkdir -p build && cd build