X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ebffa15c7c9a3c8b924794690edb9748f0c2d318..a8ec250993b0ed0e48bbefd8fb3bcbb861c5f2a9:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 787baeb2..b4f4ddb8 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 5)
+set(NOMINATIM_VERSION_MINOR 6)
 set(NOMINATIM_VERSION_PATCH 0)
 
 set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")
@@ -96,64 +96,38 @@ endif()
 
 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
+       check_import_finished.php
+       country_languages.php
+       importWikipedia.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()
 endif()
 
 #-----------------------------------------------------------------------------
-# webserver scripts (API only)
+# Targets for running a development webserver from the build directory.
 #-----------------------------------------------------------------------------
 
 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)
+   add_custom_target(serve-global
+           php -S 0.0.0.0:8088
+           WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website
+   )
+endif()
 
 #-----------------------------------------------------------------------------
 # Tests