diff options
author | t3sserakt <t3ss@posteo.de> | 2024-03-12 10:45:59 +0100 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2024-03-12 10:45:59 +0100 |
commit | d8d09f2178def3c1bdbf8980df75341dc178a6f1 (patch) | |
tree | 518aaf11796fdf0e6a00dbfe8166d8772af2595a /configure | |
parent | 6bdbd6661b6cdb11d5654681f641dfccd886c973 (diff) | |
parent | e47f2b3e7d318968d87a2eb6d104cb09b909677f (diff) | |
download | www-d8d09f2178def3c1bdbf8980df75341dc178a6f1.tar.gz www-d8d09f2178def3c1bdbf8980df75341dc178a6f1.zip |
Merge branch 'master' of ssh://git.gnunet.org/www
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 23 |
1 files changed, 5 insertions, 18 deletions
@@ -20,29 +20,14 @@ | |||
20 | # This script checks if a suitable python3 executable is installed and then | 20 | # This script checks if a suitable python3 executable is installed and then |
21 | # executes the actual configure logic written in Python. | 21 | # executes the actual configure logic written in Python. |
22 | 22 | ||
23 | build_system_dir=build-system | 23 | scriptpath=build-system/taler-build-scripts |
24 | 24 | ||
25 | if ! test -d "$build_system_dir"; then | 25 | if ! test -d "$scriptpath"; then |
26 | # Maybe this is not a top-level configure invocation | 26 | echo "fatal error: taler-build-scripts not found at $scriptpath" >&2 |
27 | # For monorepos, try location from top-level | ||
28 | build_system_dir=../../build-system | ||
29 | fi | ||
30 | |||
31 | if ! test -d "$build_system_dir"; then | ||
32 | echo "fatal error: build-system directory not found" >&2 | ||
33 | echo "hint: are you running this script from the right directory?" >&2 | ||
34 | exit 1 | ||
35 | fi | ||
36 | |||
37 | scriptpath=$build_system_dir/taler-build-scripts | ||
38 | if ! test -d "$build_system_dir"; then | ||
39 | echo "fatal error: taler-build-scripts directory not found at $scriptpath" >&2 | ||
40 | echo "hint: did you run './bootstrap'?" >&2 | 27 | echo "hint: did you run './bootstrap'?" >&2 |
41 | exit 1 | 28 | exit 1 |
42 | fi | 29 | fi |
43 | 30 | ||
44 | export TALERBUILDSYSTEMDIR=$build_system_dir | ||
45 | |||
46 | # Check that the python3 executable is on the PATH. | 31 | # Check that the python3 executable is on the PATH. |
47 | # This follows PEP 394 (https://www.python.org/dev/peps/pep-0394/). | 32 | # This follows PEP 394 (https://www.python.org/dev/peps/pep-0394/). |
48 | if ! python3 --version >/dev/null 2>&1; then | 33 | if ! python3 --version >/dev/null 2>&1; then |
@@ -56,5 +41,7 @@ python3 "$scriptpath/pyvercheck.py" || exit $? | |||
56 | # Allow Python to find libraries that are checked into the build system git. | 41 | # Allow Python to find libraries that are checked into the build system git. |
57 | export PYTHONPATH="$scriptpath:${PYTHONPATH:-}" | 42 | export PYTHONPATH="$scriptpath:${PYTHONPATH:-}" |
58 | 43 | ||
44 | export TALERBUILDSYSTEMDIR=./build-system | ||
45 | |||
59 | # Call configure.py, assuming all went well. | 46 | # Call configure.py, assuming all went well. |
60 | python3 $TALERBUILDSYSTEMDIR/configure.py "$@" | 47 | python3 $TALERBUILDSYSTEMDIR/configure.py "$@" |