diff options
| author | Colin Cross <ccross@android.com> | 2015-11-16 21:31:06 +0000 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-11-16 21:31:38 +0000 |
| commit | b5edd905d43e1a0ce8052ab85172c99f5d2c626f (patch) | |
| tree | afe9789276580d2cdf8d4f25bf19b9c66444d695 /build-ninja.sh | |
| parent | 5830c5ff5288bcb58875552b5d9a6cf48035f9dd (diff) | |
| download | linux-x86-b5edd905d43e1a0ce8052ab85172c99f5d2c626f.tar.gz | |
Revert "Adding binaries for master-eda391df8e36"
This reverts commit 5830c5ff5288bcb58875552b5d9a6cf48035f9dd.
The extra status lines produce too much garbage when showcommands is
enabled on the build servers, reverting until the buildbot push that
knows how to strip everything after the next status line.
Change-Id: I8c96d8710501d0e4adbdf4c8045cdff797fa6296
Diffstat (limited to 'build-ninja.sh')
| -rwxr-xr-x | build-ninja.sh | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/build-ninja.sh b/build-ninja.sh index 791618f..c5e9cf3 100755 --- a/build-ninja.sh +++ b/build-ninja.sh @@ -4,8 +4,7 @@ # leaves output in /tmp/prebuilts/ninja/$OS-x86/ PROJ=ninja -VER=master -BASE_VER=v1.6.0 +VER=1.6.0 MSVS=2013 source $(dirname "$0")/build-common.sh build-common.sh @@ -15,12 +14,9 @@ export PATH="$PATH":. # ninja specific steps cd $RD -git clone https://android.googlesource.com/platform/external/ninja.git src +git clone https://github.com/martine/ninja.git src cd src -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)} +git checkout v$VER if [[ "$OS" == "windows" ]] ; then PLATFORM="--platform=msvc" fi @@ -29,7 +25,4 @@ 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 |