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 253682df764d883273311b00eafb7de3f92480ee..1c2745946bcb133a85cf5a95ca24b06a4cd9e36e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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

diff --git a/cmake/script.tmpl b/cmake/script.tmpl
index 5b7bc6f7decb2c7a8feb6aaa527028088966217e..8e72cc08bc074c37cae2ca9f6f25427c883a2d55 100755 (executable)
--- 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@');
 
 @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 (executable)
new mode 100644 (file)
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