diff -Nru widelands-1.2~bzr10796/.github/workflows/build.yaml widelands-1.2~bzr10797/.github/workflows/build.yaml --- widelands-1.2~bzr10796/.github/workflows/build.yaml 2023-11-04 04:02:02.000000000 +0000 +++ widelands-1.2~bzr10797/.github/workflows/build.yaml 2023-11-07 14:02:43.000000000 +0000 @@ -203,6 +203,7 @@ mkdir build pushd build cmake .. -DCMAKE_BUILD_TYPE:STRING="${{ matrix.config }}" -DOPTION_BUILD_TRANSLATIONS="ON" -DOPTION_BUILD_WEBSITE_TOOLS="ON" -DOPTION_ASAN="ON" -DOPTION_BUILD_CODECHECK="OFF" + grep -v REVDETECT-BROKEN VERSION make -k -j$(nproc) VERBOSE=1 - name: Make install/uninstall run: | @@ -283,6 +284,7 @@ mkdir $env:GITHUB_WORKSPACE\build cd $env:GITHUB_WORKSPACE\build cmake.exe -G "NMake Makefiles" .. -DVCPKG_TARGET_TRIPLET=${{ env.VCPKG_TARGET_TRIPLET }} -DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_BUILD_TRANSLATIONS=ON -DOPTION_BUILD_TESTS=ON -DOPTION_ASAN=OFF -DOPTION_BUILD_CODECHECK=OFF -DOPTION_BUILD_WINSTATIC=ON -DOPTION_USE_GLBINDING=ON -DOPTION_FORCE_EMBEDDED_MINIZIP=ON + if ((Select-String -Quiet REVDETECT-BROKEN VERSION)) { exit 1 } nmake if ("${{ matrix.config }}" -Match "Release") { strip -sv ./src/widelands.exe @@ -336,6 +338,7 @@ mkdir $env:GITHUB_WORKSPACE\build cd $env:GITHUB_WORKSPACE\build cmake.exe -G Ninja .. -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_BUILD_TRANSLATIONS=ON -DOPTION_BUILD_TESTS=ON -DOPTION_ASAN=OFF -DUSE_XDG=OFF -DOPTION_BUILD_CODECHECK=OFF -DUSE_FLTO_IF_AVAILABLE=OFF -DCMAKE_JOB_POOLS="linking=1" -DCMAKE_JOB_POOL_LINK=linking -DOPTION_BUILD_WINSTATIC=ON -DOPTION_FORCE_EMBEDDED_MINIZIP=ON + if ((Select-String -Quiet REVDETECT-BROKEN VERSION)) { exit 1 } cmake.exe --build . strip -sv ./src/widelands.exe - name: InnoSetup @@ -378,11 +381,11 @@ mkdir build_wl cd build_wl/ ../utils/macos/build_app.sh "--${{ matrix.config }}" "--${{ matrix.compiler }}" + grep -v REVDETECT-BROKEN ../build/VERSION DMGPATH="$(pwd)" DMGFILE="$(ls *.dmg)" echo "DMG file is: $DMGPATH/$DMGFILE" mv "$DMGFILE" "${{ github.workspace }}/Widelands-${{ github.sha }}-${{ matrix.config }}-${{ matrix.compiler }}.dmg" - #echo "::set-env name=dmg::$DMGPATH/$DMGFILE" - name: Uploading DMG uses: actions/upload-artifact@v3 diff -Nru widelands-1.2~bzr10796/CMakeLists.txt widelands-1.2~bzr10797/CMakeLists.txt --- widelands-1.2~bzr10796/CMakeLists.txt 2023-11-04 04:02:02.000000000 +0000 +++ widelands-1.2~bzr10797/CMakeLists.txt 2023-11-07 14:02:43.000000000 +0000 @@ -1,5 +1,5 @@ -cmake_minimum_required (VERSION 3.5) -cmake_policy(VERSION 3.5) +cmake_minimum_required (VERSION 3.12) +cmake_policy(VERSION 3.12) project (widelands) @@ -38,36 +38,13 @@ include("${CMAKE_SOURCE_DIR}/cmake/UseSystemInfo.cmake") include("${CMAKE_SOURCE_DIR}/cmake/WlFunctions.cmake") -# This policy is not known to versions prior 3.11 and would result in errors, +# This policy is not known to versions prior 3.27 and would result in errors, # if set on such systems. This can be removed when cmake_minimum_required is set -# to 3.11 or newer by using: -# cmake_policy(VERSION 3.11) -if(POLICY CMP0072) - cmake_policy(SET CMP0072 NEW) - - # TODO(stonerl): Check on later Ubuntu releases whether this workaround is - # still needed or not. - # --- Seems to work fine on 21.04 - if (CMAKE_SYSTEM MATCHES "Linux") - distro_name (DISTRO_NAME) - # DISTRO_NAME is different on the build-servers. - if ((DISTRO_NAME MATCHES "Ubuntu 18.10" OR DISTRO_NAME MATCHES "Cosmic" - OR DISTRO_NAME MATCHES "Ubuntu 19.04" OR DISTRO_NAME MATCHES "Disco" - OR DISTRO_NAME MATCHES "Ubuntu 19.10" OR DISTRO_NAME MATCHES "Eoan" - OR DISTRO_NAME MATCHES "Ubuntu 20.04" OR DISTRO_NAME MATCHES "Focal") - AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - cmake_policy(SET CMP0072 OLD) - endif() - endif() -endif(POLICY CMP0072) - -# This policy is not known to versions prior 3.12 and would result in errors, -# if set on such systems. This can be removed when cmake_minimum_required is set -# to 3.12 or newer by using: -# cmake_policy(VERSION 3.12) -if(POLICY CMP0074) - cmake_policy(SET CMP0074 NEW) -endif(POLICY CMP0074) +# to 3.27 or newer by using: +# cmake_policy(VERSION 3.27) +if(POLICY CMP0148) + cmake_policy(SET CMP0148 NEW) +endif(POLICY CMP0148) IF(USE_XDG AND NOT APPLE AND NOT WIN32) ADD_DEFINITIONS(-DUSE_XDG) @@ -101,7 +78,7 @@ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8) message(FATAL_ERROR "Widelands needs GCC >= 4.8 to compile.") endif() -elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4) message(FATAL_ERROR "Clang version must be at least 3.4!") endif() @@ -133,12 +110,7 @@ endif() endif() -if(${CMAKE_VERSION} VERSION_LESS 3.12.0) - # PythonInterp module has been deprecated since CMake 3.12. - find_package (PythonInterp REQUIRED) -else() - find_package (Python REQUIRED) -endif() +find_package (Python3 REQUIRED) find_package(Gettext REQUIRED) find_package(OpenGL REQUIRED) diff -Nru widelands-1.2~bzr10796/cmake/BzrRevision.cmake widelands-1.2~bzr10797/cmake/BzrRevision.cmake --- widelands-1.2~bzr10796/cmake/BzrRevision.cmake 2023-11-04 04:02:02.000000000 +0000 +++ widelands-1.2~bzr10797/cmake/BzrRevision.cmake 2023-11-07 14:02:43.000000000 +0000 @@ -1,5 +1,5 @@ execute_process ( - COMMAND ${PYTHON_EXECUTABLE} ./utils/detect_revision.py + COMMAND ${Python3_EXECUTABLE} ./utils/detect_revision.py OUTPUT_VARIABLE WL_VERSION RESULT_VARIABLE RES_REVDETECT WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} diff -Nru widelands-1.2~bzr10796/cmake/WlFunctions.cmake widelands-1.2~bzr10797/cmake/WlFunctions.cmake --- widelands-1.2~bzr10796/cmake/WlFunctions.cmake 2023-11-04 04:02:02.000000000 +0000 +++ widelands-1.2~bzr10797/cmake/WlFunctions.cmake 2023-11-07 14:02:43.000000000 +0000 @@ -259,7 +259,7 @@ ${OUTPUT_FILE} COMMAND ${CMAKE_COMMAND} - -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} + -DPython3_EXECUTABLE=${Python3_EXECUTABLE} -DWL_SOURCE_CHECKER=${CMAKE_SOURCE_DIR}/cmake/codecheck/CodeCheck.py -DSRC=${ABSOLUTE_SRC} -DOUTPUT_FILE=${OUTPUT_FILE} diff -Nru widelands-1.2~bzr10796/cmake/codecheck/CodeCheck.cmake widelands-1.2~bzr10797/cmake/codecheck/CodeCheck.cmake --- widelands-1.2~bzr10796/cmake/codecheck/CodeCheck.cmake 2023-11-04 04:02:02.000000000 +0000 +++ widelands-1.2~bzr10797/cmake/codecheck/CodeCheck.cmake 2023-11-07 14:02:43.000000000 +0000 @@ -1,6 +1,6 @@ set(ENV{WL_ROOT_DIR} ${WL_ROOT_DIR}) execute_process( - COMMAND "${PYTHON_EXECUTABLE}" "${WL_SOURCE_CHECKER}" -c "${SRC}" + COMMAND "${Python3_EXECUTABLE}" "${WL_SOURCE_CHECKER}" -c "${SRC}" OUTPUT_VARIABLE checkresult RESULT_VARIABLE exitcode OUTPUT_STRIP_TRAILING_WHITESPACE diff -Nru widelands-1.2~bzr10796/debian/bzr-builder.manifest widelands-1.2~bzr10797/debian/bzr-builder.manifest --- widelands-1.2~bzr10796/debian/bzr-builder.manifest 2023-11-04 04:03:25.000000000 +0000 +++ widelands-1.2~bzr10797/debian/bzr-builder.manifest 2023-11-07 14:03:19.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version 2:1.2~bzr10796-202311040401 -lp:widelands revid:bunnybot@widelands.org-20231104024437-gn58a6evd46ft6c2 +# bzr-builder format 0.3 deb-version 2:1.2~bzr10797-202311071402 +lp:widelands revid:bunnybot@widelands.org-20231107135940-dncpnuurjjjhw2ii diff -Nru widelands-1.2~bzr10796/debian/changelog widelands-1.2~bzr10797/debian/changelog --- widelands-1.2~bzr10796/debian/changelog 2023-11-04 04:03:25.000000000 +0000 +++ widelands-1.2~bzr10797/debian/changelog 2023-11-07 14:03:19.000000000 +0000 @@ -1,8 +1,8 @@ -widelands (2:1.2~bzr10796-202311040401~ubuntu18.04.1) bionic; urgency=low +widelands (2:1.2~bzr10797-202311071402~ubuntu18.04.1) bionic; urgency=low * Auto build. - -- Widelands Developers Sat, 04 Nov 2023 04:03:25 +0000 + -- Widelands Developers Tue, 07 Nov 2023 14:03:19 +0000 widelands (1:19+repack-6widelands1) UNRELEASED; urgency=medium diff -Nru widelands-1.2~bzr10796/src/CMakeLists.txt widelands-1.2~bzr10797/src/CMakeLists.txt --- widelands-1.2~bzr10796/src/CMakeLists.txt 2023-11-04 04:02:02.000000000 +0000 +++ widelands-1.2~bzr10797/src/CMakeLists.txt 2023-11-07 14:02:43.000000000 +0000 @@ -6,7 +6,7 @@ add_custom_target(codecheck) add_custom_target(run_build_deps COMMAND - ${PYTHON_EXECUTABLE} + ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/utils/build_deps.py COMMENT "Checking CMakeLists.txt files." )