diff --git a/.github/workflows/touchHLE_release.yml b/.github/workflows/touchHLE_release.yml index aa73bdcd4..5bb95e25a 100644 --- a/.github/workflows/touchHLE_release.yml +++ b/.github/workflows/touchHLE_release.yml @@ -232,13 +232,16 @@ jobs: env: CMAKE: ${{ github.workspace }}\vendor\cmake\bin\cmake - name: Build - run: cargo build --release && move target/release/touchHLE.exe . + run: cargo build --release env: CMAKE: ${{ github.workspace }}\vendor\cmake\bin\cmake + - name: Create bundle + shell: bash + run: cd dev-scripts && ./make-windows-bundle.sh ../target/release/touchHLE.exe && mv touchHLE_windows_bundle/ .. - uses: actions/upload-artifact@v4 with: name: touchHLE_Windows_x86_64 - path: touchHLE.exe + path: touchHLE_windows_bundle/ - uses: actions/upload-artifact@v4 with: name: TestApp_built_on_Windows diff --git a/dev-scripts/.gitignore b/dev-scripts/.gitignore index d7625d856..391a550fd 100644 --- a/dev-scripts/.gitignore +++ b/dev-scripts/.gitignore @@ -1,2 +1,3 @@ /new_release /touchHLE.app +/touchHLE_windows_bundle diff --git a/dev-scripts/make-macos-bundle.sh b/dev-scripts/make-macos-bundle.sh index 862a8b1af..01397575f 100755 --- a/dev-scripts/make-macos-bundle.sh +++ b/dev-scripts/make-macos-bundle.sh @@ -1,6 +1,9 @@ #!/bin/sh set -e +# Creates the .app bundle containing the basic set of files needed for touchHLE +# to run. + if [[ $# == 1 ]]; then PATH_TO_BINARY="$1" shift diff --git a/dev-scripts/make-windows-bundle.sh b/dev-scripts/make-windows-bundle.sh new file mode 100644 index 000000000..2cd073fe7 --- /dev/null +++ b/dev-scripts/make-windows-bundle.sh @@ -0,0 +1,21 @@ +#!/bin/sh +set -e + +# Bundles the touchHLE executable with the basic set of files needed for +# touchHLE to run (the same ones found in the macOS .app bundle or Android APK). +# This does not prepare a full release. + +if [[ $# == 1 ]]; then + PATH_TO_BINARY="$1" + shift + + rm -rf touchHLE_windows_bundle + mkdir touchHLE_windows_bundle + cp $PATH_TO_BINARY touchHLE_windows_bundle/ + cp -r ../touchHLE_dylibs touchHLE_windows_bundle/ + cp -r ../touchHLE_fonts touchHLE_windows_bundle/ + cp -r ../touchHLE_default_options.txt touchHLE_windows_bundle/ +else + echo "Incorrect usage." + exit 1 +fi