Merge remote-tracking branch 'upstream/master'

[nominatim.git] / cmake / tool.tmpl

diff --git a/cmake/tool.tmpl b/cmake/tool.tmpl
index 332e4330a070915ab3671557785bc566d03411ea..c1ecd3f03eec002aa686e065c17c6255cc3dd816 100755 (executable)
--- a/cmake/tool.tmpl
+++ b/cmake/tool.tmpl
@@ -1,11 +1,20 @@
 #!/usr/bin/env python3
 import sys
 #!/usr/bin/env python3
 import sys

+import os

 
 sys.path.insert(1, '@CMAKE_SOURCE_DIR@')
 
 
 sys.path.insert(1, '@CMAKE_SOURCE_DIR@')
 

-from nominatim import tools
+os.environ['NOMINATIM_NOMINATIM_TOOL'] = os.path.abspath(__file__)

 
 

-tools.@tool_name@(module_dir='@CMAKE_BINARY_DIR@/module',
-                  osm2pgsql_path='@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql',
-                  phplib_dir='@CMAKE_SOURCE_DIR@/lib',
-                  data_dir='@CMAKE_SOURCE_DIR@')
+from nominatim import cli
+from nominatim import version
+
+version.GIT_COMMIT_HASH = '@GIT_HASH@'
+
+exit(cli.nominatim(module_dir='@CMAKE_BINARY_DIR@/module',
+                   osm2pgsql_path='@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql',
+                   phplib_dir='@CMAKE_SOURCE_DIR@/lib-php',
+                   sqllib_dir='@CMAKE_SOURCE_DIR@/lib-sql',
+                   data_dir='@CMAKE_SOURCE_DIR@/data',
+                   config_dir='@CMAKE_SOURCE_DIR@/settings',
+                   phpcgi_path='@PHPCGI_BIN@'))