From f4f65f62ee460e148356f7d0f5af931c8cfc4630 Mon Sep 17 00:00:00 2001 From: Michael Krasnyk Date: Thu, 14 Sep 2017 12:28:52 +0200 Subject: [PATCH] Remove Lua 5.1 support --- .travis.yml | 18 +++++++++--------- CHANGELOG.md | 2 ++ CMakeLists.txt | 19 +------------------ 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 437aa75ac..94816029a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ matrix: addons: &gcc6 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] + packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' ENABLE_COVERAGE=ON CUCUMBER_TIMEOUT=20000 after_success: - bash <(curl -s https://codecov.io/bash) @@ -78,7 +78,7 @@ matrix: addons: &gcc6 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] + packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' TARGET_ARCH='x86_64-asan' ENABLE_SANITIZER=ON CUCUMBER_TIMEOUT=20000 - os: linux @@ -86,7 +86,7 @@ matrix: addons: &clang40 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['libstdc++-5-dev', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] + packages: ['libstdc++-5-dev', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] env: CLANG_VERSION='4.0.0' BUILD_TYPE='Debug' CUCUMBER_TIMEOUT=60000 - os: linux @@ -111,7 +111,7 @@ matrix: addons: &gcc6 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] + packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' - os: linux @@ -125,7 +125,7 @@ matrix: addons: &gcc6 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] + packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' ENABLE_STXXL=On - os: linux @@ -133,7 +133,7 @@ matrix: addons: &gcc49 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-4.9', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache'] + packages: ['g++-4.9', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev', 'ccache'] env: CCOMPILER='gcc-4.9' CXXCOMPILER='g++-4.9' BUILD_TYPE='Release' - os: osx @@ -158,7 +158,7 @@ matrix: #- addons: &clang40 #- apt: #- sources: ['llvm-toolchain-trusty-4.0', 'ubuntu-toolchain-r-test'] - #- packages: ['clang-4.0', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] + #- packages: ['clang-4.0', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] #- env: CCOMPILER='clang-4.0' CXXCOMPILER='clang++-4.0' BUILD_TYPE='Release' # Shared Library @@ -167,7 +167,7 @@ matrix: addons: &gcc6 apt: sources: ['ubuntu-toolchain-r-test'] - packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] + packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON # Disabled because CI slowness @@ -176,7 +176,7 @@ matrix: #- addons: &clang40 #- apt: #- sources: ['llvm-toolchain-trusty-4.0', 'ubuntu-toolchain-r-test'] - #- packages: ['clang-4.0', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] + #- packages: ['clang-4.0', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev'] #- env: CCOMPILER='clang-4.0' CXXCOMPILER='clang++-4.0' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON # Node build jobs. These skip running the tests. diff --git a/CHANGELOG.md b/CHANGELOG.md index 2076fb277..75c33f203 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ # UNRELEASED + - Infrastructure: + - Lua 5.1 support is removed due to lack of support in sol2 https://github.com/ThePhD/sol2/issues/302 # 5.12.0 - Guidance diff --git a/CMakeLists.txt b/CMakeLists.txt index 9bdb49502..b7fb38bf8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -521,24 +521,7 @@ else() IF (LUA_FOUND) MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}") ELSE() - FIND_PACKAGE(Lua 5.1 EXACT) - IF (LUA_FOUND) - MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}") - ELSE() - # Now fall back to a lua verison without exact - # in case this cmake version also forces patch versions - FIND_PACKAGE(Lua 5.2) - IF (LUA_FOUND) - MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}") - ELSE() - FIND_PACKAGE(Lua 5.1) - IF (LUA_FOUND) - MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}") - ELSE() - MESSAGE(FATAL_ERROR "Lua 5.1 or 5.2 was not found.") - ENDIF() - ENDIF() - ENDIF() + MESSAGE(FATAL_ERROR "Lua 5.2 was not found.") ENDIF() set(USED_LUA_LIBRARIES ${LUA_LIBRARIES})