Bug 1210165 - Tweak the update-icu script ready for release 56. r=waldo
authorJonathan Kew <jkew@mozilla.com>
Fri, 20 Nov 2015 11:33:13 +0000
changeset 307650 dae44b477b62fae4b4a23a8f6e8bcfeb58bdc597
parent 307649 a99df7f5b301cdc471e8519285aec2e644c4f888
child 307651 30f041ae627955109fba2f70b10533f982843c7c
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswaldo
bugs1210165
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1210165 - Tweak the update-icu script ready for release 56. r=waldo
intl/icu-patches/icu-release-56-1-flagparser-fix.patch
intl/icu-patches/pkgdata-large-buffer.diff
intl/update-icu.sh
new file mode 100644
--- /dev/null
+++ b/intl/icu-patches/icu-release-56-1-flagparser-fix.patch
@@ -0,0 +1,14 @@
+diff --git a/intl/icu/source/tools/pkgdata/pkgdata.cpp b/intl/icu/source/tools/pkgdata/pkgdata.cpp
+--- a/intl/icu/source/tools/toolutil/flagparser.c
++++ b/intl/icu/source/tools/toolutil/flagparser.c
+@@ -96,8 +96,8 @@
+     uprv_free(buffer);
+ 
+     T_FileStream_close(f);
+-    
+-    if (U_FAILURE(*status)) {
++
++    if (U_FAILURE(*status) && *status != U_BUFFER_OVERFLOW_ERROR) {
+         return -1;
+     }
+ 
deleted file mode 100644
--- a/intl/icu-patches/pkgdata-large-buffer.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/intl/icu/source/tools/pkgdata/pkgdata.cpp b/intl/icu/source/tools/pkgdata/pkgdata.cpp
---- a/intl/icu/source/tools/pkgdata/pkgdata.cpp
-+++ b/intl/icu/source/tools/pkgdata/pkgdata.cpp
-@@ -2166,17 +2166,17 @@ static void pkg_createOptMatchArch(char 
-     const char* obj = "oma.obj";
-     FileStream* stream = NULL;
- 
-     stream = T_FileStream_open(source,"w");
-     if (stream != NULL) {
-         T_FileStream_writeLine(stream, code);
-         T_FileStream_close(stream);
- 
--        char cmd[SMALL_BUFFER_MAX_SIZE];
-+        char cmd[LARGE_BUFFER_MAX_SIZE];
-         sprintf(cmd, "%s %s -o %s",
-             pkgDataFlags[COMPILER],
-             source,
-             obj);
- 
-         if (runCommand(cmd) == 0){
-             sprintf(optMatchArch, "%s", obj);
-         }
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -49,18 +49,18 @@ rm ${icu_dir}/source/data/unit/*.txt
 # repository (not just the path within it we care about) receives a commit.
 # (This ensures that if ICU modifications are performed properly, it's always
 # possible to run the command at the top of this script and make no changes to
 # the tree.)
 svn info $1 | grep -v '^Revision: [[:digit:]]\+$' > ${icu_dir}/SVN-INFO
 
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-915735
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/suppress-warnings.diff
-patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/pkgdata-large-buffer.diff
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-1172609-icu-fix.diff
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-1172609-timezone-recreateDefault.diff
 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-1198952-workaround-make-3.82-bug.diff
+patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/icu-release-56-1-flagparser-fix.patch
 
 # NOTE: If you're updating this script for a new ICU version, you have to rerun
 # js/src/tests/ecma_6/String/make-normalize-generateddata-input.py for any
 # normalization changes the new ICU implements.
 
 hg addremove ${icu_dir}