From 680d61dfdede48cf8947b9772ab5016c4e068efe Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 30 Mar 2020 12:54:52 +0530 Subject: [PATCH] node version check in build system --- build-system/taler-build-scripts | 2 +- configure.py | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts index d81bbfabc..b26043179 160000 --- a/build-system/taler-build-scripts +++ b/build-system/taler-build-scripts @@ -1 +1 @@ -Subproject commit d81bbfabc2538932f631d3946bd6a9b95182b4f2 +Subproject commit b2604317980b9cb26f1445dfb6ff82c84f9cbe65 diff --git a/configure.py b/configure.py index 89d143325..4595aae10 100644 --- a/configure.py +++ b/configure.py @@ -4,12 +4,17 @@ # This file is invoked by './configure' and should usually not be invoked # manually. -from talerbuildconfig import * +import talerbuildconfig as tbc +import sys -b = BuildConfig() +if getattr(tbc, "serialversion", 0) < 2: + print("talerbuildconfig outdated, please update the build-common submodule and/or bootstrap") + sys.exit(1) + +b = tbc.BuildConfig() b.enable_prefix() b.enable_configmk() -b.add_tool(PosixTool("find")) -b.add_tool(NodeJsTool()) -b.add_tool(YarnTool()) +b.add_tool(tbc.PosixTool("find")) +b.add_tool(tbc.NodeJsTool(version_spec=">=12")) +b.add_tool(tbc.YarnTool()) b.run()