diff options
| -rwxr-xr-x | zlib.sh | 25 |
1 files changed, 21 insertions, 4 deletions
@@ -30,19 +30,36 @@ if [ "$(vertonumber $NEW_VERSION)" -le "$(vertonumber $AOSPVER)" ]; then notice "zlib is up to date in AOSP master, copying its work" else notice "Updating zlib to $NEW_VERSION" + + wget http://zlib.net/zlib-$AOSPVER.tar.gz + tar -zxf zlib-$AOSPVER.tar.gz + cd zlib-$AOSPVER + ./configure + rm Makefile configure.log + cd ../ + diff -ruN zlib-$AOSPVER src > Android.patch + wget http://zlib.net/zlib-$NEW_VERSION.tar.gz - rm -rf src tar -zxf zlib-$NEW_VERSION.tar.gz + rm -rf src zlib-$AOSPVER zlib-$NEW_VERSION.tar.gz zlib-$AOSPVER.tar.gz mv zlib-$NEW_VERSION src cd src ./configure rm Makefile configure.log cd ../ - rm zlib-$NEW_VERSION.tar.gz grep -A21 'Copyright notice:' src/README | tail -20 > NOTICE - git commit -asm "Update to zlib $NEW_VERSION" - git clean -d -f -x + if patch -p0 < Android.patch; then + rm Android.patch + notice "Auto-updated zlib to $NEW_VERSION." + git commit -asm "Update to zlib $NEW_VERSION" + git clean -d -f -x + else + error "Couldn't auto-update zlib - patch failed to apply." + error "Please fix manually and commit to a branch called" + error "linaro-upstream-$NEW_VERSION." + exut 1 + fi fi git push origin linaro-upstream-work-$TIMESTAMP:linaro-upstream-$NEW_VERSION |