diff options
author | Xavier Hsu <xavier.hsu@linaro.org> | 2015-06-25 15:23:02 +0800 |
---|---|---|
committer | Xavier Hsu <xavier.hsu@linaro.org> | 2015-06-25 15:23:02 +0800 |
commit | 8d1235f9da24da42a9e128846989b2f19219615f (patch) | |
tree | d607b24b5cba95d848bd13ffe67531fdfa53589e | |
parent | ce4ed41db5a231c62d636da1bb0ff0851dddaead (diff) | |
download | update-externals-8d1235f9da24da42a9e128846989b2f19219615f.tar.gz |
Modify pcre updater
Re-apply the Android related patches on the top of pcre.
Signed-off-by: Xavier Hsu <xavier.hsu@linaro.org>
-rwxr-xr-x | pcre.sh | 23 |
1 files changed, 19 insertions, 4 deletions
@@ -29,14 +29,29 @@ if [ "$(vertonumber $NEW_VERSION)" -le "$(vertonumber $AOSPVER)" ]; then notice "pcre is up to date in AOSP master, copying its work" else notice "Updating pcre to $NEW_VERSION" + wget ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$AOSPVER.tar.bz2 + tar -jxvf pcre-$AOSPVER.tar.bz2 + + diff -rubN pcre-$AOSPVER dist > Android.patch + wget ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$NEW_VERSION.tar.bz2 tar -jxvf pcre-$NEW_VERSION.tar.bz2 - rm -rf dist + + rm -rf pcre-$NEW_VERSION.tar.bz2 pcre-$AOSPVER.tar.bz2 pcre-$AOSPVER + rm -rf dist pcre-$AOSPVER mv pcre-$NEW_VERSION dist - rm pcre-$NEW_VERSION.tar.bz2 - git commit -asm "Update to pcre $NEW_VERSION" - git clean -d -f -x + if patch -p0 < Android.patch; then + rm Android.patch + notice "Auto-updated pcre to $NEW_VERSION." + git commit -asm "Update to pcre $NEW_VERSION" + git clean -d -f -x + else + error "Couldn't auto-update pcre - patch failed to apply." + error "Please fix manually and commit to a branch called" + error "linaro-upstream-$NEW_VERSION." + exit 1 + fi fi git push origin linaro-upstream-work-$TIMESTAMP:linaro-upstream-$NEW_VERSION |