[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-taler-build-scripts] branch master updated: allow co
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-taler-build-scripts] branch master updated: allow configure.py to be simpler |
Date: |
Tue, 15 Oct 2019 08:27:34 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository taler-build-scripts.
The following commit(s) were added to refs/heads/master by this push:
new aa9b6a6 allow configure.py to be simpler
aa9b6a6 is described below
commit aa9b6a610ffe88fc714d42089fb2afa8dbc32894
Author: Florian Dold <address@hidden>
AuthorDate: Tue Oct 15 11:57:20 2019 +0530
allow configure.py to be simpler
---
configure | 8 ++++++++
configure.py.template | 11 +----------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index e101748..f74d338 100755
--- a/configure
+++ b/configure
@@ -73,6 +73,14 @@ fi
# don't have python if we reach the point to fail.
PYTHON=$($python -c 'import sys; print(sys.executable)')
+scriptpath=build-system/taler-build-scripts
+
+if ! test -d "$scriptpath"; then
+ echo "fatal error: taler-build-scripts not found at $scriptpath" >&2
+ exit 1
+fi
+
+export PYTHONPATH="$scriptpath:${PYTHONPATH:-}"
# Call configure.py, assuming all went well.
# $1 is read by configure.py as the prefix.
diff --git a/configure.py.template b/configure.py.template
index 0cb77fe..337c51d 100644
--- a/configure.py.template
+++ b/configure.py.template
@@ -1,13 +1,4 @@
-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))
+# This configure.py.template file is in the public domain.
from talerbuildconfig import *
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-taler-build-scripts] branch master updated: allow configure.py to be simpler,
gnunet <=