diff options
| author | Colin Cross <ccross@android.com> | 2015-11-11 17:55:23 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-11-16 15:23:42 -0800 |
| commit | b147d6f3236ca8c4b0d37715195e38f019b6a37c (patch) | |
| tree | dbfffcf914ced5e0878b867e6cf01cf038763c13 /build-ninja.sh | |
| parent | b5edd905d43e1a0ce8052ab85172c99f5d2c626f (diff) | |
| download | linux-x86-b147d6f3236ca8c4b0d37715195e38f019b6a37c.tar.gz | |
Adding binaries for master-eda391df8e36android-n-preview-1brillo-m9-releasebrillo-m9-devbrillo-m8-releasebrillo-m8-devbrillo-m10-releasebrillo-m10-dev
Changes since v1.6.0:
eda391df8e36 Print status when edge finishes on dumb terminals
c340ca129272 Merge tag 'v1.6.0' into master
d99e75e05590 Initial empty repository
Change-Id: I83b1d4664f3cd8492b9ff8a9a91dc6c1def7fac2
Diffstat (limited to 'build-ninja.sh')
| -rwxr-xr-x | build-ninja.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/build-ninja.sh b/build-ninja.sh index c5e9cf3..791618f 100755 --- a/build-ninja.sh +++ b/build-ninja.sh @@ -4,7 +4,8 @@ # leaves output in /tmp/prebuilts/ninja/$OS-x86/ PROJ=ninja -VER=1.6.0 +VER=master +BASE_VER=v1.6.0 MSVS=2013 source $(dirname "$0")/build-common.sh build-common.sh @@ -14,9 +15,12 @@ export PATH="$PATH":. # ninja specific steps cd $RD -git clone https://github.com/martine/ninja.git src +git clone https://android.googlesource.com/platform/external/ninja.git src cd src -git checkout v$VER +git remote add upstream https://github.com/martine/ninja.git +git fetch upstream +git checkout $VER +INSTALL_VER=${INSTALL_VER/${VER}/${VER}-$(git rev-parse --short=12 HEAD)} if [[ "$OS" == "windows" ]] ; then PLATFORM="--platform=msvc" fi @@ -25,4 +29,7 @@ fi # install cp $RD/src/ninja $INSTALL +EXTRA_FILE="LICENSE MODULE_LICENSE_APL" +EXTRA_COMMIT_MSG=$(echo -e "\n\nChanges since ${BASE_VER}:" && git log --oneline --abbrev=12 ${BASE_VER}..HEAD) + commit_and_push |