From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 13 Jan 2021 09:51:44 +0000 (+0100)
Subject: move PHP utilities into the lib directory
X-Git-Tag: v3.7.0~57^2~16
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/ff5a2372001b024e2e11d6d4db8d69809b1e5d29

move PHP utilities into the lib directory

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.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 253682df..1c274594 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,6 @@ if (BUILD_IMPORTER)
    set(CUSTOMSCRIPTS
        check_import_finished.php
        country_languages.php
-       importWikipedia.php
        export.php
        query.php
        setup.php
diff --git a/cmake/script.tmpl b/cmake/script.tmpl
index 5b7bc6f7..8e72cc08 100755
--- a/cmake/script.tmpl
+++ b/cmake/script.tmpl
@@ -6,4 +6,4 @@
 @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@');
diff --git a/utils/check_import_finished.php b/lib/admin/check_import_finished.php
old mode 100755
new mode 100644
similarity index 100%
rename from utils/check_import_finished.php
rename to lib/admin/check_import_finished.php
diff --git a/utils/country_languages.php b/lib/admin/country_languages.php
similarity index 100%
rename from utils/country_languages.php
rename to lib/admin/country_languages.php
diff --git a/utils/export.php b/lib/admin/export.php
similarity index 100%
rename from utils/export.php
rename to lib/admin/export.php
diff --git a/utils/query.php b/lib/admin/query.php
similarity index 100%
rename from utils/query.php
rename to lib/admin/query.php
diff --git a/utils/setup.php b/lib/admin/setup.php
similarity index 100%
rename from utils/setup.php
rename to lib/admin/setup.php
diff --git a/utils/specialphrases.php b/lib/admin/specialphrases.php
similarity index 100%
rename from utils/specialphrases.php
rename to lib/admin/specialphrases.php
diff --git a/utils/update.php b/lib/admin/update.php
similarity index 100%
rename from utils/update.php
rename to lib/admin/update.php
diff --git a/utils/warm.php b/lib/admin/warm.php
similarity index 100%
rename from utils/warm.php
rename to lib/admin/warm.php