From: Sarah Hoffmann Date: Sun, 26 Apr 2020 19:48:43 +0000 (+0200) Subject: Merge pull request #1770 from lonvia/eyusupov-separate-compilation X-Git-Tag: v3.5.0~27 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/0e1e7c7df20940a95ac3ae5e88c8537539cd6945?hp=06110ba358f5171d48b2003ad24a7e42c755fff4 Merge pull request #1770 from lonvia/eyusupov-separate-compilation Separate compilation --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ba234d55..2596c104 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,29 +28,39 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}") #----------------------------------------------------------------------------- -# -# Find external dependencies -# +# Configuration #----------------------------------------------------------------------------- -set(BUILD_TESTS off CACHE BOOL "Build test suite" FORCE) -set(WITH_LUA off CACHE BOOL "Build with lua support" FORCE) -set(ONLY_DOCS off CACHE BOOL "Build documentation only") +set(BUILD_IMPORTER on CACHE BOOL "Build everything for importing/updating the database") +set(BUILD_API on CACHE BOOL "Build everything for the API server") +set(BUILD_MODULE on CACHE BOOL "Build PostgreSQL module") +set(BUILD_TESTS on CACHE BOOL "Build test suite") +set(BUILD_DOCS on CACHE BOOL "Build documentation") +set(BUILD_OSM2PGSQL on CACHE BOOL "Build osm2pgsql (expert only)") + +#----------------------------------------------------------------------------- +# osm2pgsql (imports/updates only) +#----------------------------------------------------------------------------- -if (NOT ONLY_DOCS) +if (BUILD_IMPORTER AND BUILD_OSM2PGSQL) if (NOT EXISTS "${CMAKE_SOURCE_DIR}/osm2pgsql/CMakeLists.txt") message(FATAL_ERROR "The osm2pgsql directory is empty.\ Did you forget to check out Nominatim recursively?\ \nTry updating submodules with: git submodule update --init") endif() + set(BUILD_TESTS_SAVED "${BUILD_TESTS}") + set(BUILD_TESTS off) + set(WITH_LUA off CACHE BOOL "") add_subdirectory(osm2pgsql) + set(BUILD_TESTS ${BUILD_TESTS_SAVED}) +endif() - unset(PostgreSQL_TYPE_INCLUDE_DIR CACHE) - set(PostgreSQL_TYPE_INCLUDE_DIR "/usr/include/") - find_package(PostgreSQL REQUIRED) - include_directories(${PostgreSQL_INCLUDE_DIRS}) - link_directories(${PostgreSQL_LIBRARY_DIRS}) +#----------------------------------------------------------------------------- +# python and pyosmium (imports/updates only) +#----------------------------------------------------------------------------- + +if (BUILD_IMPORTER) find_package(PythonInterp 3) find_program(PYOSMIUM pyosmium-get-changes) @@ -61,107 +71,121 @@ if (NOT ONLY_DOCS) set(PYOSMIUM_PATH "${PYOSMIUM}") message(STATUS "Using pyosmium-get-changes at ${PYOSMIUM_PATH}") endif() +endif() +#----------------------------------------------------------------------------- +# PHP +#----------------------------------------------------------------------------- - find_program(PG_CONFIG pg_config) - execute_process(COMMAND ${PG_CONFIG} --pgxs - OUTPUT_VARIABLE PGXS - OUTPUT_STRIP_TRAILING_WHITESPACE) +# Setting PHP binary variable as to command line (prevailing) or auto detect - if (NOT EXISTS "${PGXS}") - message(FATAL_ERROR "Postgresql server package not found.") - endif() +if (NOT PHP_BIN) + find_program (PHP_BIN php) +endif() +# sanity check if PHP binary exists +if (NOT EXISTS ${PHP_BIN}) + message(FATAL_ERROR "PHP binary not found. Install php or provide location with -DPHP_BIN=/path/php ") +endif() +message (STATUS "Using PHP binary " ${PHP_BIN}) - # Setting PHP binary variable as to command line (prevailing) or auto detect - if (NOT PHP_BIN) - find_program (PHP_BIN php) - endif() - # sanity check if PHP binary exists - if (NOT EXISTS ${PHP_BIN}) - message(FATAL_ERROR "PHP binary not found. Install php or provide location with -DPHP_BIN=/path/php ") - endif() - message (STATUS "Using PHP binary " ${PHP_BIN}) +#----------------------------------------------------------------------------- +# import scripts and utilities (importer only) +#----------------------------------------------------------------------------- + +if (BUILD_IMPORTER) + set(CUSTOMSCRIPTS + utils/check_import_finished.php + utils/country_languages.php + utils/importWikipedia.php + utils/export.php + utils/query.php + utils/setup.php + utils/specialphrases.php + utils/update.php + utils/warm.php + ) + + foreach (script_source ${CUSTOMSCRIPTS}) + configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl + ${PROJECT_BINARY_DIR}/${script_source}) + endforeach() endif() #----------------------------------------------------------------------------- -# -# Setup settings and paths -# +# webserver scripts (API only) #----------------------------------------------------------------------------- -set(WEBSITESCRIPTS - website/deletable.php - website/details.php - website/hierarchy.php - website/lookup.php - website/polygons.php - website/reverse.php - website/search.php - website/status.php -) - -set(CUSTOMSCRIPTS - utils/check_import_finished.php - utils/country_languages.php - utils/export.php - utils/query.php - utils/setup.php - utils/specialphrases.php - utils/update.php - utils/warm.php +if (BUILD_API) + set(WEBSITESCRIPTS + website/deletable.php + website/details.php + website/hierarchy.php + website/lookup.php + website/polygons.php + website/reverse.php + website/search.php + website/status.php ) -foreach (script_source ${CUSTOMSCRIPTS}) - configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl - ${PROJECT_BINARY_DIR}/${script_source}) -endforeach() + foreach (script_source ${WEBSITESCRIPTS}) + configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl + ${PROJECT_BINARY_DIR}/${script_source}) + endforeach() -foreach (script_source ${WEBSITESCRIPTS}) - configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl - ${PROJECT_BINARY_DIR}/${script_source}) -endforeach() + set(WEBPATHS css images js) -configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php - ${PROJECT_BINARY_DIR}/settings/settings.php) - -set(WEBPATHS css images js) + foreach (wp ${WEBPATHS}) + execute_process( + COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/ + ) + endforeach() +endif() -foreach (wp ${WEBPATHS}) - execute_process( - COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/ - ) -endforeach() +#----------------------------------------------------------------------------- +# default settings +#----------------------------------------------------------------------------- +configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php + ${PROJECT_BINARY_DIR}/settings/settings.php) #----------------------------------------------------------------------------- -# # Tests -# #----------------------------------------------------------------------------- -if (NOT ONLY_DOCS) +if (BUILD_TESTS) include(CTest) set(TEST_BDD db osm2pgsql api) foreach (test ${TEST_BDD}) add_test(NAME bdd_${test} - COMMAND lettuce features/${test} - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests) + COMMAND behave ${test} + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/test/bdd) set_tests_properties(bdd_${test} PROPERTIES ENVIRONMENT "NOMINATIM_DIR=${PROJECT_BINARY_DIR}") endforeach() add_test(NAME php COMMAND phpunit ./ - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests-php) + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/test/php) + + add_test(NAME phpcs + COMMAND phpcs --report-width=120 --colors lib website utils + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) endif() +#----------------------------------------------------------------------------- +# Postgres module #----------------------------------------------------------------------------- -if (NOT ONLY_DOCS) +if (BUILD_MODULE) add_subdirectory(module) endif() -add_subdirectory(docs) #----------------------------------------------------------------------------- +# Documentation +#----------------------------------------------------------------------------- + +if (BUILD_DOCS) + add_subdirectory(docs) +endif() diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index bdba63db..2735733a 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -7,19 +7,39 @@ configure_file(mkdocs.yml ../mkdocs.yml) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/appendix) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/data-sources) -ADD_CUSTOM_TARGET(doc - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/admin ${CMAKE_CURRENT_BINARY_DIR}/admin - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/develop ${CMAKE_CURRENT_BINARY_DIR}/develop - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/api ${CMAKE_CURRENT_BINARY_DIR}/api - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/index.md ${CMAKE_CURRENT_BINARY_DIR}/index.md - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/extra.css ${CMAKE_CURRENT_BINARY_DIR}/extra.css - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/styles.css ${CMAKE_CURRENT_BINARY_DIR}/styles.css - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/data-sources/overview.md ${CMAKE_CURRENT_BINARY_DIR}/data-sources/overview.md +set (DOC_SOURCES + admin + develop + api + index.md + extra.css + styles.css + data-sources/overview.md + ) + +foreach (src ${DOC_SOURCES}) + execute_process( + COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${CMAKE_CURRENT_BINARY_DIR}/${src} + ) +endforeach() + +execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/data-sources/us-tiger/README.md ${CMAKE_CURRENT_BINARY_DIR}/data-sources/US-Tiger.md +) +execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/data-sources/gb-postcodes/README.md ${CMAKE_CURRENT_BINARY_DIR}/data-sources/GB-Postcodes.md +) +execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/data-sources/country-grid/README.md ${CMAKE_CURRENT_BINARY_DIR}/data-sources/Country-Grid.md +) +execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/data-sources/country-grid/mexico.quad.png ${CMAKE_CURRENT_BINARY_DIR}/data-sources/mexico.quad.png +) +execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink ${PROJECT_SOURCE_DIR}/data-sources/wikipedia-wikidata/README.md ${CMAKE_CURRENT_BINARY_DIR}/data-sources/Wikipedia-Wikidata.md +) + +ADD_CUSTOM_TARGET(doc COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bash2md.sh ${PROJECT_SOURCE_DIR}/vagrant/Install-on-Centos-7.sh ${CMAKE_CURRENT_BINARY_DIR}/appendix/Install-on-Centos-7.md COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bash2md.sh ${PROJECT_SOURCE_DIR}/vagrant/Install-on-Ubuntu-16.sh ${CMAKE_CURRENT_BINARY_DIR}/appendix/Install-on-Ubuntu-16.md COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bash2md.sh ${PROJECT_SOURCE_DIR}/vagrant/Install-on-Ubuntu-18.sh ${CMAKE_CURRENT_BINARY_DIR}/appendix/Install-on-Ubuntu-18.md diff --git a/module/CMakeLists.txt b/module/CMakeLists.txt index 318e5650..03beacb2 100644 --- a/module/CMakeLists.txt +++ b/module/CMakeLists.txt @@ -1,4 +1,13 @@ # just use the pgxs makefile +find_program(PG_CONFIG pg_config) +execute_process(COMMAND ${PG_CONFIG} --pgxs + OUTPUT_VARIABLE PGXS + OUTPUT_STRIP_TRAILING_WHITESPACE) + +if (NOT EXISTS "${PGXS}") +message(FATAL_ERROR "Postgresql server package not found.") +endif() + ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dummy COMMAND PGXS=${PGXS} PG_CONFIG=${PG_CONFIG} MODSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} $(MAKE) -f ${CMAKE_CURRENT_SOURCE_DIR}/Makefile COMMENT "Running external makefile ${PGXS}"