Skip to content

Commit 6ac81bb

Browse files
hotbsohotbso
committed
fix build
1 parent 4369861 commit 6ac81bb

3 files changed

Lines changed: 88 additions & 104 deletions

File tree

‎.github/workflows/release.yaml‎

Lines changed: 84 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v6
2222

23-
- name: Get XPlane SDK + xplib
23+
- name: Get XPlane SDK + xplib + AutoDGS
2424
shell: bash
2525
run: |
2626
SDK_VERSION=411
2727
curl -L "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sdk_zip_files/XPSDK${SDK_VERSION}.zip" -o "XPSDK${SDK_VERSION}.zip"
2828
unzip XPSDK${SDK_VERSION}.zip
2929
mv SDK ../
3030
git clone https://github.com/hotbso/xplib.git ../xplib
31+
git clone https://github.com/hotbso/AutoDGS.git ../AutoDGS
3132
3233
- uses: melusina-org/setup-macports@v1
3334
if: startsWith(matrix.os, 'macos')
@@ -78,29 +79,24 @@ jobs:
7879
7980
- uses: actions/checkout@v6
8081

81-
- name: Get XPlane SDK + xplib
82+
- name: Get XPlane SDK + xplib + AutoDGS
8283
shell: bash
8384
run: |
8485
SDK_VERSION=411
8586
curl -L "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sdk_zip_files/XPSDK${SDK_VERSION}.zip" -o "XPSDK${SDK_VERSION}.zip"
8687
unzip XPSDK${SDK_VERSION}.zip
8788
mv SDK ../
8889
git clone https://github.com/hotbso/xplib.git ../xplib
90+
git clone https://github.com/hotbso/AutoDGS.git ../AutoDGS
8991
90-
- name: Get libOpenal32
91-
shell: bash
92-
run: |
93-
curl -L https://github.com/hotbso/libOpenAL32/archive/refs/heads/main.zip -o libOpenal32.zip
94-
unzip libOpenal32.zip
95-
96-
- name: Build Windows binaries
92+
- name: Build Windows binaries
9793
shell: msys2 {0}
9894
run: |
9995
TAG=${GITHUB_REF##*/}
10096
if [ ! -z "$TAG" ]; then
10197
echo "VERSION=$TAG" > version.mak
10298
fi
103-
make -f Makefile.mgw64 OPENAL=./libOpenAL32-main
99+
make -f Makefile.mgw64
104100
tar cvf binary.tar openSAM-pkg*/openSAM/*_x64
105101
106102
- name: Upload Build Artifact
@@ -146,104 +142,92 @@ jobs:
146142
do
147143
tar xvf $t
148144
done
149-
bash ./sync_xp11_pkg.sh
150145
151146
- name: Prepare Skunkcrafts Updater
152147
shell: bash
153148
run: |
154149
# at this point version.mak should have the version number
155150
source version.mak
156151
157-
for XP_VERSION in XP11 XP12; do
158-
if [ $XP_VERSION == "XP11" ]; then
159-
OPENSAM_ARTIFACT=openSAM-pkg_XP11
160-
else
161-
OPENSAM_ARTIFACT=openSAM-pkg
162-
fi
163-
164-
RELEASE_FOLDER=release/${XP_VERSION}
165-
OPENSAM_FOLDER=$RELEASE_FOLDER/openSAM
166-
OPENSAM_LIBRARY_FOLDER=$RELEASE_FOLDER/openSAM_Library
167-
168-
mkdir -p ${OPENSAM_FOLDER}
169-
mkdir -p ${OPENSAM_FOLDER}/lua
170-
mkdir -p ${OPENSAM_LIBRARY_FOLDER}
171-
172-
echo "=============== RELEASE FOLDER ==============="
173-
cp ${OPENSAM_ARTIFACT}/LICENSE $RELEASE_FOLDER/.
174-
cp ${OPENSAM_ARTIFACT}/Credits_and_Licensing.txt $RELEASE_FOLDER/.
175-
cp ${OPENSAM_ARTIFACT}/README.html $RELEASE_FOLDER/.
176-
cp ${OPENSAM_ARTIFACT}/MisterX-License.jpg $RELEASE_FOLDER/.
177-
178-
echo "=============== OPEN SAM ARTIFACT ==============="
179-
rsync -av ${OPENSAM_ARTIFACT}/openSAM/ ${OPENSAM_FOLDER}/
180-
cp -r openSAM-pkg/lua/* ${OPENSAM_FOLDER}/lua
181-
cp ${OPENSAM_ARTIFACT}/LICENSE ${OPENSAM_FOLDER}/.
182-
cp ${OPENSAM_ARTIFACT}/Credits_and_Licensing.txt ${OPENSAM_FOLDER}/.
183-
cp ${OPENSAM_ARTIFACT}/README.html ${OPENSAM_FOLDER}/.
184-
ls -l ${OPENSAM_FOLDER}
185-
echo
186-
187-
echo "=============== OPEN SAM LIBRARY ARTIFACT ==============="
188-
rsync -av ${OPENSAM_ARTIFACT}/openSAM_Library/ ${OPENSAM_LIBRARY_FOLDER}/
189-
cp ${OPENSAM_ARTIFACT}/LICENSE ${OPENSAM_LIBRARY_FOLDER}/.
190-
cp ${OPENSAM_ARTIFACT}/Credits_and_Licensing.txt ${OPENSAM_LIBRARY_FOLDER}/.
191-
cp ${OPENSAM_ARTIFACT}/README.html ${OPENSAM_LIBRARY_FOLDER}/.
192-
ls -l ${OPENSAM_LIBRARY_FOLDER}
193-
194-
## skunkcrafts for openSAM_Library
195-
sed -e "s|@FOLDER_NAME@|${OPENSAM_LIBRARY_FOLDER}|g" \
196-
-e "s|@XP_VERSION@|${XP_VERSION}|g" \
197-
-e "s|@VERSION@|${VERSION}|g" \
198-
-e "s|@NAME@|Library|g" \
199-
skunkcrafts_updater.cfg.template > "${OPENSAM_LIBRARY_FOLDER}/skunkcrafts_updater.cfg"
200-
sed -e "s|@FOLDER_NAME@|${OPENSAM_LIBRARY_FOLDER}|g" \
201-
-e "s|@XP_VERSION@|${XP_VERSION}|g" \
202-
-e "s|@VERSION@|${VERSION}|g" \
203-
-e "s|@NAME@|Library|g" \
204-
skunkcrafts_updater_beta.cfg.template > "${OPENSAM_LIBRARY_FOLDER}/skunkcrafts_updater_beta.cfg"
205-
## skunkcrafts for openSAM
206-
sed -e "s|@FOLDER_NAME@|${OPENSAM_FOLDER}|g" \
207-
-e "s|@XP_VERSION@|${XP_VERSION}|g" \
208-
-e "s|@VERSION@|${VERSION}|g" \
209-
-e "s|@NAME@||g" \
210-
skunkcrafts_updater.cfg.template > "${OPENSAM_FOLDER}/skunkcrafts_updater.cfg"
211-
sed -e "s|@FOLDER_NAME@|${OPENSAM_FOLDER}|g" \
212-
-e "s|@XP_VERSION@|${XP_VERSION}|g" \
213-
-e "s|@VERSION@|${VERSION}|g" \
214-
-e "s|@NAME@||g" \
215-
skunkcrafts_updater_beta.cfg.template > "${OPENSAM_FOLDER}/skunkcrafts_updater_beta.cfg"
216-
217-
find ${OPENSAM_FOLDER}/ -type f ! \( -name '*skunkcrafts_updater*' -o -path '*skunkcrafts_updater*' \) -print0 | while IFS= read -r -d '' file; do
218-
checksum_hex=$(crc32 "$file")
219-
# Convert hex checksum to uint32 decimal
220-
checksum_decimal=$((16#${checksum_hex}))
221-
# Remove "release/" prefix from $file
222-
modified_file="${file#${OPENSAM_FOLDER}/}"
223-
echo "$modified_file|$checksum_decimal" >> ${OPENSAM_FOLDER}/skunkcrafts_updater_whitelist.txt
224-
# Get file size in bytes
225-
filesize=$(stat -c%s "$file")
226-
echo "$modified_file|$filesize" >> ${OPENSAM_FOLDER}/skunkcrafts_updater_sizeslist.txt
227-
done
228-
229-
find ${OPENSAM_LIBRARY_FOLDER}/ -type f ! \( -name '*skunkcrafts_updater*' -o -path '*skunkcrafts_updater*' \) -print0 | while IFS= read -r -d '' file; do
230-
checksum_hex=$(crc32 "$file")
231-
# Convert hex checksum to uint32 decimal
232-
checksum_decimal=$((16#$checksum_hex))
233-
# Remove "release/" prefix from $file
234-
modified_file="${file#${OPENSAM_LIBRARY_FOLDER}/}"
235-
echo "$modified_file|$checksum_decimal" >> ${OPENSAM_LIBRARY_FOLDER}/skunkcrafts_updater_whitelist.txt
236-
# Get file size in bytes
237-
filesize=$(stat -c%s "$file")
238-
echo "$modified_file|$filesize" >> ${OPENSAM_LIBRARY_FOLDER}/skunkcrafts_updater_sizeslist.txt
239-
done
240-
241-
echo "00_README.txt" > ${OPENSAM_FOLDER}/skunkcrafts_updater_blacklist.txt
242-
echo "00_README.txt" > ${OPENSAM_LIBRARY_FOLDER}/skunkcrafts_updater_blacklist.txt
243-
244-
(cd ${RELEASE_FOLDER} && 7z a "${{ github.workspace }}/openSAM-${XP_VERSION}-${VERSION}.zip" *)
152+
OPENSAM_ARTIFACT=openSAM-pkg
153+
RELEASE_FOLDER=release
154+
OPENSAM_FOLDER=$RELEASE_FOLDER/openSAM
155+
OPENSAM_LIBRARY_FOLDER=$RELEASE_FOLDER/openSAM_Library
156+
157+
mkdir -p ${OPENSAM_FOLDER}
158+
mkdir -p ${OPENSAM_FOLDER}/lua
159+
mkdir -p ${OPENSAM_LIBRARY_FOLDER}
160+
161+
echo "=============== RELEASE FOLDER ==============="
162+
cp ${OPENSAM_ARTIFACT}/LICENSE $RELEASE_FOLDER/.
163+
cp ${OPENSAM_ARTIFACT}/Credits_and_Licensing.txt $RELEASE_FOLDER/.
164+
cp ${OPENSAM_ARTIFACT}/README.html $RELEASE_FOLDER/.
165+
cp ${OPENSAM_ARTIFACT}/MisterX-License.jpg $RELEASE_FOLDER/.
166+
167+
echo "=============== OPEN SAM ARTIFACT ==============="
168+
rsync -av ${OPENSAM_ARTIFACT}/openSAM/ ${OPENSAM_FOLDER}/
169+
cp -r openSAM-pkg/lua/* ${OPENSAM_FOLDER}/lua
170+
cp ${OPENSAM_ARTIFACT}/LICENSE ${OPENSAM_FOLDER}/.
171+
cp ${OPENSAM_ARTIFACT}/Credits_and_Licensing.txt ${OPENSAM_FOLDER}/.
172+
cp ${OPENSAM_ARTIFACT}/README.html ${OPENSAM_FOLDER}/.
173+
ls -l ${OPENSAM_FOLDER}
174+
echo
175+
176+
echo "=============== OPEN SAM LIBRARY ARTIFACT ==============="
177+
rsync -av ${OPENSAM_ARTIFACT}/openSAM_Library/ ${OPENSAM_LIBRARY_FOLDER}/
178+
cp ${OPENSAM_ARTIFACT}/LICENSE ${OPENSAM_LIBRARY_FOLDER}/.
179+
cp ${OPENSAM_ARTIFACT}/Credits_and_Licensing.txt ${OPENSAM_LIBRARY_FOLDER}/.
180+
cp ${OPENSAM_ARTIFACT}/README.html ${OPENSAM_LIBRARY_FOLDER}/.
181+
ls -l ${OPENSAM_LIBRARY_FOLDER}
182+
183+
## skunkcrafts for openSAM_Library
184+
sed -e "s|@FOLDER_NAME@|${OPENSAM_LIBRARY_FOLDER}|g" \
185+
-e "s|@VERSION@|${VERSION}|g" \
186+
-e "s|@NAME@|Library|g" \
187+
skunkcrafts_updater.cfg.template > "${OPENSAM_LIBRARY_FOLDER}/skunkcrafts_updater.cfg"
188+
sed -e "s|@FOLDER_NAME@|${OPENSAM_LIBRARY_FOLDER}|g" \
189+
-e "s|@VERSION@|${VERSION}|g" \
190+
-e "s|@NAME@|Library|g" \
191+
skunkcrafts_updater_beta.cfg.template > "${OPENSAM_LIBRARY_FOLDER}/skunkcrafts_updater_beta.cfg"
192+
## skunkcrafts for openSAM
193+
sed -e "s|@FOLDER_NAME@|${OPENSAM_FOLDER}|g" \
194+
-e "s|@VERSION@|${VERSION}|g" \
195+
-e "s|@NAME@||g" \
196+
skunkcrafts_updater.cfg.template > "${OPENSAM_FOLDER}/skunkcrafts_updater.cfg"
197+
sed -e "s|@FOLDER_NAME@|${OPENSAM_FOLDER}|g" \
198+
-e "s|@VERSION@|${VERSION}|g" \
199+
-e "s|@NAME@||g" \
200+
skunkcrafts_updater_beta.cfg.template > "${OPENSAM_FOLDER}/skunkcrafts_updater_beta.cfg"
201+
202+
find ${OPENSAM_FOLDER}/ -type f ! \( -name '*skunkcrafts_updater*' -o -path '*skunkcrafts_updater*' \) -print0 | while IFS= read -r -d '' file; do
203+
checksum_hex=$(crc32 "$file")
204+
# Convert hex checksum to uint32 decimal
205+
checksum_decimal=$((16#${checksum_hex}))
206+
# Remove "release/" prefix from $file
207+
modified_file="${file#${OPENSAM_FOLDER}/}"
208+
echo "$modified_file|$checksum_decimal" >> ${OPENSAM_FOLDER}/skunkcrafts_updater_whitelist.txt
209+
# Get file size in bytes
210+
filesize=$(stat -c%s "$file")
211+
echo "$modified_file|$filesize" >> ${OPENSAM_FOLDER}/skunkcrafts_updater_sizeslist.txt
245212
done
246213
214+
find ${OPENSAM_LIBRARY_FOLDER}/ -type f ! \( -name '*skunkcrafts_updater*' -o -path '*skunkcrafts_updater*' \) -print0 | while IFS= read -r -d '' file; do
215+
checksum_hex=$(crc32 "$file")
216+
# Convert hex checksum to uint32 decimal
217+
checksum_decimal=$((16#$checksum_hex))
218+
# Remove "release/" prefix from $file
219+
modified_file="${file#${OPENSAM_LIBRARY_FOLDER}/}"
220+
echo "$modified_file|$checksum_decimal" >> ${OPENSAM_LIBRARY_FOLDER}/skunkcrafts_updater_whitelist.txt
221+
# Get file size in bytes
222+
filesize=$(stat -c%s "$file")
223+
echo "$modified_file|$filesize" >> ${OPENSAM_LIBRARY_FOLDER}/skunkcrafts_updater_sizeslist.txt
224+
done
225+
226+
echo "00_README.txt" > ${OPENSAM_FOLDER}/skunkcrafts_updater_blacklist.txt
227+
echo "00_README.txt" > ${OPENSAM_LIBRARY_FOLDER}/skunkcrafts_updater_blacklist.txt
228+
229+
(cd ${RELEASE_FOLDER} && 7z a "${{ github.workspace }}/openSAM-${VERSION}.zip" *)
230+
247231
TAG=${GITHUB_REF##*/}
248232
TARGET_BRANCH="release"
249233
if [[ $TAG == *"-test-"* ]] # if TAG contains -test-
@@ -261,7 +245,7 @@ jobs:
261245
git config --global user.name "GH Release"
262246
git add release/
263247
# force add otherwise ignored directories
264-
git add -f release/XP*/openSAM/*_x64/
248+
git add -f release/openSAM/*_x64/
265249
git commit -m "new ${TARGET_BRANCH} - ${TAG}"
266250
git push -f -u origin ${TARGET_BRANCH}
267251

‎skunkcrafts_updater.cfg.template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ liveries|false
33
module|https://raw.githubusercontent.com/hotbso/openSAM/refs/heads/release/@FOLDER_NAME@/
44
version|@VERSION@
55
disabled|false
6-
name|openSAM @NAME@ @XP_VERSION@
7-
locked|false
6+
name|openSAM @NAME@
7+
locked|false

‎skunkcrafts_updater_beta.cfg.template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ liveries|false
33
module|https://raw.githubusercontent.com/hotbso/openSAM/refs/heads/beta/@FOLDER_NAME@/
44
version|@VERSION@
55
disabled|false
6-
name|openSAM @NAME@ @XP_VERSION@
7-
locked|false
6+
name|openSAM @NAME@
7+
locked|false

0 commit comments

Comments
 (0)