]> git.openstreetmap.org Git - nominatim.git/commitdiff
move PHP utilities into the lib directory
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 13 Jan 2021 09:51:44 +0000 (10:51 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 13 Jan 2021 13:44:45 +0000 (14:44 +0100)
These are not called directly as programs but used in a library
fashion by the installed utilities. So the library directory
is a better place.

CMakeLists.txt
cmake/script.tmpl
lib/admin/check_import_finished.php [moved from utils/check_import_finished.php with 100% similarity, mode: 0644]
lib/admin/country_languages.php [moved from utils/country_languages.php with 100% similarity]
lib/admin/export.php [moved from utils/export.php with 100% similarity]
lib/admin/query.php [moved from utils/query.php with 100% similarity]
lib/admin/setup.php [moved from utils/setup.php with 100% similarity]
lib/admin/specialphrases.php [moved from utils/specialphrases.php with 100% similarity]
lib/admin/update.php [moved from utils/update.php with 100% similarity]
lib/admin/warm.php [moved from utils/warm.php with 100% similarity]

index 253682df764d883273311b00eafb7de3f92480ee..1c2745946bcb133a85cf5a95ca24b06a4cd9e36e 100644 (file)
@@ -98,7 +98,6 @@ if (BUILD_IMPORTER)
    set(CUSTOMSCRIPTS
        check_import_finished.php
        country_languages.php
    set(CUSTOMSCRIPTS
        check_import_finished.php
        country_languages.php
-       importWikipedia.php
        export.php
        query.php
        setup.php
        export.php
        query.php
        setup.php
index 5b7bc6f7decb2c7a8feb6aaa527028088966217e..8e72cc08bc074c37cae2ca9f6f25427c883a2d55 100755 (executable)
@@ -6,4 +6,4 @@
 @define('CONST_LibDir', '@CMAKE_SOURCE_DIR@/lib');
 @define('CONST_DataDir', '@CMAKE_SOURCE_DIR@');
 
 @define('CONST_LibDir', '@CMAKE_SOURCE_DIR@/lib');
 @define('CONST_DataDir', '@CMAKE_SOURCE_DIR@');
 
-require_once(CONST_BinDir.'/@script_source@');
+require_once(CONST_LibDir.'/admin/@script_source@');
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from utils/check_import_finished.php
rename to lib/admin/check_import_finished.php
similarity index 100%
rename from utils/export.php
rename to lib/admin/export.php
similarity index 100%
rename from utils/query.php
rename to lib/admin/query.php
similarity index 100%
rename from utils/setup.php
rename to lib/admin/setup.php
similarity index 100%
rename from utils/update.php
rename to lib/admin/update.php
similarity index 100%
rename from utils/warm.php
rename to lib/admin/warm.php