[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-util] 02/02: bump submodule, add tox detection.
From: |
gnunet |
Subject: |
[taler-taler-util] 02/02: bump submodule, add tox detection. |
Date: |
Sun, 15 Dec 2019 12:45:56 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository taler-util.
commit 9cf25ee6eb849b78b5f0984dd17d73029fd1757c
Author: ng0 <address@hidden>
AuthorDate: Sun Dec 15 11:45:21 2019 +0000
bump submodule, add tox detection.
---
.gitignore | 3 +++
Makefile | 4 +++-
README | 6 ++++++
bootstrap | 17 +++++++++++++++++
build-system/taler-build-scripts | 2 +-
configure.py | 29 +++++++++++++++++++++++++++++
6 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 33f3a08..5acaa23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@ dist/
\#*\#
__pycache__
*.pyc
+.style.yapf
+configure
+config.mk
diff --git a/Makefile b/Makefile
index a9f9939..d7d2309 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,4 @@
+include config.mk
+
test:
- tox-3.7 || tox3.7 || tox || echo "error: you have to install tox"
+ $(tox) || echo "error: you have to install tox"
diff --git a/README b/README
index 5722032..56cddf4 100644
--- a/README
+++ b/README
@@ -13,3 +13,9 @@ tests
To run the unittests, execute
python3.7 setup.py test
+
+Installation
+------------
+
+You can use standard python tools to handle the setup,
+or use the Makefile and GNU standards wrapper around them.
diff --git a/bootstrap b/bootstrap
new file mode 100755
index 0000000..dcc5ae3
--- /dev/null
+++ b/bootstrap
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# 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
+git submodule update --recursive
+git submodule sync
+cp build-system/taler-build-scripts/configure ./configure || true
+cp build-system/taler-build-scripts/conf/.style.yapf .style.yapf || true
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index dd000ee..ba13916 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit dd000ee983962b11a94cd0fcaa6d46ba9699b456
+Subproject commit ba139160511026f08dd4611dc689ee5a211febf5
diff --git a/configure.py b/configure.py
new file mode 100644
index 0000000..2dde567
--- /dev/null
+++ b/configure.py
@@ -0,0 +1,29 @@
+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(PythonTool())
+b.add_tool(PyToxTool())
+b.add_tool(PosixTool("cp"))
+b.add_tool(PosixTool("echo"))
+b.add_tool(PosixTool("env"))
+b.add_tool(PosixTool("printf"))
+b.add_tool(PosixTool("grep"))
+b.add_tool(PosixTool("ln"))
+b.add_tool(PosixTool("mkdir"))
+b.add_tool(PosixTool("rm"))
+b.add_tool(PosixTool("sh"))
+b.add_tool(PosixTool("git"))
+b.run()
--
To stop receiving notification emails like this one, please contact
address@hidden.