adapt tests to ranking changes

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a561e020d30a87edc5ce7bea7f1f2de79f73d091..787baeb23de7e0c9afb7621024d2f448b2c63391 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,87 +18,181 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 project(nominatim)
 
 
 project(nominatim)
 

-set(NOMINATIM_VERSION_MAJOR 2)
+set(NOMINATIM_VERSION_MAJOR 3)

 set(NOMINATIM_VERSION_MINOR 5)
 set(NOMINATIM_VERSION_MINOR 5)

+set(NOMINATIM_VERSION_PATCH 0)

 
 

-set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}")
+set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")

 
 add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
 
 
 #-----------------------------------------------------------------------------
 
 add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
 
 
 #-----------------------------------------------------------------------------

-#
-#  Find external dependencies
-#
+#  Configuration

 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 

-set(BUILD_TESTS on)
-add_subdirectory(osm2pgsql)
+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)")

 
 

-find_package(Threads REQUIRED)
+#-----------------------------------------------------------------------------
+#  osm2pgsql (imports/updates only)
+#-----------------------------------------------------------------------------

 
 

-unset(PostgreSQL_TYPE_INCLUDE_DIR CACHE)
-set(PostgreSQL_TYPE_INCLUDE_DIR "/usr/include/")
-find_package(PostgreSQL REQUIRED)
-include_directories(${PostgreSQL_INCLUDE_DIRS})
+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()

 
 

-find_program(PG_CONFIG pg_config)
-execute_process(COMMAND ${PG_CONFIG} --pgxs
-                OUTPUT_VARIABLE PGXS
-                OUTPUT_STRIP_TRAILING_WHITESPACE)

 
 

-find_package(ZLIB REQUIRED)
+#-----------------------------------------------------------------------------
+#  python and pyosmium (imports/updates only)
+#-----------------------------------------------------------------------------

 
 

-find_package(BZip2 REQUIRED)
+if (BUILD_IMPORTER)
+    find_package(PythonInterp 3)

 
 

-find_package(LibXml2 REQUIRED)
-include_directories(${LIBXML2_INCLUDE_DIR})
+    find_program(PYOSMIUM pyosmium-get-changes)
+    if (NOT EXISTS "${PYOSMIUM}")
+        set(PYOSMIUM_PATH "")
+            message(WARNING "pyosmium-get-changes not found (required for updates)")
+    else()
+        set(PYOSMIUM_PATH "${PYOSMIUM}")
+        message(STATUS "Using pyosmium-get-changes at ${PYOSMIUM_PATH}")
+    endif()
+endif()

 
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------

-#
-# Setup settings and paths
-#
+# PHP

 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 

-configure_file(
-    ${PROJECT_SOURCE_DIR}/settings/settings.php
-    ${PROJECT_BINARY_DIR}/settings/settings.php
-)
+# 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()
+    # 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})
+endif()

 
 

-configure_file(
-    ${PROJECT_SOURCE_DIR}/settings/phrase_settings.php
-    ${PROJECT_BINARY_DIR}/settings/phrase_settings.php
-)
+#-----------------------------------------------------------------------------
+# import scripts and utilities (importer only)
+#-----------------------------------------------------------------------------

 
 

-execute_process(
-    COMMAND ln -s -t ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/utils
-)
+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()
+
+#-----------------------------------------------------------------------------
+# webserver scripts (API only)
+#-----------------------------------------------------------------------------
+
+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 ${WEBSITESCRIPTS})
+       configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl
+                      ${PROJECT_BINARY_DIR}/${script_source})
+   endforeach()
+
+   set(WEBPATHS css images js)
+
+   foreach (wp ${WEBPATHS})
+       execute_process(
+           COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
+       )
+   endforeach()
+
+   add_custom_target(serve
+           php -S 127.0.0.1:8088
+           WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website
+   )
+endif()
+
+#-----------------------------------------------------------------------------
+# default settings
+#-----------------------------------------------------------------------------
+
+configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
+               ${PROJECT_BINARY_DIR}/settings/settings.php)

 
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------

-#

 # Tests
 # Tests

-#

 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 

-include(CTest)
+if (BUILD_TESTS)
+    include(CTest)
+
+    set(TEST_BDD db osm2pgsql api)

 
 

-set(TEST_BDD db osm2pgsql api)
+    foreach (test ${TEST_BDD})
+        add_test(NAME bdd_${test}
+                 COMMAND behave ${test}
+                 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/test/bdd)
+        set_tests_properties(bdd_${test}
+            PROPERTIES ENVIRONMENT "NOMINATIM_DIR=${PROJECT_BINARY_DIR}")
+    endforeach()

 
 

-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}/test/php)

 
 

-add_test(NAME php
-         COMMAND phpunit ./
-         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests-php)
+    add_test(NAME phpcs
+             COMMAND phpcs --report-width=120 --colors lib website utils
+             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+endif()

 
 

+#-----------------------------------------------------------------------------
+# Postgres module

 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 

-add_subdirectory(module)
-add_subdirectory(nominatim)
+if (BUILD_MODULE)
+    add_subdirectory(module)
+endif()

 
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------

+# Documentation
+#-----------------------------------------------------------------------------
+
+if (BUILD_DOCS)
+   add_subdirectory(docs)
+endif()