diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/build-electron | 7 | ||||
| -rwxr-xr-x | bin/build-windows-installer | 13 |
2 files changed, 17 insertions, 3 deletions
diff --git a/bin/build-electron b/bin/build-electron index cdc98f9d..51bb7de4 100755 --- a/bin/build-electron +++ b/bin/build-electron @@ -1,10 +1,15 @@ #!/bin/bash +ARCH=$(python -c "import platform; n = platform.architecture()[0]; print(n)") set -e set -x if [ "$BUILD" = "windows" ]; then - args="-w --ia32" + if [ "$ARCH" = "32bit" ]; then + args="-w --ia32" + else + args="-w --x64" + fi elif [ "$BUILD" = "linux" ]; then args="-l" elif [ "$BUILD" = "osx" ]; then diff --git a/bin/build-windows-installer b/bin/build-windows-installer index 90f72d71..bf7b8288 100755 --- a/bin/build-windows-installer +++ b/bin/build-windows-installer @@ -1,6 +1,7 @@ #!/bin/bash VERSION="${VERSION:-$(echo ${GITHUB_REF} | sed -e 's|refs/heads/||' -e 's|refs/tags/||' -e 's|/|-|g')}" OS="${BUILD:-$(uname)}" +ARCH=$(python -c "import platform; n = platform.architecture()[0]; print(n)") # Create windows installer mkdir win cp installer_scripts/template.iss win/win_build.iss @@ -10,12 +11,20 @@ copyright_year="#define COPYRIGHT \""${info_year}"\"" version_block="#define VERSION \""${VERSION}"\"" sed -i'' -e '/;inkstitch-year/ a\'$'\n'"${copyright_year}"'' win/win_build.iss sed -i'' -e '/;inkstitch-version/ a\'$'\n'"${version_block}"'' win/win_build.iss +# set installer to stop 64bit version to be installed in 32bit Windows +if [[ ${ARCH} == "64bit" ]]; then + echo "64" + sed -i'' -e '/;arch-allowed/ a\'$'\n'"ArchitecturesAllowed=x64 arm64"'' win/win_build.iss +else + echo "32" + sed -i'' -e '/;arch-allowed/ a\'$'\n'"ArchitecturesAllowed=x86 x64 arm64"'' win/win_build.iss +fi iscc win/win_build.iss -mv win/inkstitch.exe artifacts/inkstitch-${VERSION}-${OS}.exe +mv win/inkstitch.exe artifacts/inkstitch-${VERSION}-${OS}-${ARCH}.exe cd dist echo "Creating zip" # The python zipfile command line utility can't handle directories # containing files with UTF-8 names on Windows, so we use 7-zip instead. -7z a ../artifacts/inkstitch-${VERSION}-${OS}.zip * +7z a ../artifacts/inkstitch-${VERSION}-${OS}-${ARCH}.zip * cd .. |