[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-deployment] branch master updated (8457f35 -> 843ea43)
|
From: |
gnunet |
|
Subject: |
[taler-deployment] branch master updated (8457f35 -> 843ea43) |
|
Date: |
Fri, 01 Nov 2019 11:41:46 +0100 |
This is an automated email from the git hooks/post-receive script.
dold pushed a change to branch master
in repository deployment.
from 8457f35 fix www
new 05f3689 taler-deployment
new aa98a4c gitignore
new 843ea43 no more taler-build
The 3 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:
.gitignore | 4 +-
bin/taler-deployment | 178 +++++++++++++++++++++---------------
bootstrap-auditorreporter | 102 ---------------------
bootstrap-demochecker | 18 ----
bootstrap-taler | 130 --------------------------
build-auditorreporter | 4 -
demo.sh | 14 ---
envconfig.template | 13 ---
taler-build/.gitignore | 1 -
taler-build/Makefile | 82 -----------------
taler-build/README | 2 -
taler-build/cat_failed.sh | 25 -----
taler-build/invalidate.sh | 19 ----
taler-build/lint_bank.sh | 13 ---
taler-build/lint_blog.sh | 16 ----
taler-build/lint_donations.sh | 13 ---
taler-build/lint_survey.sh | 15 ---
taler-build/update_api.sh | 17 ----
taler-build/update_auditor.sh | 16 ----
taler-build/update_backoffice.sh | 17 ----
taler-build/update_bank.sh | 18 ----
taler-build/update_blog.sh | 16 ----
taler-build/update_deployment.sh | 15 ---
taler-build/update_donations.sh | 16 ----
taler-build/update_exchange.sh | 55 -----------
taler-build/update_gnunet.sh | 20 ----
taler-build/update_landing.sh | 18 ----
taler-build/update_libgnurl.sh | 16 ----
taler-build/update_libmicrohttpd.sh | 17 ----
taler-build/update_merchant.sh | 62 -------------
taler-build/update_survey.sh | 16 ----
taler-build/update_twister.sh | 23 -----
32 files changed, 105 insertions(+), 886 deletions(-)
delete mode 100755 bootstrap-auditorreporter
delete mode 100755 bootstrap-demochecker
delete mode 100755 bootstrap-taler
delete mode 100755 build-auditorreporter
delete mode 100755 demo.sh
delete mode 100644 envconfig.template
delete mode 100644 taler-build/.gitignore
delete mode 100644 taler-build/Makefile
delete mode 100644 taler-build/README
delete mode 100755 taler-build/cat_failed.sh
delete mode 100755 taler-build/invalidate.sh
delete mode 100755 taler-build/lint_bank.sh
delete mode 100755 taler-build/lint_blog.sh
delete mode 100755 taler-build/lint_donations.sh
delete mode 100755 taler-build/lint_survey.sh
delete mode 100755 taler-build/update_api.sh
delete mode 100755 taler-build/update_auditor.sh
delete mode 100755 taler-build/update_backoffice.sh
delete mode 100755 taler-build/update_bank.sh
delete mode 100755 taler-build/update_blog.sh
delete mode 100755 taler-build/update_deployment.sh
delete mode 100755 taler-build/update_donations.sh
delete mode 100755 taler-build/update_exchange.sh
delete mode 100755 taler-build/update_gnunet.sh
delete mode 100755 taler-build/update_landing.sh
delete mode 100755 taler-build/update_libgnurl.sh
delete mode 100755 taler-build/update_libmicrohttpd.sh
delete mode 100755 taler-build/update_merchant.sh
delete mode 100755 taler-build/update_survey.sh
delete mode 100755 taler-build/update_twister.sh
diff --git a/.gitignore b/.gitignore
index 2630939..bbca547 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
-doc/*
-!doc/*.texi
-!doc/*.txt
*~
+.mypy_cache
diff --git a/bin/taler-deployment b/bin/taler-deployment
index b06d064..a966050 100755
--- a/bin/taler-deployment
+++ b/bin/taler-deployment
@@ -63,6 +63,15 @@ class Repo:
builder: Callable[["Repo", Path], None]
+@dataclass
+class EnvInfo:
+ name: str
+ repos: List[Repo]
+
+
+pass_env_info = click.make_pass_decorator(EnvInfo)
+
+
@click.group()
def cli():
pass
@@ -107,12 +116,10 @@ def default_configure(*extra):
["./configure", f"--prefix={pfx.as_posix()}"] + list(extra), check=True
)
+
def pyconfigure(*extra):
"""For python programs, --prefix doesn't work."""
- subprocess.run(
- ["./configure", "--destination=local"] + list(extra), check=True
- )
-
+ subprocess.run(["./configure", "--destination=local"] + list(extra),
check=True)
def build_libmicrohttpd(r: Repo, p: Path):
@@ -196,7 +203,6 @@ def build_bank(r, p):
def build_landing(r, p):
update_checkout(r, p)
- subprocess.run(["pip3", "install", "--user", "jsmin"], check=True)
subprocess.run(["./bootstrap"], check=True)
pfx = Path.home() / "local"
default_configure()
@@ -240,57 +246,66 @@ def build_backoffice(r, p):
(p / "taler-buildstamp").touch()
-# Our repositories, *must* be topologically sorted
-repos = [
- Repo(
- "libmicrohttpd", "git://gnunet.org/libmicrohttpd.git", [],
build_libmicrohttpd
- ),
- Repo("gnunet", "git://gnunet.org/gnunet.git", [], build_gnunet),
- Repo(
- "exchange",
- "git://git.taler.net/exchange",
- ["gnunet", "libmicrohttpd"],
- build_exchange,
- ),
- Repo(
- "twister", "git://git.taler.net/twister", ["gnunet", "exchange"],
build_twister
- ),
- Repo(
- "merchant",
- "git://git.taler.net/merchant",
- ["exchange", "libmicrohttpd"],
- build_merchant,
- ),
- Repo("bank", "git://git.taler.net/bank", [], build_bank),
- Repo("landing", "git://git.taler.net/landing", [], build_landing),
- Repo("donations", "git://git.taler.net/donations", [], build_donations),
- Repo("blog", "git://git.taler.net/blog", [], build_blog),
- Repo("survey", "git://git.taler.net/survey", [], build_survey),
- Repo("backoffice", "git://git.taler.net/backoffice", [], build_backoffice),
-]
-
-
-def ensure_activated():
- """Make sure that the environment variables have been
- loaded correctly via the ~/activate script"""
- ts = os.environ.get("TALER_BOOTSTRAP_TIMESTAMP")
- if ts is None:
- print("Please do 'source ~/activate' first.", file=sys.stderr)
- sys.exit(1)
- out = subprocess.check_output(
- ["bash", "-c", "source ~/activate; echo $TALER_BOOTSTRAP_TIMESTAMP"],
- encoding="utf-8",
- )
- out = out.strip(" \n")
- if out != ts:
- print(
- f"Please do 'source ~/activate'. Current ts={ts}, new ts={out}",
- file=sys.stderr,
- )
- sys.exit(1)
+def build_docs(r, p):
+ update_checkout(r, p)
+ subprocess.run(["./bootstrap"], check=True)
+ pfx = Path.home() / "local"
+ subprocess.run(["make", "install"], check=True)
+ (p / "taler-buildstamp").touch()
-def update_repos():
+def get_repos(envname):
+ """Get a list of repos (topologically sorted) that should be build for the
+ given environment"""
+ if envname in ("demochecker",):
+ return []
+ if envname == "docs-builder":
+ return [
+ Repo(
+ "docs",
+ "git://gnunet.org/docs.git",
+ [],
+ build_docs,
+ ),
+ ]
+ if envname in ("demo", "int", "test", "auditor-reporter"):
+ return [
+ Repo(
+ "libmicrohttpd",
+ "git://gnunet.org/libmicrohttpd.git",
+ [],
+ build_libmicrohttpd,
+ ),
+ Repo("gnunet", "git://gnunet.org/gnunet.git", [], build_gnunet),
+ Repo(
+ "exchange",
+ "git://git.taler.net/exchange",
+ ["gnunet", "libmicrohttpd"],
+ build_exchange,
+ ),
+ Repo(
+ "twister",
+ "git://git.taler.net/twister",
+ ["gnunet", "exchange"],
+ build_twister,
+ ),
+ Repo(
+ "merchant",
+ "git://git.taler.net/merchant",
+ ["exchange", "libmicrohttpd"],
+ build_merchant,
+ ),
+ Repo("bank", "git://git.taler.net/bank", [], build_bank),
+ Repo("landing", "git://git.taler.net/landing", [], build_landing),
+ Repo("donations", "git://git.taler.net/donations", [],
build_donations),
+ Repo("blog", "git://git.taler.net/blog", [], build_blog),
+ Repo("survey", "git://git.taler.net/survey", [], build_survey),
+ Repo("backoffice", "git://git.taler.net/backoffice", [],
build_backoffice),
+ ]
+ raise Exception(f"no repos defined for envname {envname}")
+
+
+def update_repos(repos: List[Repo]) -> None:
for r in repos:
r_dir = Path.home() / "sources" / r.name
subprocess.run(["git", "-C", r_dir.as_posix(), "fetch"], check=True)
@@ -307,7 +322,7 @@ def update_repos():
s.unlink()
-def get_stale_repos() -> List[Repo]:
+def get_stale_repos(repos: List[Repo]) -> List[Repo]:
timestamps = {}
stale = []
for r in repos:
@@ -326,25 +341,30 @@ def get_stale_repos() -> List[Repo]:
@cli.command()
-def build() -> None:
+@pass_env_info
+def build(env_info) -> None:
"""Build the deployment from source."""
ensure_activated()
- update_repos()
- stale = get_stale_repos()
+ update_repos(env_info.repos)
+ stale = get_stale_repos(env_info.repos)
print(f"found stale repos: {stale}")
for r in stale:
p = Path.home() / "sources" / r.name
os.chdir(p.as_posix())
r.builder(r, p) # type: ignore
+allowed_envs = ("test", "int", "demo", "auditor-reporter", "docs-builder")
@cli.command()
-@click.argument("envname", type=click.Choice(["test", "int", "demo"]))
-def bootstrap(envname) -> None:
+@click.argument("envname", type=click.Choice(allowed_envs))
+@click.pass_context
+def bootstrap(ctx, envname) -> None:
"""Bootstrap a GNU Taler deployment."""
home = Path.home()
+ ctx.env_info = EnvInfo(envname, get_repos(envname))
+
# read Python-style config
cfg = types.ModuleType("taler_deployment_cfg")
cfgtext = (home / "envcfg.py").read_text()
@@ -380,23 +400,33 @@ def bootstrap(envname) -> None:
(home / "taler-data").mkdir(parents=True, exist_ok=True)
if envname == "test":
- bb_dir = home / "bb-worker"
- if not bb_dir.exists():
- subprocess.run(
- [
- "buildbot-worker",
- "create-worker",
- "--umask=0o22",
- bb_dir.as_posix(),
- "localhost:9989",
- "test-worker",
- "test-pass",
- ],
- check=True,
- )
+ create_bb_worker("bb-worker", "test-worker", "test-pass")
+ elif envname == "auditor-reporter":
+ create_bb_worker("bb-worker", "auditor-worker", "auditor-pass")
+ elif envname == "demo-checker":
+ create_bb_worker("bb-worker", "demo-worker", "demo-pass")
+
print("Bootstrap finished.")
print("Please source the ~/activate file before proceeding.")
+def create_bb_worker(dirname, workername, workerpw):
+ bb_dir = home / dirname
+ if bb_dir.exists():
+ return
+ subprocess.run(
+ [
+ "buildbot-worker",
+ "create-worker",
+ "--umask=0o22",
+ bb_dir.as_posix(),
+ "localhost:9989",
+ workername,
+ workerpw,
+ ],
+ check=True,
+ )
+
+
if __name__ == "__main__":
cli()
diff --git a/bootstrap-auditorreporter b/bootstrap-auditorreporter
deleted file mode 100755
index 154be92..0000000
--- a/bootstrap-auditorreporter
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash
-
-# Bootstrap the Taler setup for the user account that
-# is currently logged in.
-
-# The setup generated by this script is suitable for
-# blue-green deployments, where two users run
-# identical environments, and traffic can be switched
-# between them.
-
-# To create a demo setup, run
-# demo-blue$ ~/deployment/bootstrap-bluegreen demo
-# demo-green$ ~/deployment/bootstrap-bluegreen demo
-
-# NOTE: ENVNAME is also the name of the user who keeps
-# shared data in its home directory, so it must exist!
-# For demo/test ENVNAMEs, see {demo,test}.sh
-
-set -eu
-
-usage() {
- echo "Usage: $0 ENVNAME, test or demo"
-}
-
-if [ -z ${1+x} ]; then
- usage
- exit 1
-fi
-
-ENVNAME=$1
-source ~/envconfig
-
-case $ENVNAME in
-
- test)
- CURRENCY=TESTKUDOS
- ;;
- demo)
- CURRENCY=KUDOS
- ;;
- *)
- echo Invalid envname, only 'test' and 'demo'.
- exit 1
- ;;
-esac
-
-cd $HOME
-
-if ! test -d $HOME/gnunet; then
- git clone git://gnunet.org/gnunet.git
-fi
-
-if ! test -d $HOME/libmicrohttpd; then
- git clone git://gnunet.org/libmicrohttpd.git
-fi
-
-for component in exchange bank gnurl; do
- if ! test -d $HOME/$component; then
- git clone git://git.taler.net/$component
- fi
-done
-
-cat >$HOME/activate <<EOL
-#!/bin/bash
-
-function taler-config-generate () {
- echo "Command disabled. Please use taler-deployment-config-generate instead."
- return 1
-}
-function taler-exchange-keyup () {
- echo "Command disabled. Please use taler-deployment-keyup instead."
-}
-
-
-export PATH="$HOME/deployment/bin:$HOME/local/bin:\$PATH"
-export PYTHONPATH="$HOME/local/lib/python3.5/site-packages"
-export TALER_CHECKDB="postgres:///talercheck-$USER"
-export TALER_CONFIG_CURRENCY=$CURRENCY
-
-# DEPRECATED ALIAS!
-export TALER_CONFIG_ENV=$ENVNAME
-
-export TALER_ENV_NAME=$ENVNAME
-export TALER_ENV_URL_INTRO="https://$ENVNAME.taler.net/";
-export TALER_ENV_URL_BANK="https://bank.$ENVNAME.taler.net/";
-export TALER_ENV_URL_MERCHANT_BLOG="https://shop.$ENVNAME.taler.net/";
-export TALER_ENV_URL_MERCHANT_DONATIONS="https://donations.$ENVNAME.taler.net/";
-export TALER_ENV_URL_MERCHANT_SURVEY="https://survey.$ENVNAME.taler.net/";
-export TALER_ENV_URL_AUDITOR="https://auditor.$ENVNAME.taler.net/";
-export TALER_ENV_URL_BACKOFFICE="https://backoffice.$ENVNAME.taler.net/";
-EOL
-
-mkdir -p "$HOME/sockets"
-mkdir -p "$HOME/stamps"
-mkdir -p "$HOME/taler-data"
-
-ln -sf ../deployment/taler-build/Makefile stamps/
-ln -sf ../deployment/taler-build/invalidate.sh stamps/
-
-if [[ ! -d "worker" ]]; then
-buildbot-worker create-worker $HOME/worker localhost:9989
"$ENVNAME-auditor-worker" "$ENVNAME-auditor-pass"
-fi
diff --git a/bootstrap-demochecker b/bootstrap-demochecker
deleted file mode 100755
index e4c4d7a..0000000
--- a/bootstrap-demochecker
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Bootstrap the Taler setup for the user account that
-# is currently logged in.
-
-# Generates a setup for a single user,
-# including a postgresql DB.
-
-set -eu
-
-if [[ "demo-checker" != $(whoami) ]] ; then
- echo "Please run this script as the 'demo-checker' user"
-fi
-
-
-if [[ ! -d worker ]]; then
- buildbot-worker create-worker --umask=0o22 ~/worker localhost:9989
demo-worker demo-pass
-fi
diff --git a/bootstrap-taler b/bootstrap-taler
deleted file mode 100755
index bc7eb89..0000000
--- a/bootstrap-taler
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/bash
-
-# Bootstrap the Taler setup for the user account that
-# is currently logged in.
-
-# The setup generated by this script is suitable for
-# blue-green deployments, where two users run
-# identical environments, and traffic can be switched
-# between them.
-
-# To create a demo setup, run
-# demo-blue$ ~/deployment/bootstrap-bluegreen demo
-# demo-green$ ~/deployment/bootstrap-bluegreen demo
-
-# NOTE: ENVNAME is also the name of the user who keeps
-# shared data in its home directory, so it must exist!
-# For demo/test ENVNAMEs, see {demo,test}.sh
-
-set -eu
-
-usage() {
- echo "Usage: $0 ENVNAME"
-}
-
-if [ -z ${1+x} ]; then
- usage
- exit 1
-fi
-
-ENVNAME=$1
-source ~/envconfig
-
-case $ENVNAME in
-
- test)
- CURRENCY=TESTKUDOS
- ;;
- int)
- CURRENCY=INTKUDOS
- ;;
- demo)
- CURRENCY=KUDOS
- ;;
- lcov)
- CURRENCY=UNUSED
- ;;
- *)
- echo Invalid envname, please use 'test' or 'int' or 'demo'.
- exit 1
- ;;
-esac
-
-cd $HOME
-
-if ! test -d $HOME/gnunet; then
- git clone git://gnunet.org/gnunet.git
-fi
-
-if ! test -d $HOME/libmicrohttpd; then
- git clone git://gnunet.org/libmicrohttpd.git
-fi
-
-for component in twister bank merchant gnurl landing exchange donations blog
backoffice deployment auditor survey ; do
- if ! test -d $HOME/$component; then
- git clone git://git.taler.net/$component
- fi
-done
-
-for component in twister bank merchant landing exchange donations blog survey
backoffice ; do
- varname=tag_$component
- tag=${!varname}
- echo "Checking out $component to $tag"
- git -C $HOME/$component fetch
- git -C $HOME/$component checkout -q -f $tag --
-done
-
-cat >$HOME/activate <<EOL
-#!/bin/bash
-
-function taler-config-generate () {
- echo "Command disabled. Please use taler-deployment-config-generate instead."
- return 1
-}
-function taler-exchange-keyup () {
- echo "Command disabled. Please use taler-deployment-keyup instead."
-}
-
-
-export PATH="$HOME/deployment/bin:$HOME/local/bin:\$PATH"
-export PYTHONPATH="$HOME/local/lib/python3.5/site-packages"
-export TALER_CHECKDB="postgres:///talercheck-$USER"
-export TALER_CONFIG_CURRENCY=$CURRENCY
-
-# DEPRECATED ALIAS!
-export TALER_CONFIG_ENV=$ENVNAME
-
-export TALER_ENV_NAME=$ENVNAME
-export TALER_ENV_URL_INTRO="https://$ENVNAME.taler.net/";
-export TALER_ENV_URL_BANK="https://bank.$ENVNAME.taler.net/";
-export TALER_ENV_URL_MERCHANT_BLOG="https://shop.$ENVNAME.taler.net/";
-export TALER_ENV_URL_MERCHANT_DONATIONS="https://donations.$ENVNAME.taler.net/";
-export TALER_ENV_URL_MERCHANT_SURVEY="https://survey.$ENVNAME.taler.net/";
-export TALER_ENV_URL_AUDITOR="https://auditor.$ENVNAME.taler.net/";
-export TALER_ENV_URL_BACKOFFICE="https://backoffice.$ENVNAME.taler.net/";
-EOL
-
-mkdir -p "$HOME/sockets"
-mkdir -p "$HOME/stamps"
-mkdir -p "$HOME/taler-data"
-
-ln -sf ../deployment/taler-build/Makefile stamps/
-ln -sf ../deployment/taler-build/invalidate.sh stamps/
-
-if test "test" = $ENVNAME; then
- if ! test -d $HOME/test_worker; then
- echo Creating test_worker..
- buildbot-worker create-worker $HOME/test_worker localhost:9989 test-worker
test-pass
- else
- echo test_worker already in place.
- fi
-
- if ! test -f $HOME/activate; then
- echo FATAL: activate file was not created.
- exit 1
- fi
-fi
-
-if [[ "lcov" = $ENVNAME ]] && [[ ! -d worker ]]; then
- buildbot-worker create-worker --umask=0o22 ~/worker localhost:9989
lcov-worker lcov-pass
-fi
diff --git a/build-auditorreporter b/build-auditorreporter
deleted file mode 100755
index e766f74..0000000
--- a/build-auditorreporter
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd $HOME/stamps
-make exchange-stamp
diff --git a/demo.sh b/demo.sh
deleted file mode 100755
index 3ce92e3..0000000
--- a/demo.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# Every "blue/green" setup relies on a common user that keeps
-# all the shared data (keys, for example). In our setup, test-*
-# and demo-* rely on the users 'test' and 'demo'. This script
-# automates the configuration of the 'demo' user.
-
-if ! test "demo" = $(whoami); then
- echo This script can only be run by the 'demo' user, exiting..
- exit 1
-fi
-
-echo Creating the 'shared-data' directory.
-mkdir $HOME/shared-data
diff --git a/envconfig.template b/envconfig.template
deleted file mode 100644
index 8c41494..0000000
--- a/envconfig.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template for the environment configuration
-
-tag=demo-2019-08-31-00
-
-tag_exchange=$tag
-tag_merchant=$tag
-tag_bank=$tag
-tag_twister=$tag
-tag_landing=$tag
-tag_donations=$tag
-tag_blog=$tag
-tag_survey=$tag
-tag_backoffice=$tag
diff --git a/taler-build/.gitignore b/taler-build/.gitignore
deleted file mode 100644
index c337aa9..0000000
--- a/taler-build/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*-stamp
diff --git a/taler-build/Makefile b/taler-build/Makefile
deleted file mode 100644
index cf9d61e..0000000
--- a/taler-build/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-BASE="${HOME}/deployment/taler-build"
-
-all: auditor-stamp
-all: backoffice-stamp
-all: bank-stamp
-all: blog-stamp
-all: deployment-stamp
-all: donations-stamp
-all: exchange-stamp
-all: gnunet-stamp
-all: landing-stamp
-all: merchant-stamp
-all: survey-stamp
-all: twister-stamp
-
-deployment-stamp:
- ${BASE}/update_deployment.sh
- touch $@
-
-twister-stamp: gnunet-stamp deployment-stamp exchange-stamp
- ${BASE}/update_twister.sh
- touch $@
-
-backoffice-stamp:
- ${BASE}/update_backoffice.sh
- touch $@
-
-# depends on bank due to bank-lib testcase. Note: twister
-# is partially a exchange's dependency because it's used to
-# run its "twisted" tests. However, to avoid circular dependency
-# we don't make the exchange's build dependent on the twister.
-# The only effect is that on the very first compilation (the
-# one after a new bootstrap), the exchange won't run the "twisted"
-# tests.
-exchange-stamp: gnunet-stamp deployment-stamp bank-stamp
- ${BASE}/update_exchange.sh
- touch $@
-
-auditor-stamp: deployment-stamp gnunet-stamp
- ${BASE}/update_auditor.sh
- touch $@
-
-landing-stamp: deployment-stamp
- ${BASE}/update_landing.sh
- touch $@
-
-gnunet-stamp: libmicrohttpd-stamp libgnurl-stamp deployment-stamp
- ${BASE}/update_gnunet.sh
- touch $@
-
-bank-stamp: deployment-stamp
- ${BASE}/update_bank.sh
- touch $@
-
-merchant-stamp: exchange-stamp deployment-stamp twister-stamp
- ${BASE}/update_merchant.sh
- touch $@
-
-libmicrohttpd-stamp: deployment-stamp
- ${BASE}/update_libmicrohttpd.sh
- touch $@
-
-libgnurl-stamp: deployment-stamp
- ${BASE}/update_libgnurl.sh
- touch $@
-
-donations-stamp: deployment-stamp
- ${BASE}/update_donations.sh
- touch $@
-
-blog-stamp: deployment-stamp
- ${BASE}/update_blog.sh
- touch $@
-
-survey-stamp: deployment-stamp
- ${BASE}/update_survey.sh
- touch $@
-
-lcov: gnunet-stamp deployment-stamp merchant-stamp exchange-stamp
- export PATH=${HOME}/local/bin:${PATH}
- ./update_exchange.sh --coverage
- ./update_merchant.sh --coverage
diff --git a/taler-build/README b/taler-build/README
deleted file mode 100644
index 115fe29..0000000
--- a/taler-build/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile for all taler components, using one timestamp
-file in this folder to represent each component.
diff --git a/taler-build/cat_failed.sh b/taler-build/cat_failed.sh
deleted file mode 100755
index 7f57db1..0000000
--- a/taler-build/cat_failed.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-cat_failed ()
-{
- if ! test -d "$1"; then
- echo ERROR dumping the failing test logs.
- echo
- echo Give valid directory to start crawling.
- echo Example ./cat_failed.sh dir/
- echo
- return 1
- fi
-
- for trs in $(find "${1}" -name "*.trs") ; do
- if head -q -n1 < ${trs} | grep -q FAIL; then
- filename_log=$(echo ${trs}|sed -e 's/trs$/log/')
- echo
- echo "== DUMPING LOGS =="
- echo
- cat ${filename_log}
- fi
- done
-
- return 0
-}
diff --git a/taler-build/invalidate.sh b/taler-build/invalidate.sh
deleted file mode 100755
index 0518a2f..0000000
--- a/taler-build/invalidate.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -eu
-COMPONENTS="auditor deployment exchange merchant bank gnurl donations blog
landing gnunet libmicrohttpd survey backoffice twister"
-
-for component in $COMPONENTS ; do
-
- # Not all the setups have all the repos!
- if ! test -d $HOME/$component; then
- continue
- fi
-
- cd $HOME/$component
- git fetch
- if git status -sb | grep behind; then
- echo "invalidating $component"
- rm -f $HOME/stamps/$component-stamp
- fi
-done
diff --git a/taler-build/lint_bank.sh b/taler-build/lint_bank.sh
deleted file mode 100755
index 25ccdff..0000000
--- a/taler-build/lint_bank.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd $HOME/bank
-git clean -fxd
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-pylint3 --load-plugins pylint_django talerbank/
diff --git a/taler-build/lint_blog.sh b/taler-build/lint_blog.sh
deleted file mode 100755
index e913746..0000000
--- a/taler-build/lint_blog.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd $HOME/blog/
-git clean -fxd
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-git submodule update --init --force
-
-
-pylint talerblog/
diff --git a/taler-build/lint_donations.sh b/taler-build/lint_donations.sh
deleted file mode 100755
index a423a53..0000000
--- a/taler-build/lint_donations.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-cd $HOME/donations/
-git clean -fxd
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-git submodule update --init --force
-
-pylint talerdonations/
diff --git a/taler-build/lint_survey.sh b/taler-build/lint_survey.sh
deleted file mode 100755
index 7787d50..0000000
--- a/taler-build/lint_survey.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd $HOME/survey/
-git clean -fxd
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-git submodule update --init --force
-
-pylint talersurvey/
diff --git a/taler-build/update_api.sh b/taler-build/update_api.sh
deleted file mode 100755
index ec0cc0d..0000000
--- a/taler-build/update_api.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-fetch () {
- git clean -fdx
- git fetch
- # reset to updated upstream branch, but only if we're tracking a branch
- branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo head)
- git reset --hard "$branch"
-}
-
-cd $HOME/api
-fetch
-make html
-cp -r _build/html/* $HOME/build/api/html/
-
diff --git a/taler-build/update_auditor.sh b/taler-build/update_auditor.sh
deleted file mode 100755
index e280285..0000000
--- a/taler-build/update_auditor.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd $HOME/auditor
-git clean -fxd
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-git submodule update --force --init
-make
-
-chmod g+rx en/
diff --git a/taler-build/update_backoffice.sh b/taler-build/update_backoffice.sh
deleted file mode 100755
index 24c8e7b..0000000
--- a/taler-build/update_backoffice.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd $HOME/backoffice/
-git clean -fxd
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-git submodule update --init --force
-
-./configure
-make check-js
-make install check
diff --git a/taler-build/update_bank.sh b/taler-build/update_bank.sh
deleted file mode 100755
index 7812555..0000000
--- a/taler-build/update_bank.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd $HOME/bank
-git clean -fxd
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-git submodule update --init --force
-
-TALER_CHECKDB=${TALER_CHECKDB:-postgres:///talercheck}
-
-./configure
-TALER_BANK_ALTDB=$TALER_CHECKDB make install check
diff --git a/taler-build/update_blog.sh b/taler-build/update_blog.sh
deleted file mode 100755
index 7df8d76..0000000
--- a/taler-build/update_blog.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd $HOME/blog/
-git clean -fxd
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-git submodule update --init --force
-
-./configure
-make install check
diff --git a/taler-build/update_deployment.sh b/taler-build/update_deployment.sh
deleted file mode 100755
index e539258..0000000
--- a/taler-build/update_deployment.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# This update script is needed since shell scripts called
-# by buildbot do NOT use the fresh deployment repo which is
-# internal to buildbot, so we need to update the $HOME/deployment
-# local check before starting the whole compilation
-
-set -eu
-
-cd $HOME/deployment
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
diff --git a/taler-build/update_donations.sh b/taler-build/update_donations.sh
deleted file mode 100755
index b6cfb7b..0000000
--- a/taler-build/update_donations.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd $HOME/donations/
-git clean -fxd
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-git submodule update --init --force
-
-./configure
-make install check
diff --git a/taler-build/update_exchange.sh b/taler-build/update_exchange.sh
deleted file mode 100755
index 6b5b45d..0000000
--- a/taler-build/update_exchange.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-source $HOME/deployment/taler-build/cat_failed.sh
-
-cd $HOME/exchange
-git clean -fdx
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-./bootstrap
-if test ${1:-notgiven} = "--coverage"; then
- ./configure CFLAGS='-ggdb -O0' \
- --with-libgnurl=$HOME/local \
- --with-microhttpd=$HOME/local \
- --with-twister=$HOME/local \
- --prefix=$HOME/local --with-gnunet=$HOME/local \
- --enable-logging=verbose \
- --enable-coverage
-else
- ./configure CFLAGS='-ggdb -O0' \
- --with-libgnurl=$HOME/local \
- --with-microhttpd=$HOME/local \
- --with-twister=$HOME/local \
- --prefix=$HOME/local --with-gnunet=$HOME/local \
- --enable-logging=verbose
-fi
-
-make install -j4
-
-TALER_CHECKDB=${TALER_CHECKDB:-postgres:///WILLFAIL}
-
-# Deactivate test cases for now, as auditor test cases are broken
-
-#if test ${1:-notgiven} = "--coverage"; then
-#TOP=$(pwd)
-# mkdir -p doc/coverage/
-# lcov -d $TOP -z
-# TALER_AUDITORDB_POSTGRES_CONFIG=$TALER_CHECKDB \
-# TALER_EXCHANGEDB_POSTGRES_CONFIG=$TALER_CHECKDB \
-# TALER_BANK_ALTDB=$TALER_CHECKDB make check || (cat_failed .; exit 1)
-# lcov -d $TOP -c --no-external -o doc/coverage/coverage.info
-# lcov -r doc/coverage/coverage.info **/test_* -o doc/coverage/rcoverage.info
-# genhtml -o doc/coverage doc/coverage/rcoverage.info
-# chmod g+rx -R doc/
-#else
-# echo "checkdb: $TALER_CHECKDB"
-# TALER_AUDITORDB_POSTGRES_CONFIG=$TALER_CHECKDB \
-# TALER_EXCHANGEDB_POSTGRES_CONFIG=$TALER_CHECKDB \
-# TALER_BANK_ALTDB=$TALER_CHECKDB make check || (cat_failed .; exit 1)
-#fi
diff --git a/taler-build/update_gnunet.sh b/taler-build/update_gnunet.sh
deleted file mode 100755
index 3e89e07..0000000
--- a/taler-build/update_gnunet.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd $HOME/gnunet/
-git clean -fdx
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-./bootstrap
-./configure --prefix=$HOME/local \
- --enable-logging=verbose \
- --with-libgnurl=$HOME/local \
- --with-microhttpd=$HOME/local \
- --disable-documentation
-
-make install -j1
diff --git a/taler-build/update_landing.sh b/taler-build/update_landing.sh
deleted file mode 100755
index 91d86fd..0000000
--- a/taler-build/update_landing.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd $HOME/landing
-git clean -fxd
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-git submodule update --force --init
-AUTOMAKE="automake --foreign" autoreconf -fiv
-./configure
-cd demo/
-make
-chmod -R g+rx *
diff --git a/taler-build/update_libgnurl.sh b/taler-build/update_libgnurl.sh
deleted file mode 100755
index 4f03817..0000000
--- a/taler-build/update_libgnurl.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd $HOME/gnurl
-git clean -fxd
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-./buildconf
-./configure --enable-ipv6 --with-gnutls --without-libpsl --without-libssh2
--without-libmetalink --without-winidn --without-librtmp --without-nghttp2
--without-nss --without-cyassl --without-polarssl --without-ssl
--without-winssl --without-darwinssl --disable-sspi --disable-ntlm-wb
--disable-ldap --disable-rtsp --disable-dict --disable-telnet --disable-tftp
--disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-file
--disable-ftp --disable-smb --prefix=$HOME/local
-make
-make install
diff --git a/taler-build/update_libmicrohttpd.sh
b/taler-build/update_libmicrohttpd.sh
deleted file mode 100755
index c50d54f..0000000
--- a/taler-build/update_libmicrohttpd.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd $HOME/libmicrohttpd/
-git clean -fdx
-
-git fetch --all
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-./bootstrap
-./configure --prefix=$HOME/local \
- --with-gnutls=/usr/local # Debian packages are too old.
-make
-make install
diff --git a/taler-build/update_merchant.sh b/taler-build/update_merchant.sh
deleted file mode 100755
index f6b2d32..0000000
--- a/taler-build/update_merchant.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-# Run as:
-# $ ./update_merchant.sh [--coverage]
-set -eu
-
-
-source $HOME/deployment/taler-build/cat_failed.sh
-
-cd $HOME/merchant/
-git clean -fdx
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-git submodule update --init --force
-
-./bootstrap
-if test ${1:-notgiven} = "--coverage"; then
- ./configure CFLAGS='-ggdb -O0' \
- --prefix=$HOME/local --with-gnunet=$HOME/local \
- --with-exchange=$HOME/local \
- --with-microhttpd=$HOME/local \
- --with-twister=$HOME/local \
- --enable-logging=verbose \
- --enable-coverage \
- --disable-doc
- else
- ./configure CFLAGS='-ggdb -O0' \
- --prefix=$HOME/local --with-gnunet=$HOME/local \
- --with-exchange=$HOME/local \
- --with-microhttpd=$HOME/local \
- --with-twister=$HOME/local \
- --enable-logging=verbose \
- --disable-doc
-fi
-
-make
-make install
-
-TALER_CHECKDB=${TALER_CHECKDB:-postgres:///WILLFAIL}
-
-if test ${1:-notgiven} = "--coverage"; then
-TOP=$(pwd)
- mkdir -p doc/coverage/
- lcov -d $TOP -z
- TALER_MERCHANTDB_POSTGRES_CONFIG=$TALER_CHECKDB \
- TALER_EXCHANGEDB_POSTGRES_CONFIG=$TALER_CHECKDB \
- TALER_AUDITORDB_POSTGRES_CONFIG=$TALER_CHECKDB \
- make check || (cat_failed .; exit 1)
- lcov -d $TOP -c --no-external -o doc/coverage/coverage.info
- lcov -r doc/coverage/coverage.info **/test_* -o doc/coverage/rcoverage.info
- genhtml -o doc/coverage doc/coverage/rcoverage.info
- chmod g+rx -R doc/
-else
- TALER_MERCHANTDB_POSTGRES_CONFIG=$TALER_CHECKDB \
- TALER_EXCHANGEDB_POSTGRES_CONFIG=$TALER_CHECKDB \
- TALER_AUDITORDB_POSTGRES_CONFIG=$TALER_CHECKDB \
- make check || (cat_failed .; exit 1)
-fi
diff --git a/taler-build/update_survey.sh b/taler-build/update_survey.sh
deleted file mode 100755
index fa85808..0000000
--- a/taler-build/update_survey.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-cd $HOME/survey/
-git clean -fxd
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-git submodule update --init --force
-
-./configure
-make install check
diff --git a/taler-build/update_twister.sh b/taler-build/update_twister.sh
deleted file mode 100755
index de68b63..0000000
--- a/taler-build/update_twister.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# Run as:
-# $ ./update_twister.sh
-set -eu
-
-cd $HOME/twister/
-git clean -fdx
-
-git fetch
-# reset to updated upstream branch, but only if we're tracking a branch
-branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null ||
echo HEAD)
-git reset --hard "$branch"
-
-git submodule update --init --force
-
-./bootstrap
-./configure CFLAGS='-ggdb -O0' \
- --prefix=$HOME/local \
- --with-gnunet=$HOME/local \
- --with-exchange=$HOME/local \
- --enable-logging=verbose
-make install
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-deployment] branch master updated (8457f35 -> 843ea43),
gnunet <=