Merge "Modify pcre updater Re-apply the Android related patches on the top of pcre."

1 files changed, 19 insertions, 4 deletions

diff --git a/pcre.sh b/pcre.sh
index 80d1b79..8ceb65b 100755
--- a/pcre.sh
+++ b/pcre.sh
@@ -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