diff options
| -rw-r--r-- | build-common.sh | 6 | ||||
| -rwxr-xr-x | build-ninja.sh | 13 | ||||
| -rwxr-xr-x | ninja | bin | 3326640 -> 3326752 bytes |
3 files changed, 4 insertions, 15 deletions
diff --git a/build-common.sh b/build-common.sh index 9f0029b..f84a9e3 100644 --- a/build-common.sh +++ b/build-common.sh @@ -99,16 +99,12 @@ 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}${EXTRA_COMMIT_MSG}" + git commit -m "Adding binaries for $INSTALL_VER" # execute this command to upload #git push origin HEAD:refs/for/master 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 Binary files differ |