fix various failing BDD tests

[nominatim.git] / cmake / tool.tmpl

diff --git a/cmake/tool.tmpl b/cmake/tool.tmpl
index 332e4330a070915ab3671557785bc566d03411ea..96c6c6dcdb079f1ad8a3422c433f9b8471c9abef 100755 (executable)
--- a/cmake/tool.tmpl
+++ b/cmake/tool.tmpl
@@ -1,11 +1,14 @@
 #!/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
+from nominatim import cli
+from nominatim import version

 
 

-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@')
+version.GIT_COMMIT_HASH = '@GIT_HASH@'
+
+exit(cli.nominatim(module_dir='@CMAKE_BINARY_DIR@/module',
+                   osm2pgsql_path='@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql',
+                   phpcgi_path='@PHPCGI_BIN@'))