commit 9fdda1b5f69467508a01e4e244f2c4d3f1d371f8
parent 697ec3749a62a26df0837c2abaf2aac497e06a37
Author: Florian Dold <florian.dold@gmail.com>
Date: Thu, 27 Aug 2020 11:02:36 +0530
update build-common submodule and fix configure.py location
Diffstat:
2 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/build-system/configure.py b/build-system/configure.py
@@ -0,0 +1,23 @@
+import sys
+from pathlib import Path
+from talerbuildconfig import *
+
+b = BuildConfig()
+b.enable_prefix()
+b.enable_variant()
+b.enable_configmk()
+b.add_tool(PythonTool())
+b.add_tool(PyBabelTool())
+b.add_tool(PosixTool("cp"))
+b.add_tool(PosixTool("echo"))
+b.add_tool(PosixTool("env"))
+b.add_tool(PosixTool("printf"))
+b.add_tool(PosixTool("grep"))
+b.add_tool(PosixTool("mkdir"))
+b.add_tool(PosixTool("rm"))
+b.add_tool(PosixTool("sh"))
+b.add_tool(PosixTool("msgmerge"))
+b.add_tool(PosixTool("tsc"))
+b.add_tool(PosixTool("git"))
+b.add_tool(BrowserTool())
+b.run()
diff --git a/configure.py b/configure.py
@@ -1,32 +0,0 @@
-import sys
-from pathlib import Path
-
-base_dir = Path(__file__, "../build-system/taler-build-scripts").resolve()
-
-if not base_dir.exists():
- print(f"build system directory (${base_dir}) missing", file=sys.stderr)
- sys.exit(1)
-
-sys.path.insert(0, str(base_dir))
-
-from talerbuildconfig import *
-
-b = BuildConfig()
-b.enable_prefix()
-b.enable_variant()
-b.enable_configmk()
-b.add_tool(PythonTool())
-b.add_tool(PyBabelTool())
-b.add_tool(PosixTool("cp"))
-b.add_tool(PosixTool("echo"))
-b.add_tool(PosixTool("env"))
-b.add_tool(PosixTool("printf"))
-b.add_tool(PosixTool("grep"))
-b.add_tool(PosixTool("mkdir"))
-b.add_tool(PosixTool("rm"))
-b.add_tool(PosixTool("sh"))
-b.add_tool(PosixTool("msgmerge"))
-b.add_tool(PosixTool("tsc"))
-b.add_tool(PosixTool("git"))
-b.add_tool(BrowserTool())
-b.run()