summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-04-24 21:41:21 +0200
committerFlorian Dold <florian.dold@gmail.com>2016-04-24 21:41:21 +0200
commit36d949f1fc1769a07f84ea03fce8b03ca6af221c (patch)
tree325545174b8d58b9e418134db5e18d062c484322
parent36942aa35087b6baa7fc2c4453206138525d0347 (diff)
downloaddeployment-36d949f1fc1769a07f84ea03fce8b03ca6af221c.tar.gz
deployment-36d949f1fc1769a07f84ea03fce8b03ca6af221c.tar.bz2
deployment-36d949f1fc1769a07f84ea03fce8b03ca6af221c.zip
deployment base dir
-rwxr-xr-xbootstrap19
-rwxr-xr-xrestart.sh2
-rwxr-xr-xstart.sh4
-rw-r--r--taler-build/Makefile1
-rwxr-xr-xtaler-build/invalidate.sh10
-rwxr-xr-xtaler-build/update_bank.sh10
-rwxr-xr-xtaler-build/update_exchange.sh13
-rwxr-xr-xtaler-build/update_gnunet.sh6
-rwxr-xr-xtaler-build/update_landing.sh3
-rwxr-xr-xtaler-build/update_merchant.sh12
10 files changed, 57 insertions, 23 deletions
diff --git a/bootstrap b/bootstrap
new file mode 100755
index 0000000..8c5a62c
--- /dev/null
+++ b/bootstrap
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -eu
+
+base=${TALER_DEPLOYMENT_BASE:-$HOME}
+
+mkdir -p base
+
+cd $base
+
+if ! test -d $base/gnunet; then
+ svn checkout https://gnunet.org/svn/gnunet
+fi
+
+for component in merchant mint landing exchange merchant-frontends deployment; do
+ if ! test -d $base/$component; then
+ git clone /var/git/$component.git
+ fi
+done
diff --git a/restart.sh b/restart.sh
index f15a9a1..f915b77 100755
--- a/restart.sh
+++ b/restart.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+base=${TALER_DEPLOYMENT_BASE:-$HOME}
+
export PATH="$HOME/deployment":$PATH
ulimit -c $((100 * 1024))
diff --git a/start.sh b/start.sh
index 91fb06b..d122dd6 100755
--- a/start.sh
+++ b/start.sh
@@ -1,6 +1,8 @@
#!/bin/bash
-export PATH="$HOME/deployment":$PATH
+base=${TALER_DEPLOYMENT_BASE:-$HOME}
+
+export PATH="$base/deployment":$PATH
ulimit -c $((100 * 1024))
diff --git a/taler-build/Makefile b/taler-build/Makefile
index 5e1b14c..d40e085 100644
--- a/taler-build/Makefile
+++ b/taler-build/Makefile
@@ -1,4 +1,3 @@
-
all: exchange-stamp bank-stamp merchant-stamp
exchange-stamp: gnunet-stamp
diff --git a/taler-build/invalidate.sh b/taler-build/invalidate.sh
index 144c629..db5ae13 100755
--- a/taler-build/invalidate.sh
+++ b/taler-build/invalidate.sh
@@ -6,18 +6,20 @@
# since there all the information is already
# available.
+base=${TALER_DEPLOYMENT_BASE:-$HOME}
+
for component in exchange merchant bank;
do
- cd ~/$component
+ cd $base/$component
git fetch
if git status -sb | grep behind; then
- rm -f ~/deployment/taler-build/$component-stamp
+ rm -f $base/deployment/taler-build/$component-stamp
fi
done
-cd ~/gnunet
+cd $base/gnunet
svnHead=$(svn info -r HEAD | awk '/^Revision/ {print $2}')
svnBase=$(svn info -r BASE | awk '/^Revision/ {print $2}')
if test $svnHead != $svnBase; then
- rm -f ~/deployment/taler-build/gnunet-stamp
+ rm -f $base/deployment/taler-build/gnunet-stamp
fi
diff --git a/taler-build/update_bank.sh b/taler-build/update_bank.sh
index 69fef25..34a2de5 100755
--- a/taler-build/update_bank.sh
+++ b/taler-build/update_bank.sh
@@ -1,15 +1,17 @@
#!/bin/bash
-export PATH="$HOME/deployment":$PATH
+base=${TALER_DEPLOYMENT_BASE:-$HOME}
-cd $HOME/bank/ && \
+export PATH="$base/deployment":$PATH
+
+cd $base/bank/ && \
git pull && \
git submodule update --init && \
git clean -fxd && \
./bootstrap && \
- ./configure --prefix="$HOME/local" && \
+ ./configure --prefix="$base/local" && \
make && \
make install && \
- cd $HOME/deployment && \
+ cd $base/deployment && \
arm.sh -k taler-demobank
arm.sh -i taler-demobank
diff --git a/taler-build/update_exchange.sh b/taler-build/update_exchange.sh
index cd66b1e..01f03ba 100755
--- a/taler-build/update_exchange.sh
+++ b/taler-build/update_exchange.sh
@@ -1,27 +1,30 @@
#!/bin/bash
+base=${TALER_DEPLOYMENT_BASE:-$HOME}
+
export PATH="$HOME/deployment":$PATH
build_exchange() {
(
set -eu
+ base=${TALER_DEPLOYMENT_BASE:-$HOME}
cd $HOME/exchange
git clean -fdx
./bootstrap
./configure CFLAGS='-ggdb -O0' \
- --with-libgnurl=$HOME/local \
- --with-microhttpd=$HOME/local \
- --prefix=$HOME/local --with-gnunet=$HOME/local \
+ --with-libgnurl=$base/local \
+ --with-microhttpd=$base/local \
+ --prefix=$base/local --with-gnunet=$base/local \
--enable-logging=verbose
make
make install
)
}
-cd $HOME/exchange && \
+cd $base/exchange && \
git pull && \
- cd $HOME/deployment && \
+ cd $base/deployment && \
build_exchange && \
arm.sh -k taler-exchange
arm.sh -i taler-exchange
diff --git a/taler-build/update_gnunet.sh b/taler-build/update_gnunet.sh
index ba9187c..03e49d8 100755
--- a/taler-build/update_gnunet.sh
+++ b/taler-build/update_gnunet.sh
@@ -1,9 +1,11 @@
#!/bin/bash
-cd $HOME/gnunet/ && \
+base=${TALER_DEPLOYMENT_BASE:-$HOME}
+
+cd $base/gnunet/ && \
svn revert -R . && \
svn update && \
./bootstrap \
- ./configure --prefix=$HOME/local --enable-logging=verbose \
+ ./configure --prefix=$base/local --enable-logging=verbose \
make && \
make install
diff --git a/taler-build/update_landing.sh b/taler-build/update_landing.sh
index e3826af..253b05f 100755
--- a/taler-build/update_landing.sh
+++ b/taler-build/update_landing.sh
@@ -1,7 +1,8 @@
#!/bin/bash
set -e
+base=${TALER_DEPLOYMENT_BASE:-$HOME}
-cd $HOME/landing
+cd $base/landing
git pull
git submodule update --init
diff --git a/taler-build/update_merchant.sh b/taler-build/update_merchant.sh
index 5af4fa2..aba2f65 100755
--- a/taler-build/update_merchant.sh
+++ b/taler-build/update_merchant.sh
@@ -1,28 +1,30 @@
#!/bin/bash
export PATH="$HOME/deployment":$PATH
+base=${TALER_DEPLOYMENT_BASE:-$HOME}
build_merchant() {
(
set -eu
+ base=${TALER_DEPLOYMENT_BASE:-$HOME}
cd $HOME/merchant
git clean -fdx
./bootstrap
./configure CFLAGS='-ggdb -O0' \
- --prefix=$HOME/local --with-gnunet=$HOME/local \
- --with-mint=$HOME/local \
- --with-microhttpd=$HOME/local \
+ --prefix=$base/local --with-gnunet=$base/local \
+ --with-mint=$base/local \
+ --with-microhttpd=$base/local \
--enable-logging=verbose
make
make install
)
}
-cd $HOME/merchant/ && \
+cd $base/merchant/ && \
git pull && \
git submodule update --init && \
- cd $HOME/deployment && \
+ cd $base/deployment && \
build_merchant && \
arm.sh -k taler-merchant
arm.sh -i taler-merchant