X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/92d1f5122b52582b6ad212727ac55de8588654a3..171ed36e36d6e69bd3b58188e9c6a28ba39e783f:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e55f628..3a9ceed9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") project(nominatim) set(NOMINATIM_VERSION_MAJOR 3) -set(NOMINATIM_VERSION_MINOR 3) +set(NOMINATIM_VERSION_MINOR 6) set(NOMINATIM_VERSION_PATCH 0) set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}") @@ -28,25 +28,40 @@ 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(BUILD_DOCS on CACHE BOOL "Build documentation") -set(BUILD_SERVER on CACHE BOOL "Build API server") +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_NOMINATIM on CACHE BOOL "Build Nominatim executable") +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 (BUILD_SERVER) +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() + + +#----------------------------------------------------------------------------- +# python and pyosmium (imports/updates only) +#----------------------------------------------------------------------------- + +if (BUILD_IMPORTER) + find_package(PythonInterp 3.5 REQUIRED) find_program(PYOSMIUM pyosmium-get-changes) if (NOT EXISTS "${PYOSMIUM}") @@ -56,9 +71,15 @@ if (BUILD_SERVER) set(PYOSMIUM_PATH "${PYOSMIUM}") message(STATUS "Using pyosmium-get-changes at ${PYOSMIUM_PATH}") endif() +endif() + +#----------------------------------------------------------------------------- +# PHP +#----------------------------------------------------------------------------- +# Setting PHP binary variable as to command line (prevailing) or auto detect - # Setting PHP binary variable as to command line (prevailing) or auto detect +if (BUILD_API OR BUILD_IMPORTER) if (NOT PHP_BIN) find_program (PHP_BIN php) endif() @@ -70,60 +91,48 @@ if (BUILD_SERVER) endif() #----------------------------------------------------------------------------- -# -# Setup settings and paths -# +# import scripts and utilities (importer only) #----------------------------------------------------------------------------- -if (BUILD_SERVER) - 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 - ) - +if (BUILD_IMPORTER) set(CUSTOMSCRIPTS - 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 + check_import_finished.php + country_languages.php + export.php + query.php + setup.php + specialphrases.php + update.php + warm.php ) foreach (script_source ${CUSTOMSCRIPTS}) configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl - ${PROJECT_BINARY_DIR}/${script_source}) + ${PROJECT_BINARY_DIR}/utils/${script_source}) endforeach() - foreach (script_source ${WEBSITESCRIPTS}) - configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl - ${PROJECT_BINARY_DIR}/${script_source}) - endforeach() + configure_file(${PROJECT_SOURCE_DIR}/cmake/tool.tmpl + ${PROJECT_BINARY_DIR}/nominatim) +endif() - configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php - ${PROJECT_BINARY_DIR}/settings/settings.php) +#----------------------------------------------------------------------------- +# Targets for running a development webserver from the build directory. +#----------------------------------------------------------------------------- - set(WEBPATHS css images js) +if (BUILD_API) + add_custom_target(serve + php -S 127.0.0.1:8088 + WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website + ) - foreach (wp ${WEBPATHS}) - execute_process( - COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/ - ) - endforeach() + add_custom_target(serve-global + php -S 0.0.0.0:8088 + WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website + ) endif() #----------------------------------------------------------------------------- -# # Tests -# #----------------------------------------------------------------------------- if (BUILD_TESTS) @@ -131,29 +140,74 @@ if (BUILD_TESTS) 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) - 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) + find_program(PYTHON_BEHAVE behave) + find_program(PYLINT NAMES pylint3 pylint) + find_program(PYTEST NAMES pytest py.test-3 py.test) + find_program(PHPCS phpcs) + find_program(PHPUNIT phpunit) + + if (PYTHON_BEHAVE) + message(STATUS "Using Python behave binary ${PYTHON_BEHAVE}") + foreach (test ${TEST_BDD}) + add_test(NAME bdd_${test} + COMMAND ${PYTHON_BEHAVE} ${test} + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/test/bdd) + set_tests_properties(bdd_${test} + PROPERTIES ENVIRONMENT "NOMINATIM_DIR=${PROJECT_BINARY_DIR}") + endforeach() + else() + message(WARNING "behave not found. BDD tests disabled." ) + endif() + + if (PHPUNIT) + message(STATUS "Using phpunit binary ${PHPUNIT}") + add_test(NAME php + COMMAND ${PHPUNIT} ./ + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/test/php) + else() + message(WARNING "phpunit not found. PHP unit tests disabled." ) + endif() + + if (PHPCS) + message(STATUS "Using phpcs binary ${PHPCS}") + add_test(NAME phpcs + COMMAND ${PHPCS} --report-width=120 --colors lib website utils + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) + else() + message(WARNING "phpcs not found. PHP linting tests disabled." ) + endif() + + if (PYLINT) + message(STATUS "Using pylint binary ${PYLINT}") + add_test(NAME pylint + COMMAND ${PYLINT} nominatim + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) + else() + message(WARNING "pylint not found. Python linting tests disabled.") + endif() + + if (PYTEST) + message(STATUS "Using pytest binary ${PYTEST}") + add_test(NAME pytest + COMMAND ${PYTEST} test/python + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) + else() + message(WARNING "pytest not found. Python tests disabled." ) + endif() endif() +#----------------------------------------------------------------------------- +# Postgres module #----------------------------------------------------------------------------- if (BUILD_MODULE) add_subdirectory(module) endif() -if (BUILD_NOMINATIM) - add_subdirectory(nominatim) -endif() + +#----------------------------------------------------------------------------- +# Documentation +#----------------------------------------------------------------------------- + if (BUILD_DOCS) add_subdirectory(docs) endif() - -#-----------------------------------------------------------------------------