[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-build-common] 02/02: paths
From: |
gnunet |
Subject: |
[taler-build-common] 02/02: paths |
Date: |
Mon, 03 Aug 2020 09:50:30 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository build-common.
commit f65d933845faa73a864cce17a8ccd575d8da9f10
Author: Florian Dold <florian.dold@gmail.com>
AuthorDate: Mon Aug 3 13:20:23 2020 +0530
paths
---
configure | 4 +++-
talerbuildconfig.py | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index ef7f697..20de9e1 100755
--- a/configure
+++ b/configure
@@ -41,5 +41,7 @@ python3 "$scriptpath/pyvercheck.py" || exit $?
# Allow Python to find libraries that are checked into the build system git.
export PYTHONPATH="$scriptpath:${PYTHONPATH:-}"
+export TALERBUILDSYSTEMDIR=./build-system
+
# Call configure.py, assuming all went well.
-exec python3 ./configure.py "$@"
+exec python3 $TALERBUILDSYSTEMDIR/configure.py "$@"
diff --git a/talerbuildconfig.py b/talerbuildconfig.py
index d2fe3b0..832837e 100644
--- a/talerbuildconfig.py
+++ b/talerbuildconfig.py
@@ -36,6 +36,7 @@ from distutils.spawn import find_executable
import subprocess
from dataclasses import dataclass
import semver
+from pathlib import Path
"""
This module aims to replicate a small GNU Coding Standards
@@ -146,7 +147,9 @@ class BuildConfig:
print(f"found {tool.name} as {path} (version {version})")
if self.configmk_enabled:
- with open("config.mk", "w") as f:
+ d = Path(os.environ.get("TALERBUILDSYSTEMDIR", "."))
+ d.mkdir(parents=True, exist_ok=True)
+ with open(d / "config.mk", "w") as f:
print("writing config.mk")
f.write("# this makefile fragment is autogenerated by
configure.py\n")
if self.prefix_enabled:
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.