[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-build-common] 36/50: allow configure.py to be simpler
From: |
gnunet |
Subject: |
[taler-build-common] 36/50: allow configure.py to be simpler |
Date: |
Sat, 02 Nov 2019 16:38:55 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository build-common.
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.
- [taler-build-common] 07/50: env DEBUG shows log statements., (continued)
- [taler-build-common] 07/50: env DEBUG shows log statements., gnunet, 2019/11/02
- [taler-build-common] 13/50: move most of the shell functionality to the python script., gnunet, 2019/11/02
- [taler-build-common] 20/50: debug logs., gnunet, 2019/11/02
- [taler-build-common] 23/50: fix conditions, gnunet, 2019/11/02
- [taler-build-common] 24/50: fix output, gnunet, 2019/11/02
- [taler-build-common] 30/50: babel not bable, gnunet, 2019/11/02
- [taler-build-common] 22/50: maybe fix, gnunet, 2019/11/02
- [taler-build-common] 31/50: remove Makefile, gnunet, 2019/11/02
- [taler-build-common] 26/50: Merge branch 'master' of git.taler.net:taler-build-scripts, gnunet, 2019/11/02
- [taler-build-common] 34/50: template should not be executable, gnunet, 2019/11/02
- [taler-build-common] 36/50: allow configure.py to be simpler,
gnunet <=
- [taler-build-common] 29/50: drop old imports, gnunet, 2019/11/02
- [taler-build-common] 40/50: syntax fix, gnunet, 2019/11/02
- [taler-build-common] 44/50: version check python., gnunet, 2019/11/02
- [taler-build-common] 35/50: exec, gnunet, 2019/11/02
- [taler-build-common] 50/50: use shlex.split(), gnunet, 2019/11/02
- [taler-build-common] 48/50: output pybabel and python versions. try to get minimal version. hack around browser not being found., gnunet, 2019/11/02
- [taler-build-common] 25/50: apply most feedback + lint, gnunet, 2019/11/02
- [taler-build-common] 28/50: check in code independent build system code., gnunet, 2019/11/02
- [taler-build-common] 41/50: start to make sh code reusable., gnunet, 2019/11/02
- [taler-build-common] 49/50: python is not always python3., gnunet, 2019/11/02