From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 2 Dec 2018 10:13:48 +0000 (+0100)
Subject: Restructure script and website installation
X-Git-Tag: v3.3.0~51^2~3
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/e70f405abddfe5a8a7400424558071ebba769eda?ds=sidebyside

Restructure script and website installation

Just make cmake install a small stub that includes
the settings from the build directory and then the
script from the source directory. Remove executable
rights from php files in utils/ so that they cannot
be accidentally executed.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 898ab229..b7a2caaf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,8 +93,7 @@ message (STATUS "Using PHP binary " ${PHP_BIN})
 #
 #-----------------------------------------------------------------------------
 
-set(CUSTOMFILES
-    settings/phrase_settings.php
+set(WEBSITESCRIPTS
     website/deletable.php
     website/details.php
     website/hierarchy.php
@@ -103,6 +102,9 @@ set(CUSTOMFILES
     website/reverse.php
     website/search.php
     website/status.php
+)
+
+set(CUSTOMSCRIPTS
     utils/country_languages.php
     utils/importWikipedia.php
     utils/export.php
@@ -114,11 +116,24 @@ set(CUSTOMFILES
     utils/warm.php
    )
 
-foreach (cfile ${CUSTOMFILES})
-    configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
+foreach (script_source ${CUSTOMSCRIPTS})
+    configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl
+                   ${PROJECT_BINARY_DIR}/${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}/settings/defaults.php ${PROJECT_BINARY_DIR}/settings/settings.php)
+set(CONFIGUREFILES
+    settings/phrase_settings.php
+    settings/defaults.php
+   )
+
+foreach (cfile ${CONFIGUREFILES})
+    configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
+endforeach()
 
 set(WEBPATHS css images js)
 
diff --git a/cmake/script.tmpl b/cmake/script.tmpl
new file mode 100755
index 00000000..8146ca8b
--- /dev/null
+++ b/cmake/script.tmpl
@@ -0,0 +1,4 @@
+#!@PHP_BIN@ -Cq
+<?php
+require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+require_once(CONST_BasePath.'/@script_source@');
diff --git a/cmake/website.tmpl b/cmake/website.tmpl
new file mode 100755
index 00000000..0257aa10
--- /dev/null
+++ b/cmake/website.tmpl
@@ -0,0 +1,3 @@
+<?php
+require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+require_once(CONST_BasePath.'/@script_source@');
diff --git a/utils/country_languages.php b/utils/country_languages.php
old mode 100755
new mode 100644
index b1a7ab11..07a94225
--- a/utils/country_languages.php
+++ b/utils/country_languages.php
@@ -1,7 +1,5 @@
-#!@PHP_BIN@ -Cq
 <?php
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-cmd.php');
 
 ini_set('memory_limit', '800M');
diff --git a/utils/export.php b/utils/export.php
old mode 100755
new mode 100644
index aafb3759..34f1b011
--- a/utils/export.php
+++ b/utils/export.php
@@ -1,10 +1,8 @@
-#!@PHP_BIN@ -Cq
 <?php
     // Script to extract structured city and street data
     // from a running nominatim instance as CSV data
 
 
-    require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
     require_once(CONST_BasePath.'/lib/init-cmd.php');
     require_once(CONST_BasePath.'/lib/ParameterParser.php');
     ini_set('memory_limit', '800M');
diff --git a/utils/importWikipedia.php b/utils/importWikipedia.php
old mode 100755
new mode 100644
index 6e429754..06db6036
--- a/utils/importWikipedia.php
+++ b/utils/importWikipedia.php
@@ -1,7 +1,5 @@
-#!/usr/bin/php -Cq
 <?php
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-cmd.php');
 ini_set('memory_limit', '800M');
 
diff --git a/utils/query.php b/utils/query.php
old mode 100755
new mode 100644
index e3e2e7b8..16657daf
--- a/utils/query.php
+++ b/utils/query.php
@@ -1,7 +1,5 @@
-#!@PHP_BIN@ -Cq
 <?php
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-cmd.php');
 require_once(CONST_BasePath.'/lib/Geocode.php');
 require_once(CONST_BasePath.'/lib/ParameterParser.php');
diff --git a/utils/server_compare.php b/utils/server_compare.php
old mode 100755
new mode 100644
index 0a27c484..f44b073e
--- a/utils/server_compare.php
+++ b/utils/server_compare.php
@@ -1,4 +1,3 @@
-#!@PHP_BIN@ -Cq
 <?php
 
 $sFile = 'sample.log.txt'; // Apache log file
diff --git a/utils/setup.php b/utils/setup.php
old mode 100755
new mode 100644
index 0d2e6583..66b71920
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -1,11 +1,6 @@
-#!@PHP_BIN@ -Cq
 <?php
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-cmd.php');
-// ->indirect via init-cmd.php->/lib/cmd.php                for runWithEnv, getCmdOpt
-// ->indirect via init-cmd.php->/lib/init.php->db.php       for &getDB()
-
 require_once(CONST_BasePath.'/lib/setup/SetupClass.php');
 require_once(CONST_BasePath.'/lib/setup_functions.php');
 ini_set('memory_limit', '800M');
diff --git a/utils/specialphrases.php b/utils/specialphrases.php
old mode 100755
new mode 100644
index 7d22df50..40fd3750
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -1,7 +1,5 @@
-#!@PHP_BIN@ -Cq
 <?php
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-cmd.php');
 ini_set('memory_limit', '800M');
 ini_set('display_errors', 'stderr');
diff --git a/utils/update.php b/utils/update.php
old mode 100755
new mode 100644
index 7cb21879..24095ef4
--- a/utils/update.php
+++ b/utils/update.php
@@ -1,7 +1,5 @@
-#!@PHP_BIN@ -Cq
 <?php
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-cmd.php');
 require_once(CONST_BasePath.'/lib/setup_functions.php');
 require_once(CONST_BasePath.'/lib/setup/SetupClass.php');
diff --git a/utils/warm.php b/utils/warm.php
old mode 100755
new mode 100644
index 653bcf10..5e1b3eed
--- a/utils/warm.php
+++ b/utils/warm.php
@@ -1,7 +1,5 @@
-#!@PHP_BIN@ -Cq
 <?php
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-cmd.php');
 ini_set('memory_limit', '800M');
 
diff --git a/website/deletable.php b/website/deletable.php
old mode 100755
new mode 100644
index 6e9178e0..5b94d45b
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-website.php');
 require_once(CONST_BasePath.'/lib/log.php');
 require_once(CONST_BasePath.'/lib/output.php');
diff --git a/website/details.php b/website/details.php
old mode 100755
new mode 100644
index 81d643f0..474c1d87
--- a/website/details.php
+++ b/website/details.php
@@ -1,7 +1,5 @@
 <?php
-@define('CONST_ConnectionBucket_PageType', 'Details');
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-website.php');
 require_once(CONST_BasePath.'/lib/log.php');
 require_once(CONST_BasePath.'/lib/output.php');
diff --git a/website/hierarchy.php b/website/hierarchy.php
old mode 100755
new mode 100644
index 3ac4f323..419a0474
--- a/website/hierarchy.php
+++ b/website/hierarchy.php
@@ -1,7 +1,5 @@
 <?php
-@define('CONST_ConnectionBucket_PageType', 'Details');
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-website.php');
 require_once(CONST_BasePath.'/lib/log.php');
 require_once(CONST_BasePath.'/lib/AddressDetails.php');
diff --git a/website/lookup.php b/website/lookup.php
old mode 100755
new mode 100644
index ec2a3a8a..ae76df2f
--- a/website/lookup.php
+++ b/website/lookup.php
@@ -1,7 +1,5 @@
 <?php
-@define('CONST_ConnectionBucket_PageType', 'Reverse');
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-website.php');
 require_once(CONST_BasePath.'/lib/log.php');
 require_once(CONST_BasePath.'/lib/PlaceLookup.php');
diff --git a/website/polygons.php b/website/polygons.php
old mode 100755
new mode 100644
index 0f49183f..e5d459f3
--- a/website/polygons.php
+++ b/website/polygons.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-website.php');
 require_once(CONST_BasePath.'/lib/log.php');
 require_once(CONST_BasePath.'/lib/output.php');
diff --git a/website/reverse.php b/website/reverse.php
old mode 100755
new mode 100644
index 963f7500..0ba17714
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,7 +1,5 @@
 <?php
-@define('CONST_ConnectionBucket_PageType', 'Reverse');
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-website.php');
 require_once(CONST_BasePath.'/lib/log.php');
 require_once(CONST_BasePath.'/lib/PlaceLookup.php');
diff --git a/website/search.php b/website/search.php
old mode 100755
new mode 100644
index 0b678caa..696cdf73
--- a/website/search.php
+++ b/website/search.php
@@ -1,7 +1,5 @@
 <?php
-@define('CONST_ConnectionBucket_PageType', 'Search');
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-website.php');
 require_once(CONST_BasePath.'/lib/log.php');
 require_once(CONST_BasePath.'/lib/Geocode.php');
diff --git a/website/status.php b/website/status.php
index c0c379d0..90be9388 100644
--- a/website/status.php
+++ b/website/status.php
@@ -1,8 +1,5 @@
 <?php
 
-@define('CONST_ConnectionBucket_PageType', 'Status');
-
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-website.php');
 require_once(CONST_BasePath.'/lib/ParameterParser.php');
 require_once(CONST_BasePath.'/lib/Status.php');