From 9fdda1b5f69467508a01e4e244f2c4d3f1d371f8 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 27 Aug 2020 11:02:36 +0530 Subject: update build-common submodule and fix configure.py location --- build-system/configure.py | 23 +++++++++++++++++++++++ build-system/taler-build-scripts | 2 +- configure.py | 32 -------------------------------- help | 2 +- 4 files changed, 25 insertions(+), 34 deletions(-) create mode 100644 build-system/configure.py delete mode 100644 configure.py diff --git a/build-system/configure.py b/build-system/configure.py new file mode 100644 index 00000000..6b13143a --- /dev/null +++ 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/build-system/taler-build-scripts b/build-system/taler-build-scripts index eaebfbb4..c76fb9b3 160000 --- a/build-system/taler-build-scripts +++ b/build-system/taler-build-scripts @@ -1 +1 @@ -Subproject commit eaebfbb4887d9410bc89e75bd142d5213f44296b +Subproject commit c76fb9b3af6ec43f2d2a83e6b4f523dcc5ac6a54 diff --git a/configure.py b/configure.py deleted file mode 100644 index e68c4c47..00000000 --- a/configure.py +++ /dev/null @@ -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() diff --git a/help b/help index 183cb78c..3c754339 160000 --- a/help +++ b/help @@ -1 +1 @@ -Subproject commit 183cb78c3aa2415b038f6030ca353c3d592301ac +Subproject commit 3c75433969600126a3ba9070f40b45687535226c -- cgit v1.2.3