Skip to content

Commit 5ccb499

Browse files
lonvialonvia
committed
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.
1 parent b24ef60 commit 5ccb499

20 files changed

+78
-39
lines changed

‎CMakeLists.txt

+34-11
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
3333
#-----------------------------------------------------------------------------
3434

3535
set(BUILD_TESTS on)
36+
set(WITH_LUA off)
3637
add_subdirectory(osm2pgsql)
3738

3839
find_package(Threads REQUIRED)
@@ -60,19 +61,41 @@ include_directories(${LIBXML2_INCLUDE_DIR})
6061
#
6162
#-----------------------------------------------------------------------------
6263

63-
configure_file(
64-
${PROJECT_SOURCE_DIR}/settings/settings.php
65-
${PROJECT_BINARY_DIR}/settings/settings.php
66-
)
64+
set(CUSTOMFILES
65+
settings/settings.php
66+
settings/phrase_settings.php
67+
website/deletable.php
68+
website/details.php
69+
website/hierarchy.php
70+
website/lookup.php
71+
website/polygons.php
72+
website/reverse.php
73+
website/search.php
74+
website/status.php
75+
utils/blocks.php
76+
utils/country_languages.php
77+
utils/imports.php
78+
utils/importWikipedia.php
79+
utils/query.php
80+
utils/server_compare.php
81+
utils/setup.php
82+
utils/specialphrases.php
83+
utils/update.php
84+
utils/warm.php
85+
)
86+
87+
foreach (cfile ${CUSTOMFILES})
88+
configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
89+
endforeach()
90+
91+
set(WEBPATHS css images js)
6792

68-
configure_file(
69-
${PROJECT_SOURCE_DIR}/settings/phrase_settings.php
70-
${PROJECT_BINARY_DIR}/settings/phrase_settings.php
71-
)
93+
foreach (wp ${WEBPATHS})
94+
execute_process(
95+
COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
96+
)
97+
endforeach()
7298

73-
execute_process(
74-
COMMAND ln -s -t ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/utils
75-
)
7699

77100
#-----------------------------------------------------------------------------
78101
#

‎lib/init.php

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?php
22

3-
@define('CONST_BasePath', dirname(dirname(__FILE__)));
4-
5-
require_once('settings/settings.php');
63
require_once(CONST_BasePath.'/lib/lib.php');
74
require_once(CONST_BasePath.'/lib/leakybucket.php');
85
require_once(CONST_BasePath.'/lib/db.php');

‎settings/settings.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
2-
@define('CONST_InstallPath', dirname(dirname(__FILE__)));
2+
@define('CONST_BasePath', '@CMAKE_SOURCE_DIR@');
3+
@define('CONST_InstallPath', '@CMAKE_BINARY_DIR@');
34
if (file_exists(CONST_InstallPath.'/settings/local.php')) require_once(CONST_InstallPath.'/settings/local.php');
45
if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
56

‎utils/blocks.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/usr/bin/php -Cq
22
<?php
33

4-
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
5-
ini_set('memory_limit', '800M');
4+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
5+
require_once(CONST_BasePath.'/lib/init-cmd.php');
6+
ini_set('memory_limit', '800M');
67

78
$aCMDOptions = array(
89
"Manage service blocks / restrictions",

‎utils/country_languages.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#!/usr/bin/php -Cq
22
<?php
33

4-
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
4+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
5+
require_once(CONST_BasePath.'/lib/init-cmd.php');
6+
57
ini_set('memory_limit', '800M');
68
ini_set('display_errors', 'stderr');
79

‎utils/importWikipedia.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/php -Cq
22
<?php
33

4-
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
4+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
5+
require_once(CONST_BasePath.'/lib/init-cmd.php');
56
ini_set('memory_limit', '800M');
67

78
$aCMDOptions = array(

‎utils/imports.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/php -Cq
22
<?php
33

4-
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
4+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
5+
require_once(CONST_BasePath.'/lib/init-cmd.php');
56
ini_set('memory_limit', '800M');
67

78
$aCMDOptions = array(

‎utils/query.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/usr/bin/php -Cq
22
<?php
33

4-
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
5-
require_once(CONST_BasePath.'/lib/Geocode.php');
6-
ini_set('memory_limit', '800M');
4+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
5+
require_once(CONST_BasePath.'/lib/init-cmd.php');
6+
require_once(CONST_BasePath.'/lib/Geocode.php');
7+
ini_set('memory_limit', '800M');
78

89
$aCMDOptions = array(
910
"Query database from command line. Returns search result as JSON.",

‎utils/setup.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/php -Cq
22
<?php
33

4-
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
4+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
5+
require_once(CONST_BasePath.'/lib/init-cmd.php');
56
ini_set('memory_limit', '800M');
67

78
$aCMDOptions = array(

‎utils/specialphrases.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/usr/bin/php -Cq
22
<?php
33

4-
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
5-
ini_set('memory_limit', '800M');
6-
ini_set('display_errors', 'stderr');
4+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
5+
require_once(CONST_BasePath.'/lib/init-cmd.php');
6+
ini_set('memory_limit', '800M');
7+
ini_set('display_errors', 'stderr');
78

89
$aCMDOptions = array(
910
"Import and export special phrases",

‎utils/update.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/usr/bin/php -Cq
22
<?php
33

4-
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
5-
ini_set('memory_limit', '800M');
4+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
5+
require_once(CONST_BasePath.'/lib/init-cmd.php');
6+
ini_set('memory_limit', '800M');
67

78
$aCMDOptions = array(
89
"Import / update / index osm data",

‎utils/warm.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/usr/bin/php -Cq
22
<?php
33

4-
require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
5-
ini_set('memory_limit', '800M');
4+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
5+
require_once(CONST_BasePath.'/lib/init-cmd.php');
6+
ini_set('memory_limit', '800M');
67

78
$aCMDOptions = array(
89
"Tools to warm nominatim db",

‎website/deletable.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
2-
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
2+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
3+
require_once(CONST_BasePath.'/lib/init-website.php');
34
require_once(CONST_BasePath.'/lib/log.php');
45

56
$sOutputFormat = 'html';

‎website/details.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
@define('CONST_ConnectionBucket_PageType', 'Details');
33

4-
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
4+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
5+
require_once(CONST_BasePath.'/lib/init-website.php');
56
require_once(CONST_BasePath.'/lib/log.php');
67

78
$sOutputFormat = 'html';

‎website/hierarchy.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
@define('CONST_ConnectionBucket_PageType', 'Details');
33

4-
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
4+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
5+
require_once(CONST_BasePath.'/lib/init-website.php');
56
require_once(CONST_BasePath.'/lib/log.php');
67
require_once(CONST_BasePath.'/lib/PlaceLookup.php');
78

‎website/lookup.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
@define('CONST_ConnectionBucket_PageType', 'Reverse');
33

4-
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
4+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
5+
require_once(CONST_BasePath.'/lib/init-website.php');
56
require_once(CONST_BasePath.'/lib/log.php');
67
require_once(CONST_BasePath.'/lib/PlaceLookup.php');
78

‎website/polygons.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
2-
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
2+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
3+
require_once(CONST_BasePath.'/lib/init-website.php');
34
require_once(CONST_BasePath.'/lib/log.php');
45

56
$sOutputFormat = 'html';

‎website/reverse.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
@define('CONST_ConnectionBucket_PageType', 'Reverse');
33

4-
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
4+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
5+
require_once(CONST_BasePath.'/lib/init-website.php');
56
require_once(CONST_BasePath.'/lib/log.php');
67
require_once(CONST_BasePath.'/lib/PlaceLookup.php');
78
require_once(CONST_BasePath.'/lib/ReverseGeocode.php');

‎website/search.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
@define('CONST_ConnectionBucket_PageType', 'Search');
33

4-
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
4+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
5+
require_once(CONST_BasePath.'/lib/init-website.php');
56
require_once(CONST_BasePath.'/lib/log.php');
67
require_once(CONST_BasePath.'/lib/Geocode.php');
78

‎website/status.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22
@define('CONST_ConnectionBucket_PageType', 'Status');
33

4-
require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
4+
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
5+
require_once(CONST_BasePath.'/lib/init-website.php');
56

67
function statusError($sMsg)
78
{

0 commit comments

Comments
 (0)