From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 26 Jun 2020 19:37:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~230
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/3e64019afe8419ea5b35a3fbd1e6c9dabfc8d983?hp=-c

Merge remote-tracking branch 'upstream/master'
---

3e64019afe8419ea5b35a3fbd1e6c9dabfc8d983
diff --combined CMakeLists.txt
index 13ee60b3,787baeb2..e1ccae87
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -19,7 -19,7 +19,7 @@@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_
  project(nominatim)
  
  set(NOMINATIM_VERSION_MAJOR 3)
- set(NOMINATIM_VERSION_MINOR 4)
+ set(NOMINATIM_VERSION_MINOR 5)
  set(NOMINATIM_VERSION_PATCH 0)
  
  set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")
@@@ -79,14 -79,16 +79,16 @@@ endif(
  
  # 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 ")
+ 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()
- message (STATUS "Using PHP binary " ${PHP_BIN})
  
  #-----------------------------------------------------------------------------
  # import scripts and utilities (importer only)
@@@ -127,16 -129,6 +129,16 @@@ if (BUILD_API
         website/status.php
     )
  
 +   set(WEBSITEFILES
 +       403.html
 +       509.html
 +       crossdomain.xml
 +       favicon.ico
 +       nominatim.xml
 +       robots.txt
 +       taginfo.json
 +   )
 +
     foreach (script_source ${WEBSITESCRIPTS})
         configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl
                        ${PROJECT_BINARY_DIR}/${script_source})
@@@ -144,16 -136,16 +146,21 @@@
  
     set(WEBPATHS css images js)
  
 +   foreach (webfile ${WEBSITEFILES})
 +       configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
 +                      ${PROJECT_BINARY_DIR}/website/${webfile})
 +   endforeach()
 +
     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()
  
  #-----------------------------------------------------------------------------