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
eb26dd6
chore: msys2 win 32 and 64 bit toolchain and build scripts
Nov 13, 2023
12a0476
Add options --project-root-dir and -extra-build-options
Nov 14, 2023
29a2abf
Fix help info
Nov 14, 2023
70c0c70
Remove build-options defaults and remove checkout when no-repo-fetch
Nov 14, 2023
aa21aed
Renamed files, fixes and add features
Nov 21, 2023
ddd6a8c
Regress arm version to v10 to match Dockerfile
Nov 21, 2023
d9590e4
Shorten build folder names
Nov 25, 2023
26750ee
Remove superceded files
May 10, 2024
14cb793
Fixes for ADC
May 14, 2024
316bb7b
Modify ARM intall instructions
May 15, 2024
cc50947
Add arm toolchain dir option and other fixes
May 15, 2024
cffc60b
Rename delete output directory option
May 15, 2024
774be34
More tweaks
May 15, 2024
15b451f
Remove help note
May 15, 2024
1b7c5ac
Launch ARM toolchain Windows installer from MSYS2
May 16, 2024
793f1ec
Add support for T15
May 17, 2024
514d6a4
Fix 32 bit arm toolchain path add more options
Jun 2, 2024
505062e
Remove submodules
elecpower Oct 20, 2024
b4bbf4c
Switch from hard coded to dynamic supported radios
elecpower Oct 24, 2024
d76c96c
Fixes, code cleaning and better processing of hw defs
elecpower Oct 26, 2024
7cbb897
Allow no checking of radio type
elecpower Oct 27, 2024
e7d6736
More housekeeping
elecpower Oct 27, 2024
5a5a268
Fix usage by hard coding defaults
elecpower Oct 27, 2024
32195b3
More housekeeping
elecpower Oct 28, 2024
eefde90
More tweaks
elecpower Oct 30, 2024
b59149d
Option to use local config files
elecpower Oct 31, 2024
35963fc
Improve config downloads
elecpower Oct 31, 2024
66b82bd
Various fixes
elecpower Nov 2, 2024
1602f0a
Fixes and tweaks
elecpower Nov 5, 2024
855fe6a
Rename script files
elecpower Nov 5, 2024
17a0560
Fix renamed include
elecpower Nov 5, 2024
97d6682
Fix build summary file paths
elecpower Nov 5, 2024
44c3327
More housekeeping
elecpower Nov 5, 2024
e32cca8
Fix hwdefs generate
elecpower Nov 16, 2024
ec90aa0
Use local repo config if not being overwritten by repo clone or refresh
elecpower Nov 16, 2024
e1faa4d
Rename variable
elecpower Nov 16, 2024
3e22e22
Fix all radio type, add default radio type and test for nothing to do
elecpower Nov 16, 2024
a7eb504
Force generate hwdefs to rebuild for each radio
elecpower Nov 16, 2024
3d63345
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 gx12
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