summaryrefslogtreecommitdiff
path: root/taler-build
diff options
context:
space:
mode:
Diffstat (limited to 'taler-build')
-rwxr-xr-xtaler-build/invalidate.sh12
-rwxr-xr-xtaler-build/update_gnunet.sh9
-rwxr-xr-xtaler-build/update_libmicrohttpd.sh9
3 files changed, 15 insertions, 15 deletions
diff --git a/taler-build/invalidate.sh b/taler-build/invalidate.sh
index 5c1bc20..3c9a15b 100755
--- a/taler-build/invalidate.sh
+++ b/taler-build/invalidate.sh
@@ -8,7 +8,7 @@
set -eu
-for component in deployment exchange merchant bank gnurl merchant-frontends landing; do
+for component in deployment exchange merchant bank gnurl merchant-frontends landing gnunet libmicrohttpd; do
cd $HOME/$component
git fetch
if git status -sb | grep behind; then
@@ -16,13 +16,3 @@ for component in deployment exchange merchant bank gnurl merchant-frontends land
rm -f $HOME/deployment/taler-build/$component-stamp
fi
done
-
-for component in gnunet libmicrohttpd; do
- cd $HOME/$component
- svnHead=$(svn info -r HEAD | awk '/^Revision/ {print $2}')
- svnBase=$(svn info -r BASE | awk '/^Revision/ {print $2}')
- if test $svnHead != $svnBase; then
- echo "invalidating $component"
- rm -f $HOME/deployment/taler-build/$component-stamp
- fi
-done
diff --git a/taler-build/update_gnunet.sh b/taler-build/update_gnunet.sh
index c1a013e..a845d66 100755
--- a/taler-build/update_gnunet.sh
+++ b/taler-build/update_gnunet.sh
@@ -3,8 +3,13 @@
set -eu
cd $HOME/gnunet/
-svn revert -R .
-svn update
+git clear -fdx
+
+# like "git pull", but robust against force pushes
+# and local changes
+git fetch
+git reset --hard FETCH_HEAD
+
./bootstrap
./configure --prefix=$HOME/local --enable-logging=verbose --with-libgnurl=$HOME/local --with-microhttpd=$HOME/local
make
diff --git a/taler-build/update_libmicrohttpd.sh b/taler-build/update_libmicrohttpd.sh
index ba90b25..d02d853 100755
--- a/taler-build/update_libmicrohttpd.sh
+++ b/taler-build/update_libmicrohttpd.sh
@@ -1,8 +1,13 @@
#!/bin/bash
cd $HOME/libmicrohttpd/
-svn revert -R .
-svn update
+git clean -fdx
+
+# like "git pull", but robust against force pushes
+# and local changes
+git fetch
+git reset --hard FETCH_HEAD
+
./bootstrap
./configure --prefix=$HOME/local
make