diff options
Diffstat (limited to 'tzdata/tools')
| -rwxr-xr-x | tzdata/tools/createIcuUpdateResources.sh | 89 | ||||
| -rwxr-xr-x | tzdata/tools/createTzDataBundle.sh | 25 | ||||
| -rw-r--r-- | tzdata/tools/src/main/libcore/tzdata/update/tools/CreateTzDataBundle.java | 127 | ||||
| -rw-r--r-- | tzdata/tools/src/main/libcore/tzdata/update/tools/TzDataBundleBuilder.java | 134 | ||||
| -rw-r--r-- | tzdata/tools/tzupdate.properties | 14 |
5 files changed, 389 insertions, 0 deletions
diff --git a/tzdata/tools/createIcuUpdateResources.sh b/tzdata/tools/createIcuUpdateResources.sh new file mode 100755 index 0000000..2db7132 --- /dev/null +++ b/tzdata/tools/createIcuUpdateResources.sh @@ -0,0 +1,89 @@ +#!/bin/bash +# +# A script that generates an ICU data file containing just timezone rules data. +# The file can be used to provide time zone rules updates for compatible +# devices. Note: Only the rules are contained and new timezones will not have +# the translations. +# +# Usage: +# ./createIcuUpdateResources.sh <tzdata tar.gz file> <ICU version> +# +# e.g. +# ./createIcuUpdateResources.sh ~/Downloads/tzdata2015b.tar.gz 55 +# +# After execution the file is generated. + +if (( $# != 2 )); then + echo "Missing arguments" + echo "Usage:" + echo "./createIcuUpdateResources.sh <tzdata tar.gz file> <ICU version>" + exit 1 +fi + +if [[ -z "${ANDROID_BUILD_TOP}" ]]; then + echo "Configure your environment with build/envsetup.sh and lunch" + exit 1 +fi + +TZ_DATA_FILE=$1 +ICU_VERSION=$2 + +if [[ ! -f ${TZ_DATA_FILE} ]]; then + echo "${TZ_DATA_FILE} not found" + exit 1 +fi + +# Keep track of the original working dir. Must be the "tools" dir. +START_DIR=`pwd` +ICU_DIR=${ANDROID_BUILD_TOP}/external/icu/icu4c/source +BUILD_DIR=${START_DIR}/icu_build + +# Fail if anything below fails +set -e + +rm -rf ${BUILD_DIR} +mkdir -p ${BUILD_DIR} +cd ${BUILD_DIR} + +# Configure the build +${ICU_DIR}/runConfigureICU Linux +mkdir -p ${BUILD_DIR}/bin +cd ${BUILD_DIR}/tools/tzcode +ln -s ${ICU_DIR}/tools/tzcode/icuregions ./icuregions +ln -s ${ICU_DIR}/tools/tzcode/icuzones ./icuzones +cp ${TZ_DATA_FILE} . + +# Make the tools +make + +# Then make the whole thing +cd ${BUILD_DIR} +make -j32 + +# Generate the tzdata.lst file used to configure which files are included. +ICU_LIB_DIR=${BUILD_DIR}/lib +BIN_DIR=${BUILD_DIR}/bin +TZ_FILES=tzdata.lst + +echo metaZones.res > ${TZ_FILES} +echo timezoneTypes.res >> ${TZ_FILES} +echo windowsZones.res >> ${TZ_FILES} +echo zoneinfo64.res >> ${TZ_FILES} + +# Copy all the .res files we need here a from, e.g. ./data/out/build/icudt55l +RES_DIR=data/out/build/icudt${ICU_VERSION}l +cp ${RES_DIR}/metaZones.res ${BUILD_DIR} +cp ${RES_DIR}/timezoneTypes.res ${BUILD_DIR} +cp ${RES_DIR}/windowsZones.res ${BUILD_DIR} +cp ${RES_DIR}/zoneinfo64.res ${BUILD_DIR} + +# This is the package name required for the .dat file to be accepted by ICU. +# This also affects the generated file name. +ICU_PACKAGE=icudt${ICU_VERSION}l + +# Create the file +LD_LIBRARY_PATH=${ICU_LIB_DIR} ${BIN_DIR}/pkgdata -F -m common -v -T . -d . -p ${ICU_PACKAGE} ${TZ_FILES} +cp ${ICU_PACKAGE}.dat ${START_DIR}/icu_tzdata.dat + +# Copy the file to the original working dir. +echo File can be found here: ${START_DIR}/icu_tzdata.dat diff --git a/tzdata/tools/createTzDataBundle.sh b/tzdata/tools/createTzDataBundle.sh new file mode 100755 index 0000000..05646fc --- /dev/null +++ b/tzdata/tools/createTzDataBundle.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +# A script to generate TZ data updates. +# +# Usage: ./createTzDataBundle.sh <tzupdate.properties file> <output file> +# See libcore.tzdata.update.tools.CreateTzDataBundle for more information. + +TOOLS_DIR=src/main/libcore/tzdata/update/tools +UPDATE_DIR=../update/src/main/libcore/tzdata/update +GEN_DIR=./gen + +# Fail if anything below fails +set -e + +rm -rf ${GEN_DIR} +mkdir -p ${GEN_DIR} + +javac \ + ${TOOLS_DIR}/CreateTzDataBundle.java \ + ${TOOLS_DIR}/TzDataBundleBuilder.java \ + ${UPDATE_DIR}/ConfigBundle.java \ + ${UPDATE_DIR}/FileUtils.java \ + -d ${GEN_DIR} + +java -cp ${GEN_DIR} libcore.tzdata.update.tools.CreateTzDataBundle $@ diff --git a/tzdata/tools/src/main/libcore/tzdata/update/tools/CreateTzDataBundle.java b/tzdata/tools/src/main/libcore/tzdata/update/tools/CreateTzDataBundle.java new file mode 100644 index 0000000..cdb004a --- /dev/null +++ b/tzdata/tools/src/main/libcore/tzdata/update/tools/CreateTzDataBundle.java @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package libcore.tzdata.update.tools; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.Reader; +import java.util.Properties; +import libcore.tzdata.update.ConfigBundle; +import libcore.tzdata.update.FileUtils; + +/** + * A command-line tool for creating a TZ data update bundle. + * + * Args: + * tzdata.properties file - the file describing the bundle (see template file in tzdata/tools) + * output file - the name of the file to be generated + */ +public class CreateTzDataBundle { + + private CreateTzDataBundle() {} + + public static void main(String[] args) throws Exception { + if (args.length != 2) { + printUsage(); + System.exit(1); + } + File f = new File(args[0]); + if (!f.exists()) { + System.err.println("Properties file " + f + " not found"); + printUsage(); + System.exit(2); + } + Properties p = loadProperties(f); + TzDataBundleBuilder builder = new TzDataBundleBuilder() + .setTzDataVersion(getMandatoryProperty(p, "tzdata.version")) + .addBionicTzData(getMandatoryPropertyFile(p, "bionic.file")) + .addIcuTzData(getMandatoryPropertyFile(p, "icu.file")); + + int i = 1; + while (true) { + String localFileNameProperty = "checksum.file.local." + i; + String localFileName = p.getProperty(localFileNameProperty); + String onDeviceFileNameProperty = "checksum.file.ondevice." + i; + String onDeviceFileName = p.getProperty(onDeviceFileNameProperty); + boolean foundLocalFileNameProperty = localFileName != null; + boolean foundOnDeviceFileNameProperty = onDeviceFileName != null; + if (!foundLocalFileNameProperty && !foundOnDeviceFileNameProperty) { + break; + } else if (foundLocalFileNameProperty != foundOnDeviceFileNameProperty) { + System.out.println("Properties file must specify both, or neither of: " + + localFileNameProperty + " and " + onDeviceFileNameProperty); + System.exit(5); + } + + long checksum = FileUtils.calculateChecksum(new File(localFileName)); + builder.addChecksum(onDeviceFileName, checksum); + i++; + } + if (i == 1) { + // For safety we enforce >= 1 checksum entry. The installer does not require it. + System.out.println("There must be at least one checksum file"); + System.exit(6); + } + System.out.println("Update contains checksums for " + (i-1) + " files"); + + ConfigBundle bundle = builder.build(); + File outputFile = new File(args[1]); + try (OutputStream os = new FileOutputStream(outputFile)) { + os.write(bundle.getBundleBytes()); + } + System.out.println("Wrote: " + outputFile); + } + + private static File getMandatoryPropertyFile(Properties p, String propertyName) { + String fileName = getMandatoryProperty(p, propertyName); + File file = new File(fileName); + if (!file.exists()) { + System.out.println( + "Missing file: " + file + " for property " + propertyName + " does not exist."); + printUsage(); + System.exit(4); + } + return file; + } + + private static String getMandatoryProperty(Properties p, String propertyName) { + String value = p.getProperty(propertyName); + if (value == null) { + System.out.println("Missing property: " + propertyName); + printUsage(); + System.exit(3); + } + return value; + } + + private static Properties loadProperties(File f) throws IOException { + Properties p = new Properties(); + try (Reader reader = new InputStreamReader(new FileInputStream(f))) { + p.load(reader); + } + return p; + } + + private static void printUsage() { + System.out.println("Usage:"); + System.out.println("\t" + CreateTzDataBundle.class.getName() + + " <tzupdate.properties file> <output file>"); + } +} diff --git a/tzdata/tools/src/main/libcore/tzdata/update/tools/TzDataBundleBuilder.java b/tzdata/tools/src/main/libcore/tzdata/update/tools/TzDataBundleBuilder.java new file mode 100644 index 0000000..3550c6f --- /dev/null +++ b/tzdata/tools/src/main/libcore/tzdata/update/tools/TzDataBundleBuilder.java @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package libcore.tzdata.update.tools; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; +import libcore.tzdata.update.ConfigBundle; + +/** + * A class for creating a {@link ConfigBundle} containing timezone update data. + */ +public final class TzDataBundleBuilder { + + private String tzDataVersion; + private StringBuilder checksumsFileContent = new StringBuilder(); + private File zoneInfoFile; + private File icuTzDataFile; + + public TzDataBundleBuilder setTzDataVersion(String tzDataVersion) { + this.tzDataVersion = tzDataVersion; + return this; + } + + public TzDataBundleBuilder addChecksum(String fileName, long checksum) { + checksumsFileContent.append(Long.toString(checksum)) + .append(',') + .append(fileName) + .append('\n'); + return this; + } + + public TzDataBundleBuilder addBionicTzData(File zoneInfoFile) { + this.zoneInfoFile = zoneInfoFile; + return this; + } + + public TzDataBundleBuilder addIcuTzData(File icuTzDataFile) { + this.icuTzDataFile = icuTzDataFile; + return this; + } + + /** + * Builds a {@link libcore.tzdata.update.ConfigBundle}. + */ + public ConfigBundle build() throws IOException { + if (tzDataVersion == null) { + throw new IllegalStateException("Missing tzDataVersion"); + } + if (zoneInfoFile == null) { + throw new IllegalStateException("Missing zoneInfo file"); + } + + return buildUnvalidated(); + } + + // For use in tests. + public TzDataBundleBuilder clearChecksumEntries() { + checksumsFileContent.setLength(0); + return this; + } + + // For use in tests. + public TzDataBundleBuilder clearBionicTzData() { + this.zoneInfoFile = null; + return this; + } + + /** + * For use in tests. Use {@link #build()}. + */ + public ConfigBundle buildUnvalidated() throws IOException { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + try (ZipOutputStream zos = new ZipOutputStream(baos)) { + addZipEntry(zos, ConfigBundle.CHECKSUMS_FILE_NAME, + checksumsFileContent.toString().getBytes(StandardCharsets.UTF_8)); + if (tzDataVersion != null) { + addZipEntry(zos, ConfigBundle.TZ_DATA_VERSION_FILE_NAME, + tzDataVersion.getBytes(StandardCharsets.UTF_8)); + } + if (zoneInfoFile != null) { + addZipEntry(zos, ConfigBundle.ZONEINFO_FILE_NAME, + readFileAsByteArray(zoneInfoFile)); + } + if (icuTzDataFile != null) { + addZipEntry(zos, ConfigBundle.ICU_DATA_FILE_NAME, + readFileAsByteArray(icuTzDataFile)); + } + } + return new ConfigBundle(baos.toByteArray()); + } + + private static void addZipEntry(ZipOutputStream zos, String name, byte[] content) + throws IOException { + ZipEntry zipEntry = new ZipEntry(name); + zipEntry.setSize(content.length); + zos.putNextEntry(zipEntry); + zos.write(content); + zos.closeEntry(); + } + + /** + * Returns the contents of 'path' as a byte array. + */ + public static byte[] readFileAsByteArray(File file) throws IOException { + byte[] buffer = new byte[8192]; + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + try (FileInputStream fis = new FileInputStream(file)) { + int count; + while ((count = fis.read(buffer)) != -1) { + baos.write(buffer, 0, count); + } + } + return baos.toByteArray(); + } +} + diff --git a/tzdata/tools/tzupdate.properties b/tzdata/tools/tzupdate.properties new file mode 100644 index 0000000..e3fe002 --- /dev/null +++ b/tzdata/tools/tzupdate.properties @@ -0,0 +1,14 @@ +# Edit these to reflect the update files. + +# This should be the tzdata version. e.g. "2015a". Lexicographical sort order +# may become important in future so if inventing interim releases only add +# characters to the end. +tzdata.version= +bionic.file= +icu.file= + +# Edit these as required to point to the file expected to exist on the device. +checksum.file.local.1=../../../bionic/libc/zoneinfo/tzdata +checksum.file.ondevice.1=/system/usr/share/zoneinfo/tzdata +checksum.file.local.2=../../../external/icu/icu4c/source/stubdata/icudt55l.dat +checksum.file.ondevice.2=/system/usr/icu/icudt55l.dat |