gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-wallet-core] branch master updated (ef02858f -> a6bd1533)


From: gnunet
Subject: [taler-wallet-core] branch master updated (ef02858f -> a6bd1533)
Date: Fri, 01 Nov 2019 12:20:03 +0100

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository wallet-core.

    from ef02858f ignore config.mk for npm
     new 09245bcb build system
     new a6bd1533 simplify configure.py

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build-system/taler-build-scripts |  2 +-
 configure                        | 87 ----------------------------------------
 configure.py                     | 15 ++-----
 3 files changed, 5 insertions(+), 99 deletions(-)
 delete mode 100755 configure

diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index b2c9672f..25368019 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit b2c9672f2e493db810865b7de1e568a466b59360
+Subproject commit 2536801927781ea38fefc3de924934e1c6a74d88
diff --git a/configure b/configure
deleted file mode 100755
index 45837b56..00000000
--- a/configure
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-# This file is part of TALER
-# (C) 2019 GNUnet e.V.
-#
-# This is very simple POSIX sh script which
-# identifies the first matching
-# python3 identifier in $PATH and produces
-# configure.py from configure.py.in, and then
-# calls the new executable configure.py.
-#
-# It should be portable on Unices. Report bugs on
-# the bugtracker if you discover that it isn't
-# working as intended.
-#
-# Authors:
-# Author: ng0 <address@hidden>
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE
-# LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
-# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-# ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-# THIS SOFTWARE.
-#
-# SPDX-License-Identifier: 0BSD
-
-# there is a function used in curl to replicate which(1), but
-# it uses too many other tools. this one uses command and in
-# gnunet so far has no reports about failures.
-existence()
-{
-    command -v "$1" >/dev/null 2>&1
-}
-
-# We have to check every possible variant of the
-# executable name because there is a PEP which
-# defines the executable to be like this.
-if existence python3; then
-    if test ! -z "`python3 --version | awk '$2 ~ /3.7/ { print }'`"; then
-        python="python3"
-    else
-        echo "*** At least python 3.7 is required for the buildsystem"
-        exit 1
-    fi
-# elif existence python3.1; then
-#     python="python3.1"
-# elif existence python3.2; then
-#     python="python3.2"
-# elif existence python3.3; then
-#     python="python3.3"
-# elif existence python3.4; then
-#     python="python3.4"
-# elif existence python3.5; then
-#     python="python3.5"
-# elif existence python3.6; then
-#     python="python3.6"
-elif existence python3.7; then
-    python="python3.7"
-elif existence python3.8; then
-    python="python3.8"
-else
-    echo "*** No known python3 executable found in path ***"
-    echo "*** falling back to env(1) python             ***"
-    # Unreliable, but if env finds no python, we still can
-    # not assume python in a fixed location.
-    # TODO: Check this in a clean chroot!
-    python="env python"
-fi
-
-# we could check the return value here via || echo "blafoo"
-# or fail anyway once configure.py is invoked because we
-# don't have python if we reach the point to fail.
-PYTHON=$($python -c 'import sys; print(sys.executable)')
-
-
-# Call configure.py, assuming all went well.
-# $1 is read by configure.py as the prefix.
-# If $1 is empty, the python script checks the
-# environment for PREFIX. We might need more
-# variables and switches, such as DESTDIR.
-exec "$PYTHON" ./configure.py $@
diff --git a/configure.py b/configure.py
index 3a5a8de1..89d14332 100644
--- a/configure.py
+++ b/configure.py
@@ -1,15 +1,8 @@
-#!/usr/bin/env python3
+# This configure.py file is places in the public domain.
 
-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))
+# Configure the build directory.
+# This file is invoked by './configure' and should usually not be invoked
+# manually.
 
 from talerbuildconfig import *
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]