diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-11-21 15:39:54 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-11-21 15:39:54 +0100 |
| commit | fea08eba99def942c496ca307f731e67101ec136 (patch) | |
| tree | 4b74359e22959222f17d2e978453dd3cbee3c9d6 /taler-build | |
| parent | 2a50a4ee8f54d1c5abceb4e99e40acf0e84060f2 (diff) | |
| parent | 8d4c0b8826b2a6e3154a08a12602743bfe71a267 (diff) | |
| download | deployment-fea08eba99def942c496ca307f731e67101ec136.tar.gz deployment-fea08eba99def942c496ca307f731e67101ec136.tar.bz2 deployment-fea08eba99def942c496ca307f731e67101ec136.zip | |
Merge branch 'master' of taler.net:deployment
Diffstat (limited to 'taler-build')
| -rwxr-xr-x | taler-build/invalidate.sh | 12 | ||||
| -rwxr-xr-x | taler-build/update_gnunet.sh | 9 | ||||
| -rwxr-xr-x | taler-build/update_libmicrohttpd.sh | 9 |
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..04ebb57 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 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 --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 |