merge windowscreatezip.sh and windowsdiskbrowsercreatezip.sh

This commit is contained in:
Jean-François DEL NERO
2025-06-14 23:11:01 +02:00
parent 0e60382add
commit 3a4e0ab10b
3 changed files with 25 additions and 20 deletions
+3 -3
View File
@@ -26,7 +26,7 @@ jobs:
- name: Build - name: Build
run: sudo apt install -q -y mingw-w64 && cd build && make TARGET=mingw32 -j2 run: sudo apt install -q -y mingw-w64 && cd build && make TARGET=mingw32 -j2
- name: Package - name: Package
run: cd build && ./windowscreatezip.sh _x86 run: cd build && ./windowscreatezip.sh _x86 HXCSOFT
- uses: actions/upload-artifact@main - uses: actions/upload-artifact@main
with: with:
name: hxcfloppyemulator-winx86-${{ github.sha }} name: hxcfloppyemulator-winx86-${{ github.sha }}
@@ -39,7 +39,7 @@ jobs:
- name: Build - name: Build
run: sudo apt install -q -y mingw-w64 && cd build && make TARGET=mingw32 STANDALONEFSBROWSER_BUILD=1 -j2 run: sudo apt install -q -y mingw-w64 && cd build && make TARGET=mingw32 STANDALONEFSBROWSER_BUILD=1 -j2
- name: Package - name: Package
run: cd build && ./windowsdiskbrowsercreatezip.sh _x86 run: cd build && ./windowscreatezip.sh _x86 DOSDISKBROWSER
- uses: actions/upload-artifact@main - uses: actions/upload-artifact@main
with: with:
name: hxcfloppyemulator-dosdiskbrowser-winx86-${{ github.sha }} name: hxcfloppyemulator-dosdiskbrowser-winx86-${{ github.sha }}
@@ -52,7 +52,7 @@ jobs:
- name: Build - name: Build
run: sudo apt install -q -y mingw-w64 && cd build && make TARGET=mingw64 -j2 run: sudo apt install -q -y mingw-w64 && cd build && make TARGET=mingw64 -j2
- name: Package - name: Package
run: cd build && ./windowscreatezip.sh _x64 run: cd build && ./windowscreatezip.sh _x64 HXCSOFT
- uses: actions/upload-artifact@main - uses: actions/upload-artifact@main
with: with:
name: hxcfloppyemulator-winx64-${{ github.sha }} name: hxcfloppyemulator-winx64-${{ github.sha }}
+22 -9
View File
@@ -1,10 +1,23 @@
mkdir HxCFloppyEmulator_Software if [ "$2" = "HXCSOFT" ]; then
mkdir HxCFloppyEmulator_Software/Windows$1 mkdir HxCFloppyEmulator_Software
cp ../hxcfloppyemulator_soft_release_notes.txt ./HxCFloppyEmulator_Software/ || exit 1 mkdir HxCFloppyEmulator_Software/Windows$1
cp ../HxCFloppyEmulator_software/COPYING ./HxCFloppyEmulator_Software/ || exit 1 cp ../hxcfloppyemulator_soft_release_notes.txt ./HxCFloppyEmulator_Software/ || exit 1
cp ../HxCFloppyEmulator_software/COPYING_FULL ./HxCFloppyEmulator_Software/ || exit 1 cp ../HxCFloppyEmulator_software/COPYING ./HxCFloppyEmulator_Software/ || exit 1
cp *.dll ./HxCFloppyEmulator_Software/Windows$1/ || exit 1 cp ../HxCFloppyEmulator_software/COPYING_FULL ./HxCFloppyEmulator_Software/ || exit 1
cp *.exe ./HxCFloppyEmulator_Software/Windows$1/ || exit 1 cp *.dll ./HxCFloppyEmulator_Software/Windows$1/ || exit 1
cp ../libhxcfe/sources/init.script ./HxCFloppyEmulator_Software/Windows$1/config.script || exit 1 cp *.exe ./HxCFloppyEmulator_Software/Windows$1/ || exit 1
cp ../libhxcfe/sources/init.script ./HxCFloppyEmulator_Software/Windows$1/config.script || exit 1
zip -r HxCFloppyEmulator_Software_win$1.zip HxCFloppyEmulator_Software/ zip -r HxCFloppyEmulator_Software_win$1.zip HxCFloppyEmulator_Software/
fi
if [ "$2" = "DOSDISKBROWSER" ]; then
mkdir HxCFloppyEmulator_DosDiskBrowser
mkdir HxCFloppyEmulator_DosDiskBrowser/Windows$1
cp ../HxCFloppyEmulator_software/COPYING ./HxCFloppyEmulator_DosDiskBrowser/ || exit 1
cp ../HxCFloppyEmulator_software/COPYING_FULL ./HxCFloppyEmulator_DosDiskBrowser/ || exit 1
cp libhxcfe.dll ./HxCFloppyEmulator_DosDiskBrowser/Windows$1/ || exit 1
cp DosDiskBrowser.exe ./HxCFloppyEmulator_DosDiskBrowser/Windows$1/ || exit 1
zip -r HxCFloppyEmulator_DosDiskBrowser_win$1.zip HxCFloppyEmulator_DosDiskBrowser/
fi
-8
View File
@@ -1,8 +0,0 @@
mkdir HxCFloppyEmulator_DosDiskBrowser
mkdir HxCFloppyEmulator_DosDiskBrowser/Windows$1
cp ../HxCFloppyEmulator_software/COPYING ./HxCFloppyEmulator_DosDiskBrowser/ || exit 1
cp ../HxCFloppyEmulator_software/COPYING_FULL ./HxCFloppyEmulator_DosDiskBrowser/ || exit 1
cp libhxcfe.dll ./HxCFloppyEmulator_DosDiskBrowser/Windows$1/ || exit 1
cp DosDiskBrowser.exe ./HxCFloppyEmulator_DosDiskBrowser/Windows$1/ || exit 1
zip -r HxCFloppyEmulator_DosDiskBrowser_win$1.zip HxCFloppyEmulator_DosDiskBrowser/