2013-03-02 08:53:01 +04:00
|
|
|
#!/bin/sh
|
|
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
|
Bug 924839 - Update our embedded ICU to 52.1, plus a very few local patches. r=lots of people, see subsequent lines in this commit message for the original subcomponents (merged together for landing), and the original bug for the original patch divisions
Bug 924839 - Remove a patch already part of ICU 52.1. See http://bugs.icu-project.org/trac/ticket/10283 but also note the relevant code was removed completely upstream. r=glandium
* * *
Bug 924839 - Remove another patch already part of ICU 52.1. See http://bugs.icu-project.org/trac/ticket/10290 for that. r=gaston
* * *
Bug 924839 - Remove another patch already in ICU 52.1. See http://bugs.icu-project.org/trac/ticket/10045 for more. r=Norbert
* * *
Bug 924839 - Remove another patch already applied upstream. See http://bugs.icu-project.org/trac/changeset/32937 for more. r=gaston
* * *
Bug 924839 - Update the ICU update script to update to 52.1, *without* applying any of our local patches. r=glandium
* * *
Bug 924839 - Make the ICU update script only do updating within intl/icu/source and nowhere else. r=glandium
* * *
Bug 924839 - Implement the changes that would be made by |cd intl/; ./update-icu.sh http://source.icu-project.org/repos/icu/icu/tags/release-52-1/;|, run with the prior changesets' changes made (thus not applying any of our local patches). These changes don't actually work without subsequent adjustments, but this provides a codebase upon which those adjustments can be made, for the purpose of generating local patches to be kept in intl/icu-patches/. rs=the-usual-suspects
* * *
Bug 924839 - Update the bug 899722 local patch to make runConfigureICU not override CC/CXX on BSD systems. r=gaston
* * *
Bug 924839 - Update the bug 724533 patch that makes ICU builds with MozillaBuild on Windows. r=glandium
* * *
Bug 924839 - Import an upstream patch fixing the genrb tool to properly handle the -R (--omitCollationRules) option. See http://bugs.icu-project.org/trac/ticket/10043 for the original bug report and a link to the ultimate upstream landing. r=Norbert
* * *
Bug 924839 - Import the upstream fix for http://bugs.icu-project.org/trac/ticket/10486 so that ICU with -DU_USING_ICU_NAMESPACE=0 will compile on Windows. r=Norbert
* * *
Bug 924839 - Adjust the update script to update ICU, then to apply all local patches (rather than skipping the second step). Thus if the update script is properly run, now, the final result should be no changes at all to the tree. NOT REVIEWED YET
* * *
Bug 924839 - Update jstests that depend on CLDR locale data to match CLDR 24. r=Norbert
2013-11-13 04:23:48 +04:00
|
|
|
set -e
|
|
|
|
|
2013-03-02 08:53:01 +04:00
|
|
|
# Usage: update-icu.sh <URL of ICU SVN with release>
|
2016-11-03 15:10:41 +03:00
|
|
|
# E.g., for ICU 58.1: update-icu.sh https://ssl.icu-project.org/repos/icu/icu/tags/release-58-1/
|
2013-03-02 08:53:01 +04:00
|
|
|
|
|
|
|
if [ $# -lt 1 ]; then
|
|
|
|
echo "Usage: update-icu.sh <URL of ICU SVN with release>"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2014-01-04 03:44:24 +04:00
|
|
|
# Ensure that $Date$ in the checked-out svn files expands timezone-agnostically,
|
|
|
|
# so that this script's behavior is consistent when run from any time zone.
|
|
|
|
export TZ=UTC
|
|
|
|
|
2016-12-19 23:20:51 +03:00
|
|
|
# Also ensure SVN-INFO is consistently English.
|
|
|
|
export LANG=en_US.UTF-8
|
|
|
|
export LC_ALL=en_US.UTF-8
|
2016-11-03 15:10:41 +03:00
|
|
|
|
2013-03-02 08:53:01 +04:00
|
|
|
icu_dir=`dirname $0`/icu
|
Bug 924839 - Update our embedded ICU to 52.1, plus a very few local patches. r=lots of people, see subsequent lines in this commit message for the original subcomponents (merged together for landing), and the original bug for the original patch divisions
Bug 924839 - Remove a patch already part of ICU 52.1. See http://bugs.icu-project.org/trac/ticket/10283 but also note the relevant code was removed completely upstream. r=glandium
* * *
Bug 924839 - Remove another patch already part of ICU 52.1. See http://bugs.icu-project.org/trac/ticket/10290 for that. r=gaston
* * *
Bug 924839 - Remove another patch already in ICU 52.1. See http://bugs.icu-project.org/trac/ticket/10045 for more. r=Norbert
* * *
Bug 924839 - Remove another patch already applied upstream. See http://bugs.icu-project.org/trac/changeset/32937 for more. r=gaston
* * *
Bug 924839 - Update the ICU update script to update to 52.1, *without* applying any of our local patches. r=glandium
* * *
Bug 924839 - Make the ICU update script only do updating within intl/icu/source and nowhere else. r=glandium
* * *
Bug 924839 - Implement the changes that would be made by |cd intl/; ./update-icu.sh http://source.icu-project.org/repos/icu/icu/tags/release-52-1/;|, run with the prior changesets' changes made (thus not applying any of our local patches). These changes don't actually work without subsequent adjustments, but this provides a codebase upon which those adjustments can be made, for the purpose of generating local patches to be kept in intl/icu-patches/. rs=the-usual-suspects
* * *
Bug 924839 - Update the bug 899722 local patch to make runConfigureICU not override CC/CXX on BSD systems. r=gaston
* * *
Bug 924839 - Update the bug 724533 patch that makes ICU builds with MozillaBuild on Windows. r=glandium
* * *
Bug 924839 - Import an upstream patch fixing the genrb tool to properly handle the -R (--omitCollationRules) option. See http://bugs.icu-project.org/trac/ticket/10043 for the original bug report and a link to the ultimate upstream landing. r=Norbert
* * *
Bug 924839 - Import the upstream fix for http://bugs.icu-project.org/trac/ticket/10486 so that ICU with -DU_USING_ICU_NAMESPACE=0 will compile on Windows. r=Norbert
* * *
Bug 924839 - Adjust the update script to update ICU, then to apply all local patches (rather than skipping the second step). Thus if the update script is properly run, now, the final result should be no changes at all to the tree. NOT REVIEWED YET
* * *
Bug 924839 - Update jstests that depend on CLDR locale data to match CLDR 24. r=Norbert
2013-11-13 04:23:48 +04:00
|
|
|
|
|
|
|
# Remove intl/icu/source, then replace it with a clean export.
|
|
|
|
rm -rf ${icu_dir}/source
|
|
|
|
svn export $1/source/ ${icu_dir}/source
|
2013-03-02 08:53:01 +04:00
|
|
|
|
2016-11-03 15:10:41 +03:00
|
|
|
# remove layoutex, tests, and samples, but leave makefiles in place
|
2013-03-02 08:53:01 +04:00
|
|
|
find ${icu_dir}/source/layoutex -name '*Makefile.in' -prune -or -type f -print | xargs rm
|
|
|
|
find ${icu_dir}/source/test -name '*Makefile.in' -prune -or -type f -print | xargs rm
|
|
|
|
find ${icu_dir}/source/samples -name '*Makefile.in' -prune -or -type f -print | xargs rm
|
|
|
|
|
|
|
|
# remove data that we currently don't need
|
2016-04-05 17:09:12 +03:00
|
|
|
rm -rf ${icu_dir}/source/data/brkitr/*
|
2013-03-02 08:53:01 +04:00
|
|
|
rm ${icu_dir}/source/data/lang/*.mk
|
|
|
|
rm ${icu_dir}/source/data/lang/*.txt
|
|
|
|
rm ${icu_dir}/source/data/mappings/*.mk
|
|
|
|
find ${icu_dir}/source/data/mappings \
|
|
|
|
-name ibm-37_P100-1995.ucm -prune -or \
|
|
|
|
-name ibm-1047_P100-1995.ucm -prune -or \
|
|
|
|
-name '*.ucm' -print | xargs rm
|
|
|
|
rm ${icu_dir}/source/data/rbnf/*
|
|
|
|
rm ${icu_dir}/source/data/region/*.mk
|
|
|
|
rm ${icu_dir}/source/data/region/*.txt
|
|
|
|
rm ${icu_dir}/source/data/translit/*
|
2015-07-08 12:49:58 +03:00
|
|
|
rm ${icu_dir}/source/data/unit/*.mk
|
|
|
|
rm ${icu_dir}/source/data/unit/*.txt
|
2013-03-02 08:53:01 +04:00
|
|
|
|
2013-12-15 01:04:21 +04:00
|
|
|
# Record `svn info`, eliding the line that changes every time the entire ICU
|
|
|
|
# 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
|
2013-03-02 08:53:01 +04:00
|
|
|
|
2016-04-05 17:09:12 +03:00
|
|
|
for patch in \
|
|
|
|
bug-915735 \
|
|
|
|
suppress-warnings.diff \
|
|
|
|
bug-1172609-timezone-recreateDefault.diff \
|
|
|
|
bug-1198952-workaround-make-3.82-bug.diff \
|
2016-04-11 14:38:54 +03:00
|
|
|
bug-1228227-bug-1263325-libc++-gcc_hidden.diff \
|
2016-11-03 15:10:41 +03:00
|
|
|
ucol_getKeywordValuesForLocale-ulist_resetList.diff \
|
2016-08-08 23:34:37 +03:00
|
|
|
unum_formatDoubleForFields.diff \
|
2016-04-05 17:09:12 +03:00
|
|
|
; do
|
|
|
|
echo "Applying local patch $patch"
|
|
|
|
patch -d ${icu_dir}/../../ -p1 --no-backup-if-mismatch < ${icu_dir}/../icu-patches/$patch
|
|
|
|
done
|
2015-06-13 00:25:23 +03:00
|
|
|
|
2016-04-05 17:09:12 +03:00
|
|
|
topsrcdir=`dirname $0`/../
|
|
|
|
python ${topsrcdir}/js/src/tests/ecma_6/String/make-normalize-generateddata-input.py $topsrcdir
|
2015-06-17 09:53:04 +03:00
|
|
|
|
2016-04-05 17:09:12 +03:00
|
|
|
# Update our moz.build files in config/external/icu, and
|
|
|
|
# build a new ICU data file.
|
|
|
|
python `dirname $0`/icu_sources_data.py $topsrcdir
|
|
|
|
|
|
|
|
hg addremove ${icu_dir} ${topsrcdir}/config/external/icu
|
2016-10-07 08:37:20 +03:00
|
|
|
|
|
|
|
# Check local tzdata version.
|
|
|
|
`dirname $0`/update-tzdata.sh -c
|