diff options
author | Florian Dold <florian.dold@gmail.com> | 2016-11-19 17:14:16 +0100 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2016-11-19 17:14:16 +0100 |
commit | 5c69f6365241870306d5b5bd0c8a4c0d2d2addd7 (patch) | |
tree | 65d3627714f4a10f8b4839aa6bea5ef2a4324c01 | |
parent | 870704d02bc8644986aa47d239cffbb37a042578 (diff) | |
download | deployment-5c69f6365241870306d5b5bd0c8a4c0d2d2addd7.tar.gz deployment-5c69f6365241870306d5b5bd0c8a4c0d2d2addd7.tar.bz2 deployment-5c69f6365241870306d5b5bd0c8a4c0d2d2addd7.zip |
use git for gnunet and mhd
-rwxr-xr-x | bootstrap-bluegreen | 15 | ||||
-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 |
4 files changed, 21 insertions, 24 deletions
diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen index 36bc7d9..a5b7eda 100755 --- a/bootstrap-bluegreen +++ b/bootstrap-bluegreen @@ -19,8 +19,7 @@ set -eu usage() { - ech "Usage:" - echo "$0: DEPLOYMENT_BASENAME" + echo "Usage: $0 DEPLOYMENT_BASENAME" } if [ -z ${1+x} ]; then @@ -39,13 +38,11 @@ esac cd $HOME -if ! test -d $HOME/gnunet; then - svn checkout https://gnunet.org/svn/gnunet -fi - -if ! test -d $HOME/libmicrohttpd; then - svn checkout https://gnunet.org/svn/libmicrohttpd -fi +for component in gnunet libmicrohttps; do + if ! test -d $HOME/$component; then + git clone git://git@gnunet.org/$component.git + fi +done for component in bank merchant gnurl landing exchange merchant-frontends deployment; do if ! test -d $HOME/$component; then 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 |