-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy pathbuild-simulator.sh.patch
More file actions
62 lines (57 loc) · 2.31 KB
/
build-simulator.sh.patch
File metadata and controls
62 lines (57 loc) · 2.31 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
diff --git a/tools/build-companion.sh b/tools/build-companion.sh
--- a/tools/build-companion.sh
+++ b/tools/build-companion.sh
@@ -51,7 +51,7 @@ if [[ -z ${EDGETX_VERSION_SUFFIX} ]]; then
fi
fi
-rm -rf build && mkdir build && cd build
+mkdir -p "${OUTDIR}" && cd "${OUTDIR}"
# Function to output error logs (works in both GitHub Actions and terminal)
output_error_log() {
@@ -123,8 +123,8 @@ run_pipeline() {
output_error_log "$log_file" "$context (Companion Build)"
return 1
fi
- if ! execute_with_output "📦 Packaging" "cmake_build_parallel native --target ${PACKAGE_TARGET}" "$log_file" "true"; then
- output_error_log "$log_file" "Final Packaging"
+ if ! execute_with_output "📦 Building simulator" "cmake_build_parallel native --target simulator ${cmake_opts}" "$log_file" "$show_details"; then
+ output_error_log "$log_file" "$context (Companion Build)"
return 1
fi
;;
@@ -161,8 +161,8 @@ get_platform_config() {
;;
"Linux")
PACKAGE_TARGET="package"
- PACKAGE_FILES="*.AppImage"
- PACKAGE_NAME="Linux AppImage"
+ PACKAGE_FILES="edgetx-companion edgetx-simulator libedgetx-*-simulator.so"
+ PACKAGE_NAME="Linux rpm"
PACKAGE_EMOJI="🐧"
;;
*)
@@ -245,7 +234,7 @@ for i in "${!simulator_plugins[@]}"; do
fi
error_status=0
- if ! build_plugin "$plugin"; then
+ if ! build_plugin "$plugin" true; then
FAILED_PLUGINS+=("$plugin")
error_status=1
fi
@@ -283,15 +272,15 @@ if [ ${#FAILED_PLUGINS[@]} -gt 0 ]; then
fi
if [[ -n "$GITHUB_ACTIONS" ]]; then
- echo "::group::📦 Final $PACKAGE_NAME Package"
+ echo "::group::📦 Final $PACKAGE_NAME Package files"
else
- echo "📦 Final $PACKAGE_NAME Package"
+ echo "📦 Final $PACKAGE_NAME Package files"
echo "=========================================="
fi
error_status=0
if run_pipeline "final" "final.log" "companion" "true"; then
- if cp native/$PACKAGE_FILES "${OUTDIR}" 2>/dev/null; then
+ if ( cd native && ls $PACKAGE_FILES 2>/dev/null ) ; then
echo " ✅ All builds completed successfully!"
echo " 📁 Package saved to: ${OUTDIR}"
else