From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 8 Mar 2016 23:07:46 +0000 (+0100)
Subject: install executables and call settings.php explicitly
X-Git-Tag: v3.0.0~197^2
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/5ccb499a6f389913fe8c8c745a31dff40907b98c?hp=b24ef60b33da99938d864b3ff1b9399282dd253a

install executables and call settings.php explicitly

Executables (including websites) need to be installed in the
build directory, so that they can find the right settings.php.
settings now defines build and source dir.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a561e020..dca35eca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,7 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
 #-----------------------------------------------------------------------------
 
 set(BUILD_TESTS on)
+set(WITH_LUA off)
 add_subdirectory(osm2pgsql)
 
 find_package(Threads REQUIRED)
@@ -60,19 +61,41 @@ include_directories(${LIBXML2_INCLUDE_DIR})
 #
 #-----------------------------------------------------------------------------
 
-configure_file(
-    ${PROJECT_SOURCE_DIR}/settings/settings.php
-    ${PROJECT_BINARY_DIR}/settings/settings.php
-)
+set(CUSTOMFILES
+    settings/settings.php
+    settings/phrase_settings.php
+    website/deletable.php
+    website/details.php
+    website/hierarchy.php
+    website/lookup.php
+    website/polygons.php
+    website/reverse.php
+    website/search.php
+    website/status.php
+    utils/blocks.php
+    utils/country_languages.php
+    utils/imports.php
+    utils/importWikipedia.php
+    utils/query.php
+    utils/server_compare.php
+    utils/setup.php
+    utils/specialphrases.php
+    utils/update.php
+    utils/warm.php
+   )
+
+foreach (cfile ${CUSTOMFILES})
+    configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
+endforeach()
+
+set(WEBPATHS css images js)
 
-configure_file(
-    ${PROJECT_SOURCE_DIR}/settings/phrase_settings.php
-    ${PROJECT_BINARY_DIR}/settings/phrase_settings.php
-)
+foreach (wp ${WEBPATHS})
+    execute_process(
+        COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
+    )
+endforeach()
 
-execute_process(
-    COMMAND ln -s -t ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/utils
-)
 
 #-----------------------------------------------------------------------------
 #
diff --git a/lib/init.php b/lib/init.php
index db984ef8..26952d05 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -1,8 +1,5 @@
 <?php
 
-	@define('CONST_BasePath', dirname(dirname(__FILE__)));
-
-	require_once('settings/settings.php');
 	require_once(CONST_BasePath.'/lib/lib.php');
 	require_once(CONST_BasePath.'/lib/leakybucket.php');
 	require_once(CONST_BasePath.'/lib/db.php');
diff --git a/settings/settings.php b/settings/settings.php
index 93d3a9d5..d48aff73 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -1,5 +1,6 @@
 <?php
-	@define('CONST_InstallPath', dirname(dirname(__FILE__)));
+	@define('CONST_BasePath', '@CMAKE_SOURCE_DIR@');
+	@define('CONST_InstallPath', '@CMAKE_BINARY_DIR@');
 	if (file_exists(CONST_InstallPath.'/settings/local.php')) require_once(CONST_InstallPath.'/settings/local.php');
 	if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 
diff --git a/utils/blocks.php b/utils/blocks.php
index bd5efd00..28c48c58 100755
--- a/utils/blocks.php
+++ b/utils/blocks.php
@@ -1,8 +1,9 @@
 #!/usr/bin/php -Cq
 <?php
 
-        require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
-        ini_set('memory_limit', '800M');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-cmd.php');
+	ini_set('memory_limit', '800M');
 
 	$aCMDOptions = array(
 		"Manage service blocks / restrictions",
diff --git a/utils/country_languages.php b/utils/country_languages.php
index 7e200e5b..5f890083 100755
--- a/utils/country_languages.php
+++ b/utils/country_languages.php
@@ -1,7 +1,9 @@
 #!/usr/bin/php -Cq
 <?php
 
-        require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.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/importWikipedia.php b/utils/importWikipedia.php
index 6e32ee11..8e527467 100755
--- a/utils/importWikipedia.php
+++ b/utils/importWikipedia.php
@@ -1,7 +1,8 @@
 #!/usr/bin/php -Cq
 <?php
 
-	require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-cmd.php');
 	ini_set('memory_limit', '800M');
 
 	$aCMDOptions = array(
diff --git a/utils/imports.php b/utils/imports.php
index 70a24963..a3a4848e 100755
--- a/utils/imports.php
+++ b/utils/imports.php
@@ -1,7 +1,8 @@
 #!/usr/bin/php -Cq
 <?php
 
-	require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-cmd.php');
 	ini_set('memory_limit', '800M');
 
 	$aCMDOptions = array(
diff --git a/utils/query.php b/utils/query.php
index b3fdb268..9ab23dc3 100755
--- a/utils/query.php
+++ b/utils/query.php
@@ -1,9 +1,10 @@
 #!/usr/bin/php -Cq
 <?php
 
-    require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
-    require_once(CONST_BasePath.'/lib/Geocode.php');
-    ini_set('memory_limit', '800M');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-cmd.php');
+	require_once(CONST_BasePath.'/lib/Geocode.php');
+	ini_set('memory_limit', '800M');
 
 	$aCMDOptions = array(
 		"Query database from command line. Returns search result as JSON.",
diff --git a/utils/setup.php b/utils/setup.php
index 259201bf..31db3d0d 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -1,7 +1,8 @@
 #!/usr/bin/php -Cq
 <?php
 
-	require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-cmd.php');
 	ini_set('memory_limit', '800M');
 
 	$aCMDOptions = array(
diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index 020f5f80..189a7a3e 100755
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -1,9 +1,10 @@
 #!/usr/bin/php -Cq
 <?php
 
-        require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
-        ini_set('memory_limit', '800M');
-        ini_set('display_errors', 'stderr');
+	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');
 
         $aCMDOptions = array(
                 "Import and export special phrases",
diff --git a/utils/update.php b/utils/update.php
index a91eb30e..67027302 100755
--- a/utils/update.php
+++ b/utils/update.php
@@ -1,8 +1,9 @@
 #!/usr/bin/php -Cq
 <?php
 
-        require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
-        ini_set('memory_limit', '800M');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-cmd.php');
+	ini_set('memory_limit', '800M');
 
 	$aCMDOptions = array(
 		"Import / update / index osm data",
diff --git a/utils/warm.php b/utils/warm.php
index 923e2aba..72eac27a 100755
--- a/utils/warm.php
+++ b/utils/warm.php
@@ -1,8 +1,9 @@
 #!/usr/bin/php -Cq
 <?php
 
-        require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
-        ini_set('memory_limit', '800M');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-cmd.php');
+	ini_set('memory_limit', '800M');
 
 	$aCMDOptions = array(
 		"Tools to warm nominatim db",
diff --git a/website/deletable.php b/website/deletable.php
index 5d6ee15d..3283bb83 100755
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -1,5 +1,6 @@
 <?php
-	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-website.php');
 	require_once(CONST_BasePath.'/lib/log.php');
 
 	$sOutputFormat = 'html';
diff --git a/website/details.php b/website/details.php
index 3a0fee82..4974717a 100755
--- a/website/details.php
+++ b/website/details.php
@@ -1,7 +1,8 @@
 <?php
 	@define('CONST_ConnectionBucket_PageType', 'Details');
 
-	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-website.php');
 	require_once(CONST_BasePath.'/lib/log.php');
 
 	$sOutputFormat = 'html';
diff --git a/website/hierarchy.php b/website/hierarchy.php
index de83ca44..5e3d7299 100755
--- a/website/hierarchy.php
+++ b/website/hierarchy.php
@@ -1,7 +1,8 @@
 <?php
 	@define('CONST_ConnectionBucket_PageType', 'Details');
 
-	require_once(dirname(dirname(__FILE__)).'/lib/init-website.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/PlaceLookup.php');
 
diff --git a/website/lookup.php b/website/lookup.php
index 51abe1f2..dfa09d3b 100755
--- a/website/lookup.php
+++ b/website/lookup.php
@@ -1,7 +1,8 @@
 <?php
 	@define('CONST_ConnectionBucket_PageType', 'Reverse');
 
-	require_once(dirname(dirname(__FILE__)).'/lib/init-website.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/PlaceLookup.php');
 
diff --git a/website/polygons.php b/website/polygons.php
index 423374c7..3c98bdbc 100755
--- a/website/polygons.php
+++ b/website/polygons.php
@@ -1,5 +1,6 @@
 <?php
-	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-website.php');
 	require_once(CONST_BasePath.'/lib/log.php');
 
 	$sOutputFormat = 'html';
diff --git a/website/reverse.php b/website/reverse.php
index d1c554a4..79a95012 100755
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,7 +1,8 @@
 <?php
 	@define('CONST_ConnectionBucket_PageType', 'Reverse');
 
-	require_once(dirname(dirname(__FILE__)).'/lib/init-website.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/PlaceLookup.php');
 	require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
diff --git a/website/search.php b/website/search.php
index c216c884..497ff598 100755
--- a/website/search.php
+++ b/website/search.php
@@ -1,7 +1,8 @@
 <?php
 	@define('CONST_ConnectionBucket_PageType', 'Search');
 
-	require_once(dirname(dirname(__FILE__)).'/lib/init-website.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/Geocode.php');
 
diff --git a/website/status.php b/website/status.php
index 832f4600..f4e696a4 100644
--- a/website/status.php
+++ b/website/status.php
@@ -1,7 +1,8 @@
 <?php
 	@define('CONST_ConnectionBucket_PageType', 'Status');
 
-	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-website.php');
 
 	function statusError($sMsg)
 	{