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.
This commit is contained in:
Sarah Hoffmann 2018-12-02 11:13:48 +01:00
parent 8b8ee00725
commit e70f405abd
20 changed files with 27 additions and 40 deletions

View File

@ -93,8 +93,7 @@ message (STATUS "Using PHP binary " ${PHP_BIN})
# #
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
set(CUSTOMFILES set(WEBSITESCRIPTS
settings/phrase_settings.php
website/deletable.php website/deletable.php
website/details.php website/details.php
website/hierarchy.php website/hierarchy.php
@ -103,6 +102,9 @@ set(CUSTOMFILES
website/reverse.php website/reverse.php
website/search.php website/search.php
website/status.php website/status.php
)
set(CUSTOMSCRIPTS
utils/country_languages.php utils/country_languages.php
utils/importWikipedia.php utils/importWikipedia.php
utils/export.php utils/export.php
@ -114,11 +116,24 @@ set(CUSTOMFILES
utils/warm.php utils/warm.php
) )
foreach (cfile ${CUSTOMFILES}) foreach (script_source ${CUSTOMSCRIPTS})
configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile}) configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl
${PROJECT_BINARY_DIR}/${script_source})
endforeach() endforeach()
configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php ${PROJECT_BINARY_DIR}/settings/settings.php) foreach (script_source ${WEBSITESCRIPTS})
configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl
${PROJECT_BINARY_DIR}/${script_source})
endforeach()
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) set(WEBPATHS css images js)

4
cmake/script.tmpl Executable file
View File

@ -0,0 +1,4 @@
#!@PHP_BIN@ -Cq
<?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/@script_source@');

3
cmake/website.tmpl Executable file
View File

@ -0,0 +1,3 @@
<?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/@script_source@');

2
utils/country_languages.php Executable file → Normal file
View File

@ -1,7 +1,5 @@
#!@PHP_BIN@ -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-cmd.php'); require_once(CONST_BasePath.'/lib/init-cmd.php');
ini_set('memory_limit', '800M'); ini_set('memory_limit', '800M');

2
utils/export.php Executable file → Normal file
View File

@ -1,10 +1,8 @@
#!@PHP_BIN@ -Cq
<?php <?php
// Script to extract structured city and street data // Script to extract structured city and street data
// from a running nominatim instance as CSV 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/init-cmd.php');
require_once(CONST_BasePath.'/lib/ParameterParser.php'); require_once(CONST_BasePath.'/lib/ParameterParser.php');
ini_set('memory_limit', '800M'); ini_set('memory_limit', '800M');

2
utils/importWikipedia.php Executable file → Normal file
View File

@ -1,7 +1,5 @@
#!/usr/bin/php -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-cmd.php'); require_once(CONST_BasePath.'/lib/init-cmd.php');
ini_set('memory_limit', '800M'); ini_set('memory_limit', '800M');

2
utils/query.php Executable file → Normal file
View File

@ -1,7 +1,5 @@
#!@PHP_BIN@ -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-cmd.php'); require_once(CONST_BasePath.'/lib/init-cmd.php');
require_once(CONST_BasePath.'/lib/Geocode.php'); require_once(CONST_BasePath.'/lib/Geocode.php');
require_once(CONST_BasePath.'/lib/ParameterParser.php'); require_once(CONST_BasePath.'/lib/ParameterParser.php');

1
utils/server_compare.php Executable file → Normal file
View File

@ -1,4 +1,3 @@
#!@PHP_BIN@ -Cq
<?php <?php
$sFile = 'sample.log.txt'; // Apache log file $sFile = 'sample.log.txt'; // Apache log file

5
utils/setup.php Executable file → Normal file
View File

@ -1,11 +1,6 @@
#!@PHP_BIN@ -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-cmd.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/SetupClass.php');
require_once(CONST_BasePath.'/lib/setup_functions.php'); require_once(CONST_BasePath.'/lib/setup_functions.php');
ini_set('memory_limit', '800M'); ini_set('memory_limit', '800M');

2
utils/specialphrases.php Executable file → Normal file
View File

@ -1,7 +1,5 @@
#!@PHP_BIN@ -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-cmd.php'); require_once(CONST_BasePath.'/lib/init-cmd.php');
ini_set('memory_limit', '800M'); ini_set('memory_limit', '800M');
ini_set('display_errors', 'stderr'); ini_set('display_errors', 'stderr');

2
utils/update.php Executable file → Normal file
View File

@ -1,7 +1,5 @@
#!@PHP_BIN@ -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-cmd.php'); require_once(CONST_BasePath.'/lib/init-cmd.php');
require_once(CONST_BasePath.'/lib/setup_functions.php'); require_once(CONST_BasePath.'/lib/setup_functions.php');
require_once(CONST_BasePath.'/lib/setup/SetupClass.php'); require_once(CONST_BasePath.'/lib/setup/SetupClass.php');

2
utils/warm.php Executable file → Normal file
View File

@ -1,7 +1,5 @@
#!@PHP_BIN@ -Cq
<?php <?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-cmd.php'); require_once(CONST_BasePath.'/lib/init-cmd.php');
ini_set('memory_limit', '800M'); ini_set('memory_limit', '800M');

1
website/deletable.php Executable file → Normal file
View File

@ -1,6 +1,5 @@
<?php <?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-website.php'); require_once(CONST_BasePath.'/lib/init-website.php');
require_once(CONST_BasePath.'/lib/log.php'); require_once(CONST_BasePath.'/lib/log.php');
require_once(CONST_BasePath.'/lib/output.php'); require_once(CONST_BasePath.'/lib/output.php');

2
website/details.php Executable file → Normal file
View File

@ -1,7 +1,5 @@
<?php <?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/init-website.php');
require_once(CONST_BasePath.'/lib/log.php'); require_once(CONST_BasePath.'/lib/log.php');
require_once(CONST_BasePath.'/lib/output.php'); require_once(CONST_BasePath.'/lib/output.php');

2
website/hierarchy.php Executable file → Normal file
View File

@ -1,7 +1,5 @@
<?php <?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/init-website.php');
require_once(CONST_BasePath.'/lib/log.php'); require_once(CONST_BasePath.'/lib/log.php');
require_once(CONST_BasePath.'/lib/AddressDetails.php'); require_once(CONST_BasePath.'/lib/AddressDetails.php');

2
website/lookup.php Executable file → Normal file
View File

@ -1,7 +1,5 @@
<?php <?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/init-website.php');
require_once(CONST_BasePath.'/lib/log.php'); require_once(CONST_BasePath.'/lib/log.php');
require_once(CONST_BasePath.'/lib/PlaceLookup.php'); require_once(CONST_BasePath.'/lib/PlaceLookup.php');

1
website/polygons.php Executable file → Normal file
View File

@ -1,6 +1,5 @@
<?php <?php
require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-website.php'); require_once(CONST_BasePath.'/lib/init-website.php');
require_once(CONST_BasePath.'/lib/log.php'); require_once(CONST_BasePath.'/lib/log.php');
require_once(CONST_BasePath.'/lib/output.php'); require_once(CONST_BasePath.'/lib/output.php');

2
website/reverse.php Executable file → Normal file
View File

@ -1,7 +1,5 @@
<?php <?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/init-website.php');
require_once(CONST_BasePath.'/lib/log.php'); require_once(CONST_BasePath.'/lib/log.php');
require_once(CONST_BasePath.'/lib/PlaceLookup.php'); require_once(CONST_BasePath.'/lib/PlaceLookup.php');

2
website/search.php Executable file → Normal file
View File

@ -1,7 +1,5 @@
<?php <?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/init-website.php');
require_once(CONST_BasePath.'/lib/log.php'); require_once(CONST_BasePath.'/lib/log.php');
require_once(CONST_BasePath.'/lib/Geocode.php'); require_once(CONST_BasePath.'/lib/Geocode.php');

View File

@ -1,8 +1,5 @@
<?php <?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/init-website.php');
require_once(CONST_BasePath.'/lib/ParameterParser.php'); require_once(CONST_BasePath.'/lib/ParameterParser.php');
require_once(CONST_BasePath.'/lib/Status.php'); require_once(CONST_BasePath.'/lib/Status.php');