Bug 1324536 - Only add/remove files in intl/{icu,tzdata}/{source,SVN-INFO} so that random other detritus in intl/{icu,tzdata} doesn't get included. r=anba
authorJeff Walden <jwalden@mit.edu>
Mon, 19 Dec 2016 15:28:25 -0500
changeset 326539 00fde28274fa2afb2bdaacc9152046269c7e9db8
parent 326538 f849271896d3fbde28471c8e362aa7f7da300b50
child 326540 81f871e19f1f33205bf4db2e3db3c33d9ce466b0
push id31106
push userkwierso@gmail.com
push dateTue, 20 Dec 2016 19:42:03 +0000
treeherdermozilla-central@7083c0d30e75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersanba
bugs1324536
milestone53.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 1324536 - Only add/remove files in intl/{icu,tzdata}/{source,SVN-INFO} so that random other detritus in intl/{icu,tzdata} doesn't get included. r=anba
intl/update-icu.sh
intl/update-tzdata.sh
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -70,12 +70,12 @@ done
 
 topsrcdir=`dirname $0`/../
 python ${topsrcdir}/js/src/tests/ecma_6/String/make-normalize-generateddata-input.py $topsrcdir
 
 # 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
+hg addremove "${icu_dir}/source" "${icu_dir}/SVN-INFO" ${topsrcdir}/config/external/icu
 
 # Check local tzdata version.
 `dirname $0`/update-tzdata.sh -c
--- a/intl/update-tzdata.sh
+++ b/intl/update-tzdata.sh
@@ -157,16 +157,16 @@ update_icu_data() {
 }
 
 if [ $dry = false ]; then
   update_icu_data "le" "${icudata_file_le}"
   if [ -n "${icudata_file_be}" ]; then
     update_icu_data "be" "${icudata_file_be}"
   fi
 
-  hg addremove "${tzdata_dir}" "${icudata_file_le}"
+  hg addremove "${tzdata_dir}/source" "${tzdata_dir}/SVN-INFO" "${icudata_file_le}"
   if [ -n "${icudata_file_be}" ]; then
     hg addremove "${icudata_file_be}"
   fi
 
   echo "INFO: Successfully updated tzdata!"
   echo "INFO: Please run js/src/builtin/make_intl_data.py to update additional time zone files for SpiderMonkey."
 fi