Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update MSYS2 Windows 32 and 64 bit toolchain and build scripts #4314

Open
wants to merge 39 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
b099474
chore: msys2 win 32 and 64 bit toolchain and build scripts
Nov 13, 2023
534c9ae
Add options --project-root-dir and -extra-build-options
Nov 14, 2023
18f4612
Fix help info
Nov 14, 2023
32fd6de
Remove build-options defaults and remove checkout when no-repo-fetch
Nov 14, 2023
edb62c2
Renamed files, fixes and add features
Nov 21, 2023
e4dc04a
Regress arm version to v10 to match Dockerfile
Nov 21, 2023
f8032f8
Shorten build folder names
Nov 25, 2023
426959b
Remove superceded files
May 10, 2024
fd949c0
Fixes for ADC
May 14, 2024
2e6c37c
Modify ARM intall instructions
May 15, 2024
22286f5
Add arm toolchain dir option and other fixes
May 15, 2024
d13d3d9
Rename delete output directory option
May 15, 2024
121ba1c
More tweaks
May 15, 2024
0372821
Remove help note
May 15, 2024
d2fd187
Launch ARM toolchain Windows installer from MSYS2
May 16, 2024
476da13
Add support for T15
May 17, 2024
476fba5
Fix 32 bit arm toolchain path add more options
Jun 2, 2024
5295368
Remove submodules
elecpower Oct 20, 2024
efe4df5
Switch from hard coded to dynamic supported radios
elecpower Oct 24, 2024
3e07414
Fixes, code cleaning and better processing of hw defs
elecpower Oct 26, 2024
ee398a0
Allow no checking of radio type
elecpower Oct 27, 2024
81dfcda
More housekeeping
elecpower Oct 27, 2024
5208591
Fix usage by hard coding defaults
elecpower Oct 27, 2024
63d78af
More housekeeping
elecpower Oct 28, 2024
34d8745
More tweaks
elecpower Oct 30, 2024
bcf6f50
Option to use local config files
elecpower Oct 31, 2024
da31507
Improve config downloads
elecpower Oct 31, 2024
9fa12f9
Various fixes
elecpower Nov 2, 2024
e072ccd
Fixes and tweaks
elecpower Nov 5, 2024
2a52712
Rename script files
elecpower Nov 5, 2024
c3eba09
Fix renamed include
elecpower Nov 5, 2024
0de51ab
Fix build summary file paths
elecpower Nov 5, 2024
875c3d1
More housekeeping
elecpower Nov 5, 2024
d8e75e2
Fix hwdefs generate
elecpower Nov 16, 2024
667d53d
Use local repo config if not being overwritten by repo clone or refresh
elecpower Nov 16, 2024
7f4a864
Rename variable
elecpower Nov 16, 2024
08f44dc
Fix all radio type, add default radio type and test for nothing to do
elecpower Nov 16, 2024
fb12931
Force generate hwdefs to rebuild for each radio
elecpower Nov 16, 2024
83e2a80
Add tools for uf2
elecpower Nov 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions tools/build-common.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# not every radio that has firmware may have a simulator
declare -a simulator_plugins=(x9lite x9lites
x7 x7access
t8 t12 t12max tx12 tx12mk2
zorro commando8 boxer pocket mt12
tlite tpro tprov2 tpros bumblebee lr3pro t14
x9d x9dp x9dp2019 x9e
xlite xlites
nv14 el18 pl18 pl18ev
x10 x10express x12s
t15 t16 t18 t20 t20v2 tx16s f16 v16)

get_target_build_options() {
local target_name=$1

Expand Down
17 changes: 3 additions & 14 deletions tools/build-companion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
set -x

SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
. "$SCRIPT_DIR/build-common.sh"
. "$SCRIPT_DIR/build-common.sh"

if [ "$(uname)" = "Darwin" ]; then
num_cpus=$(sysctl -n hw.ncpu)
Expand Down Expand Up @@ -66,23 +66,12 @@ rm -rf build
mkdir build
cd build

declare -a simulator_plugins=(x9lite x9lites
x7 x7access
t8 t12 t12max tx12 tx12mk2
zorro commando8 boxer pocket mt12
tlite tpro tprov2 tpros bumblebee lr3pro t14
x9d x9dp x9dp2019 x9e
xlite xlites
nv14 el18 pl18 pl18ev
x10 x10express x12s
t15 t16 t18 t20 t20v2 tx16s f16 v16)

for plugin in "${simulator_plugins[@]}"
do
BUILD_OPTIONS="${COMMON_OPTIONS} "

echo "Building ${plugin}"

if ! get_target_build_options "$plugin"; then
echo "Error: Failed to find a match for target '$plugin'"
exit 1
Expand All @@ -92,7 +81,7 @@ do
cmake ${BUILD_OPTIONS} "${SRCDIR}"
cmake --build . --target native-configure
cmake --build native -j"${JOBS}" --target libsimulator
done
done

cmake --build . --target native-configure
if [ "$(uname)" = "Darwin" ]; then
Expand Down
Loading
Loading