diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7fa88d1648..92ce538d9c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -68,7 +68,7 @@ jobs: if-no-files-found: error msvc: - name: VS 2022 ${{ matrix.config.arch }}-${{ matrix.type }} + name: VS 2022 ${{ matrix.config.arch }} runs-on: windows-2025 env: VCPKG_DEFAULT_TRIPLET: ${{matrix.config.vcpkg_triplet}} @@ -86,10 +86,6 @@ jobs: generator: "-G'Visual Studio 17 2022' -A x64", vcpkg_triplet: x64-windows } - type: [portable] -# type: [portable, installer] -# The installer type is working, but disabled, to save runner jobs. -# Enable it, when working on the installer. steps: - uses: actions/checkout@v6 @@ -109,7 +105,7 @@ jobs: -DENABLE_POSTGRESQL=OFF ` -DENABLE_LUAJIT=TRUE ` -DREQUIRE_LUAJIT=TRUE ` - -DRUN_IN_PLACE=${{ contains(matrix.type, 'portable') }} . + -DRUN_IN_PLACE=1 . - name: Build run: cmake --build . --config Release @@ -123,20 +119,11 @@ jobs: - name: CPack run: | - If ($env:TYPE -eq "installer") - { - cpack -G WIX -B "$env:GITHUB_WORKSPACE\Package" - } - ElseIf($env:TYPE -eq "portable") - { - cpack -G ZIP -B "$env:GITHUB_WORKSPACE\Package" - } + cpack -G ZIP -B "$env:GITHUB_WORKSPACE\Package" rm -r $env:GITHUB_WORKSPACE\Package\_CPack_Packages - env: - TYPE: ${{matrix.type}} - uses: actions/upload-artifact@v5 with: - name: msvc-${{ matrix.config.arch }}-${{ matrix.type }} + name: msvc-${{ matrix.config.arch }} path: .\Package\ if-no-files-found: error diff --git a/CMakeLists.txt b/CMakeLists.txt index a7068127ff..1d69a3995d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -321,41 +321,13 @@ if(WIN32) # Include all dynamically linked runtime libraries such as MSVCRxxx.dll include(InstallRequiredSystemLibraries) - if(RUN_IN_PLACE) - if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win64") - else() - set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32") - endif() - - set(CPACK_GENERATOR ZIP) - + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win64") else() - set(CPACK_GENERATOR WIX) - set(CPACK_PACKAGE_NAME "${PROJECT_NAME_CAPITALIZED}") - set(CPACK_PACKAGE_INSTALL_DIRECTORY ".") - set(CPACK_PACKAGE_EXECUTABLES ${PROJECT_NAME} "${PROJECT_NAME_CAPITALIZED}") - set(CPACK_CREATE_DESKTOP_LINKS ${PROJECT_NAME}) - set(CPACK_PACKAGING_INSTALL_PREFIX "/${PROJECT_NAME_CAPITALIZED}") - - set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/misc/luanti-icon.ico") - # Supported languages can be found at - # http://wixtoolset.org/documentation/manual/v3/wixui/wixui_localization.html - #set(CPACK_WIX_CULTURES "ar-SA,bg-BG,ca-ES,hr-HR,cs-CZ,da-DK,nl-NL,en-US,et-EE,fi-FI,fr-FR,de-DE") - set(CPACK_WIX_UI_BANNER "${CMAKE_CURRENT_SOURCE_DIR}/misc/CPACK_WIX_UI_BANNER.BMP") - set(CPACK_WIX_UI_DIALOG "${CMAKE_CURRENT_SOURCE_DIR}/misc/CPACK_WIX_UI_DIALOG.BMP") - - set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/doc/lgpl-2.1.txt") - - # The correct way would be to include both x32 and x64 into one installer - # and install the appropriate one. - # CMake does not support that, so there are two separate GUID's - if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(CPACK_WIX_UPGRADE_GUID "745A0FB3-5552-44CA-A587-A91C397CCC56") - else() - set(CPACK_WIX_UPGRADE_GUID "814A2E2D-2779-4BBD-9ACD-FC3BD51FBBA2") - endif() + set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32") endif() + + set(CPACK_GENERATOR ZIP) elseif(APPLE) set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0) set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-osx") diff --git a/misc/CPACK_WIX_UI_BANNER.BMP b/misc/CPACK_WIX_UI_BANNER.BMP deleted file mode 100644 index 612d537418..0000000000 Binary files a/misc/CPACK_WIX_UI_BANNER.BMP and /dev/null differ diff --git a/misc/CPACK_WIX_UI_DIALOG.BMP b/misc/CPACK_WIX_UI_DIALOG.BMP deleted file mode 100644 index c6750e7b7c..0000000000 Binary files a/misc/CPACK_WIX_UI_DIALOG.BMP and /dev/null differ