From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 21 Aug 2021 08:22:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~157
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/f3c4196c758a7720aefc26a7043bf1c6553028e2?ds=inline;hp=-c

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

f3c4196c758a7720aefc26a7043bf1c6553028e2
diff --combined CMakeLists.txt
index e189e479,ef76a4af..2acd4d3a
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -113,27 -113,6 +113,27 @@@ if (BUILD_IMPORTER
                    ${PROJECT_BINARY_DIR}/nominatim)
  endif()
  
 +#-----------------------------------------------------------------------------
 +# Targets for running a development webserver from the build directory.
 +#-----------------------------------------------------------------------------
 +
 +if (BUILD_API)
 +   set(WEBSITEFILES
 +       403.html
 +       509.html
 +       crossdomain.xml
 +       favicon.ico
 +       nominatim.xml
 +       robots.txt
 +       taginfo.json
 +   )
 +
 +   foreach (webfile ${WEBSITEFILES})
 +       configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
 +                      ${PROJECT_BINARY_DIR}/website/${webfile})
 +   endforeach()
 +endif()
 +
  #-----------------------------------------------------------------------------
  # Tests
  #-----------------------------------------------------------------------------
@@@ -174,7 -153,7 +174,7 @@@ if (BUILD_TESTS
      if (PHPCS)
          message(STATUS "Using phpcs binary ${PHPCS}")
          add_test(NAME phpcs
-                  COMMAND ${PHPCS} --report-width=120 --colors lib website utils
+                  COMMAND ${PHPCS} --report-width=120 --colors lib-php
                   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
      else()
          message(WARNING "phpcs not found. PHP linting tests disabled." )
@@@ -279,6 -258,6 +279,6 @@@ install(FILES settings/env.default
                settings/import-address.style
                settings/import-full.style
                settings/import-extratags.style
-               settings/legacy_icu_tokenizer.yaml
+               settings/icu_tokenizer.yaml
                settings/icu-rules/extended-unicode-to-asccii.yaml
          DESTINATION ${NOMINATIM_CONFIGDIR})