diff --git a/CMakeLists.txt b/CMakeLists.txt index f4d3efb..b6a761e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -388,10 +388,18 @@ if (WIN32) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/deployment/Strategr_x64.template.iss" "${CMAKE_CURRENT_SOURCE_DIR}/deployment/Strategr_x64.iss") + # Deploy Qt + add_custom_command(TARGET Strategr POST_BUILD COMMAND ${Qt5_DIR}/../../../bin/windeployqt.exe --no-translations ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + # Cleanup deployed dir + + add_custom_command(TARGET Strategr + POST_BUILD + COMMAND del /Q /F /S "*.manifest") + endif (CMAKE_BUILD_TYPE MATCHES Rel) endif () diff --git a/deployment/package.dmg b/deployment/package.dmg deleted file mode 100644 index 14b5cac..0000000 Binary files a/deployment/package.dmg and /dev/null differ diff --git a/scripts/macos_deploy.sh b/scripts/macos_deploy.sh index af9bba1..cfc17af 100755 --- a/scripts/macos_deploy.sh +++ b/scripts/macos_deploy.sh @@ -39,11 +39,12 @@ codesign -s "$DEVELOPER_CERTIFACATE_ID" \ --keychain "$HOME/Library/Keychains/login.keychain" "$dmg_path" rm -rf "$dmg_source_path" +rm "$dmg_template_path" echo ".dmg created" echo "Creating updater archive" cd "$build_path" || exit -zip -r --symlinks "macOS_update.zip" "Strategr.app" +zip -r --symlinks "Strategr.macOS.v$version.zip" "Strategr.app" echo "Updater archive created" diff --git a/scripts/release_latest.sh b/scripts/release_latest.sh index a74ab0a..1b05e5e 100755 --- a/scripts/release_latest.sh +++ b/scripts/release_latest.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash scripts/release.sh "$(scripts/repo_name.sh)" "$(git describe)" -- \ - "./builds/macOS/Release/Strategr-$(git describe).dmg" \ - "./builds/macOS/Release/macOS_update.zip" \ No newline at end of file + "./builds/macOS/Release/Strategr.$(git describe).dmg" \ + "./builds/macOS/Release/Strategr.macOS.$(git describe).zip" \ No newline at end of file