[GNUnet-SVN] [taler-wallet-core] branch master updated: build system

[gnunet]

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

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

The following commit(s) were added to refs/heads/master by this push:
     new d79c2777 build system
d79c2777 is described below

commit d79c2777c75b9e5e1d566960e2ed98e1a0e41449
Author: Florian Dold <address@hidden>
AuthorDate: Mon Oct 14 22:39:12 2019 +0530

    build system
---
 .gitmodules                      |  2 +-
 Makefile                         | 13 +++----
 bootstrap                        | 16 ++++++--
 build-scripts                    |  1 -
 build-system/taler-build-scripts |  1 +
 configure                        | 84 +++++++++++++++++++++++++++++++++++++++-
 configure.py                     | 23 ++++++++++-
 7 files changed, 124 insertions(+), 16 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 1e5ac373..1b331f8b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "build-scripts"]
-       path = build-scripts
+       path = build-system/taler-build-scripts
        url = git://taler.net/taler-build-scripts
diff --git a/Makefile b/Makefile
index 62222731..31142ede 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ ava = node_modules/ava/cli.js
 nyc = node_modules/nyc/bin/nyc.js
 tslint = node_modules/tslint/bin/tslint
 
--include config.mk
+include config.mk
 
 .PHONY: tsc
 tsc: tsconfig.json yarn-install
@@ -39,10 +39,8 @@ typedoc:
 clean:
        rm -rf dist/ config.mk
 
-submodules/init:
-       git submodule update --init --recursive
-
-submodules/update:
+.PHONY: submodules-update
+submodules-update:
        git submodule update --recursive --remote
 
 .PHONY: check
@@ -59,7 +57,7 @@ lint: tsc yarn-install
 
 .PHONY: yarn-install
 yarn-install:
-       $(yarnexe) install
+       $(yarn) install
 
 
 .PHONY: i18n
@@ -89,10 +87,9 @@ else
 .PHONY: install
 install: tsc
        @echo "installing to" $(prefix)
-       yarn global add file://$(CURDIR) --prefix $(prefix)
+       $(yarn) global add file://$(CURDIR) --prefix $(prefix)
 endif
 
 .PHONY: watch
 watch: tsconfig.json
-
        ./node_modules/.bin/webpack --watch
diff --git a/bootstrap b/bootstrap
index 90fc6a32..82700e1b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,14 @@
 #!/bin/sh
 
-git submodule update --init --recursive
-git submodule update --recursive --remote
-ln -sf build-scripts/configure configure
-ln -sf build-scripts/configure.py configure.py
+# Bootstrap the repository.  Used when the repository is checked out from git.
+# When using the source tarball, running this script is not necessary.
+
+set -eu
+
+if ! git --version >/dev/null; then
+  echo "git not installed"
+  exit 1
+fi
+
+git submodule update --init
+cp build-system/taler-build-scripts/configure ./configure
diff --git a/build-scripts b/build-scripts
deleted file mode 160000
index c4927845..00000000
--- a/build-scripts
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c49278458aad2d2bfbf91b3e4ee4dd1650bf9601
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
new file mode 160000
index 00000000..b2c9672f
--- /dev/null
+++ b/build-system/taler-build-scripts
@@ -0,0 +1 @@
+Subproject commit b2c9672f2e493db810865b7de1e568a466b59360
diff --git a/configure b/configure
deleted file mode 120000
index 5ea41c58..00000000
--- a/configure
+++ /dev/null
@@ -1 +0,0 @@
-build-scripts/configure
\ No newline at end of file
diff --git a/configure b/configure
new file mode 100755
index 00000000..644d471d
--- /dev/null
+++ b/configure
@@ -0,0 +1,83 @@
+#!/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
+    python="python3"
+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)')
+#echo $PYTHON
+
+
+# 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
deleted file mode 120000
index 51dc3d24..00000000
--- a/configure.py
+++ /dev/null
@@ -1 +0,0 @@
-build-scripts/configure.py
\ No newline at end of file
diff --git a/configure.py b/configure.py
new file mode 100644
index 00000000..3a5a8de1
--- /dev/null
+++ b/configure.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+
+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))
+
+from talerbuildconfig import *
+
+b = BuildConfig()
+b.enable_prefix()
+b.enable_configmk()
+b.add_tool(PosixTool("find"))
+b.add_tool(NodeJsTool())
+b.add_tool(YarnTool())
+b.run()

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