nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-26 22:31:16 +00:00
Code Releases Activity

Also don't reset submodule in make-go.bash

Browse source
This commit is contained in:
Felix Ableitner 2016-06-12 21:54:38 +02:00
parent 9009301106
commit 6fc0106880
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
make-go.bash
View file

@ -2,8 +2,6 @@
set -e set -e
RESET=1
MYDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" MYDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export CGO_ENABLED=0 export CGO_ENABLED=0
@ -43,11 +41,6 @@ case "$1" in
exit 1 exit 1
esac esac
#TODO figure out why --depth 1 never works right
if [ $RESET -eq 1 ]; then
git submodule update --init ext/golang/go
fi
unset GOPATH unset GOPATH
export GOROOT_FINAL=${MYDIR}/ext/golang/dist/go-${GOOS}-${GOARCH} export GOROOT_FINAL=${MYDIR}/ext/golang/dist/go-${GOOS}-${GOARCH}
@ -82,7 +75,7 @@ cp -a ../bin "${GOROOT_FINAL}"/
cp -a ../pkg "${GOROOT_FINAL}"/ cp -a ../pkg "${GOROOT_FINAL}"/
cp -a ../src "${GOROOT_FINAL}"/ cp -a ../src "${GOROOT_FINAL}"/
if [[ $RESET -eq 1 && -e ./make.bash ]]; then if [[ -e ./make.bash ]]; then
pushd ../ pushd ../
git clean -f git clean -f
popd popd
@ -90,9 +83,5 @@ fi
popd popd
if [ $RESET -eq 1 ]; then
git submodule update --init ext/golang/go
fi
echo "Complete" echo "Complete"