diff options
| author | Elliott Hughes <enh@google.com> | 2014-09-30 17:30:01 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-09-30 17:30:01 -0700 |
| commit | f8896c6c93fd698b129742780878123a3a19ae07 (patch) | |
| tree | 28307adee41f6a6fa33abc8771233e39ca94ae6b /libc/tools | |
| parent | 252c1ac9738ff6187354f243ef118eac962b65dc (diff) | |
| download | bionic-f8896c6c93fd698b129742780878123a3a19ae07.zip bionic-f8896c6c93fd698b129742780878123a3a19ae07.tar.gz bionic-f8896c6c93fd698b129742780878123a3a19ae07.tar.bz2 | |
Fix update-tzdata.py to rebuild icu4c .dat file.
Bug: 17731498
Change-Id: I4c810507c0ca9883dde1bece14530db80485b8f6
Diffstat (limited to 'libc/tools')
| -rwxr-xr-x | libc/tools/zoneinfo/update-tzdata.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libc/tools/zoneinfo/update-tzdata.py b/libc/tools/zoneinfo/update-tzdata.py index e800e8f..f5681be 100755 --- a/libc/tools/zoneinfo/update-tzdata.py +++ b/libc/tools/zoneinfo/update-tzdata.py @@ -123,18 +123,21 @@ def BuildIcuToolsAndData(data_filename): print 'Making ICU data...' subprocess.check_call(['make']) - # Copy the output files to their ultimate destination. + # Copy the source file to its ultimate destination. icu_txt_data_dir = '%s/data/misc' % icu_dir print 'Copying zoneinfo64.txt to %s ...' % icu_txt_data_dir shutil.copy('zoneinfo64.txt', icu_txt_data_dir) + # Regenerate the .dat file. os.chdir(icu_working_dir) + subprocess.check_call(['make', '-j32']) + + # Copy the .dat file to its ultimate destination. icu_dat_data_dir = '%s/stubdata' % icu_dir datfiles = glob.glob('data/out/tmp/icudt??l.dat') if len(datfiles) != 1: print 'ERROR: Unexpectedly found %d .dat files (%s). Halting.' % (len(datfiles), datfiles) sys.exit(1) - datfile = datfiles[0] print 'Copying %s to %s ...' % (datfile, icu_dat_data_dir) shutil.copy(datfile, icu_dat_data_dir) |