Remove need for config.h file, set HAVE_LUA(JIT) directly

joto · joto · commit 43dc98d47787 · 2022-03-18T15:41:51.000+01:00
diff --git a/.github/actions/ubuntu-prerequisites/action.yml b/.github/actions/ubuntu-prerequisites/action.yml
@@ -18,7 +18,6 @@ runs:
           libboost-system-dev \
           libbz2-dev \
           libexpat1-dev \
-          libluajit-5.1-dev \
           libpq-dev \
           libproj-dev \
           pandoc \
@@ -31,13 +30,20 @@ runs:
         if [ "$CC" = clang-8 ]; then sudo apt-get install -yq --no-install-suggests --no-install-recommends clang-8; fi
       shell: bash
 
-    - name: Install lua
+    - name: Install Lua
       run: |
         if [ -n "${LUA_VERSION}" ]; then
           sudo apt-get install -yq --no-install-suggests --no-install-recommends liblua${LUA_VERSION}-dev lua${LUA_VERSION}
         fi
       shell: bash
 
+    - name: Install LuaJIT
+      run: |
+        if [ "${LUAJIT_OPTION}" = "ON" ]; then
+          sudo apt-get install -yq --no-install-suggests --no-install-recommends libluajit-5.1-dev
+        fi
+      shell: bash
+
     - name: Adapt postgresql configuration
       run: |
         echo 'fsync = off' | sudo tee /etc/postgresql/${POSTGRESQL_VERSION}/main/conf.d/local.conf
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -216,6 +216,22 @@ jobs:
       - uses: ./.github/actions/ubuntu-prerequisites
       - uses: ./.github/actions/build-and-test
 
+  ubuntu20-pg13-gcc10-release-nolua:
+    runs-on: ubuntu-20.04
+
+    env:
+      CC: gcc-10
+      CXX: g++-10
+      POSTGRESQL_VERSION: 13
+      POSTGIS_VERSION: 2.5
+      CPP_VERSION: 17
+      BUILD_TYPE: Release
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/ubuntu-prerequisites
+      - uses: ./.github/actions/build-and-test
+
   windows:
     strategy:
       fail-fast: false
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -187,15 +187,19 @@ include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT
 
 if (WITH_LUA)
     if (WITH_LUAJIT)
+        message(STATUS "Building with LuaJIT support")
         find_package(LuaJIT REQUIRED)
         include_directories(SYSTEM ${LUAJIT_INCLUDE_DIR})
-        set(HAVE_LUAJIT 1)
+        add_definitions(-DHAVE_LUAJIT=1)
     else()
+        message(STATUS "Building with Lua support")
         find_package(Lua REQUIRED)
         include_directories(SYSTEM ${LUA_INCLUDE_DIR})
     endif()
-    set(HAVE_LUA 1)
+    add_definitions(-DHAVE_LUA=1)
     find_program(LUA_EXE lua)
+else()
+    message(STATUS "Building without Lua support")
 endif()
 
 find_package(Boost 1.50 REQUIRED COMPONENTS system filesystem)
@@ -272,8 +276,6 @@ message(STATUS "Libraries used to build: ${LIBS}")
 # Build the library and executable file
 #############################################################
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-
 add_subdirectory(src)
 
 add_executable(osm2pgsql src/osm2pgsql.cpp)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -38,7 +38,7 @@ always be used for code blocks, even one-liners.
 Names should use underscores, not camel case, with class/struct names ending in `_t`.
 Template parameters must use all upper case.
 
-Headers should be included in the order `config.h`, C++ standard library headers,
+Headers should be included in the order C++ standard library headers,
 C library headers, Boost headers, and last osm2pgsql files.
 
 There is a .clang-format configuration available and all code must be run through
diff --git a/cmake/config.h.in b/cmake/config.h.in
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -40,7 +40,7 @@ target_sources(osm2pgsql_lib PRIVATE
   wkb.cpp
 )
 
-if (LUA_FOUND OR LUAJIT_FOUND)
+if (WITH_LUA)
     set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
                  "${CMAKE_CURRENT_SOURCE_DIR}/init.lua")
     file(READ "${CMAKE_CURRENT_SOURCE_DIR}/init.lua" LUA_INIT_CODE)
diff --git a/src/lua-utils.cpp b/src/lua-utils.cpp
@@ -7,7 +7,6 @@
  * For a full list of authors see the git log.
  */
 
-#include "config.h"
 #include "lua-utils.hpp"
 #include "format.hpp"
 
diff --git a/src/options.cpp b/src/options.cpp
@@ -7,7 +7,6 @@
  * For a full list of authors see the git log.
  */
 
-#include "config.h"
 #include "format.hpp"
 #include "logging.hpp"
 #include "options.hpp"
diff --git a/src/output.cpp b/src/output.cpp
@@ -7,8 +7,6 @@
  * For a full list of authors see the git log.
  */
 
-#include "config.h"
-
 #include "db-copy.hpp"
 #include "format.hpp"
 #include "output-gazetteer.hpp"
diff --git a/src/tagtransform.cpp b/src/tagtransform.cpp
@@ -7,7 +7,6 @@
  * For a full list of authors see the git log.
  */
 
-#include "config.h"
 #include "logging.hpp"
 #include "options.hpp"
 #include "tagtransform-c.hpp"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -71,7 +71,7 @@ set_test(test-wildcard-match LABELS NoDB)
 set_test(test-wkb LABELS NoDB)
 
 # these tests require LUA support
-if (HAVE_LUA)
+if (WITH_LUA)
     set_test(test-output-flex)
     set_test(test-output-flex-area)
     set_test(test-output-flex-attr)
@@ -139,7 +139,7 @@ else()
     message(WARNING "Can not find python, regression test disabled")
 endif()
 
-if (HAVE_LUA)
+if (WITH_LUA)
     if (LUA_EXE)
         message(STATUS "Added test: lua-lib")
         add_test(NAME lua-lib COMMAND ${LUA_EXE} lua/tests.lua
diff --git a/tests/regression-test.py.in b/tests/regression-test.py.in
@@ -11,6 +11,6 @@ from regression import *
 CONFIG['executable'] = os.environ['OSM2PGSQL_BINARY']
 CONFIG['test_data_path'] = '@CMAKE_CURRENT_SOURCE_DIR@/data'
 CONFIG['default_data_path'] = '@osm2pgsql_SOURCE_DIR@'
-CONFIG['have_lua'] = '@HAVE_LUA@' == '1'
+CONFIG['have_lua'] = '@WITH_LUA@' == 'ON'
 
 unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ target_sources(osm2pgsql_lib PRIVATE`
`40`	`40`	`wkb.cpp`
`41`	`41`	`)`
`42`	`42`
`43`		`-if (LUA_FOUND OR LUAJIT_FOUND)`
	`43`	`+if (WITH_LUA)`
`44`	`44`	`set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS`
`45`	`45`	`"${CMAKE_CURRENT_SOURCE_DIR}/init.lua")`
`46`	`46`	`file(READ "${CMAKE_CURRENT_SOURCE_DIR}/init.lua" LUA_INIT_CODE)`