diff options
| author | Ungureanu Marius <marius.ungureanu@xamarin.com> | 2015-06-29 03:15:27 +0300 |
|---|---|---|
| committer | Ungureanu Marius <marius.ungureanu@xamarin.com> | 2015-06-29 03:16:27 +0300 |
| commit | 989a274d91669db9e4d570f13940fbf78c780a81 (patch) | |
| tree | f1c4cedb61e55783ecdbaca265f0bee9709f9607 | |
| parent | b4fbe3b96f5b84f31516b2e868e75b1b417318f9 (diff) | |
Build script improvements. Use revparse and smarter git rm
| -rwxr-xr-x | build.libgit2.sh | 15 | ||||
| -rw-r--r-- | libgit2_hash.txt | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/build.libgit2.sh b/build.libgit2.sh index 01bdd5c..42456cc 100755 --- a/build.libgit2.sh +++ b/build.libgit2.sh @@ -1,7 +1,10 @@ #!/bin/bash CURDIR=$(pwd) -LIBGIT2SHA=`cat ./libgit2_hash.txt` +pushd external/libgit2 +LIBGIT2SHA=$(git rev-parse HEAD) +popd +echo $LIBGIT2SHA > libgit2_hash.txt SHORTSHA=${LIBGIT2SHA:0:7} OS=$(uname -s) @@ -102,6 +105,16 @@ then exit 0 fi +for i in $PKGPATH/*; +do + if [[ "$i" == "$PKGPATH/libssh2.dylib" || "$i" == "$PKGPATH/libgit2-$SHORTSHA.$LIBEXT" ]] + then + continue + fi + + git rm $i +done + cp "external/libgit2/build/libgit2-$SHORTSHA.$LIBEXT" $PKGPATH/ install_name_tool -change libssh2.1.dylib @loader_path/libssh2.dylib "$PKGPATH/libgit2-$SHORTSHA.$LIBEXT" diff --git a/libgit2_hash.txt b/libgit2_hash.txt index ec45c96..7f119b7 100644 --- a/libgit2_hash.txt +++ b/libgit2_hash.txt @@ -1 +1 @@ -edb2afa37f01179361ccecceb96acc75094b277a +3d5286e151cecad8092060cdca0335031f9cda7e |