diff options
author | Colin Cross <ccross@android.com> | 2015-11-11 17:55:23 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2015-11-16 11:28:47 -0800 |
commit | 5830c5ff5288bcb58875552b5d9a6cf48035f9dd (patch) | |
tree | dbfffcf914ced5e0878b867e6cf01cf038763c13 | |
parent | e872eb0c4bc3acdd6e4bea8b6162abc146dc06b1 (diff) | |
download | linux-x86-5830c5ff5288bcb58875552b5d9a6cf48035f9dd.tar.gz |
Adding binaries for master-eda391df8e36
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: I228b79c6c77355b408df7b91fef24032c4dc4422
-rw-r--r-- | build-common.sh | 6 | ||||
-rwxr-xr-x | build-ninja.sh | 13 | ||||
-rwxr-xr-x | ninja | bin | 3326752 -> 3326640 bytes |
3 files changed, 15 insertions, 4 deletions
diff --git a/build-common.sh b/build-common.sh index f84a9e3..9f0029b 100644 --- a/build-common.sh +++ b/build-common.sh @@ -99,12 +99,16 @@ commit_and_push() GIT_REPO="$SCRATCH/prebuilts/$PROJ/$OS-x86" cd $GIT_REPO git rm -r * || true # ignore error caused by empty directory + if [ -n "${EXTRA_FILE}" ]; then + git reset -- $EXTRA_FILE + git checkout HEAD -- $EXTRA_FILE + fi mv $INSTALL/* $GIT_REPO cp $SCRIPT_FILE $GIT_REPO cp $COMMON_FILE $GIT_REPO git add . - git commit -m "Adding binaries for $INSTALL_VER" + git commit -m "Adding binaries for ${INSTALL_VER}${EXTRA_COMMIT_MSG}" # execute this command to upload #git push origin HEAD:refs/for/master 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 Binary files differ |