summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--taler-build/Makefile9
-rw-r--r--taler-build/invalidate.sh21
-rwxr-xr-xtaler-build/update_bank.sh (renamed from update_bank.sh)0
-rwxr-xr-xtaler-build/update_exchange.sh (renamed from update_exchange.sh)0
-rwxr-xr-xtaler-build/update_gnunet.sh (renamed from update_gnunet.sh)0
-rwxr-xr-xtaler-build/update_landing.sh (renamed from update_landing.sh)0
-rwxr-xr-xtaler-build/update_merchant.sh (renamed from update_merchant.sh)0
7 files changed, 16 insertions, 14 deletions
diff --git a/taler-build/Makefile b/taler-build/Makefile
index a01b578..a64a458 100644
--- a/taler-build/Makefile
+++ b/taler-build/Makefile
@@ -2,19 +2,18 @@
all: exchange-stamp bank-stamp merchant-stamp
exchange-stamp: gnunet-stamp
- ~/deployment/update_exchange.sh
+ ~/deployment/taler-biuld/update_exchange.sh
touch $@
gnunet-stamp:
- ~/deployment/update_exchange.sh
+ ~/deployment/taler-biuld/update_gnunet.sh
touch $@
bank-stamp: exchange-stamp
- ~/deployment/update_bank.sh
+ ~/deployment/taler-biuld/update_bank.sh
touch $@
merchant-stamp: exchange-stamp
- ~/deployment/update_bank.sh
+ ~/deployment/taler-biuld/update_merchant.sh
touch $@
-
diff --git a/taler-build/invalidate.sh b/taler-build/invalidate.sh
index 8055b21..9b2d702 100644
--- a/taler-build/invalidate.sh
+++ b/taler-build/invalidate.sh
@@ -2,14 +2,17 @@
# Invalidate build stamps
+for component in exchange merchant bank;
+ do
+ cd ~/$component
+ git fetch
+ if git status -sb | grep behind; then
+ rm ~/deployment/taler-build/$component-stamp
+ fi
-cd ~/merchant
-git fetch
-if git status -sb | grep behind; then
- rm merchant-stamp
+cd ~/gnunet
+svnHead=$(svn info -r HEAD | awk '/^Revision/ {print $2}')
+svnBase=$(svn info -r BASE | awk '/^Revision/ {print $2}')
+if $svnHead != $svnBase; then
+ rm ~/deployment/taler-build/gnunet-stamp
fi
-
-# TODO: also do it for the other repos
-# TODO: also do it for SVN
-
-
diff --git a/update_bank.sh b/taler-build/update_bank.sh
index 69fef25..69fef25 100755
--- a/update_bank.sh
+++ b/taler-build/update_bank.sh
diff --git a/update_exchange.sh b/taler-build/update_exchange.sh
index cd66b1e..cd66b1e 100755
--- a/update_exchange.sh
+++ b/taler-build/update_exchange.sh
diff --git a/update_gnunet.sh b/taler-build/update_gnunet.sh
index b6b7f48..b6b7f48 100755
--- a/update_gnunet.sh
+++ b/taler-build/update_gnunet.sh
diff --git a/update_landing.sh b/taler-build/update_landing.sh
index e3826af..e3826af 100755
--- a/update_landing.sh
+++ b/taler-build/update_landing.sh
diff --git a/update_merchant.sh b/taler-build/update_merchant.sh
index 5af4fa2..5af4fa2 100755
--- a/update_merchant.sh
+++ b/taler-build/update_merchant.sh