From ca6acfdd6b3400ad6e29d45c29b0ec40ea92a968 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Tue, 13 Aug 2013 12:34:01 +0900 Subject: [PATCH] Rename maketext tool to make-keyboard-text Change-Id: Icceda22aec75f9e3602da8775c0e94b110283575 --- .../keyboard/internal/KeyboardTextsSet.java | 10 +++++----- tools/{maketext => make-keyboard-text}/Android.mk | 2 +- tools/{maketext => make-keyboard-text}/etc/Android.mk | 2 +- .../etc/make-keyboard-text} | 2 +- tools/make-keyboard-text/etc/manifest.txt | 1 + .../keyboard/internal/KeyboardTextsSet.tmpl | 10 +++++----- .../res/values-af/donottranslate-more-keys.xml | 0 .../res/values-ar/donottranslate-more-keys.xml | 0 .../res/values-az/donottranslate-more-keys.xml | 0 .../res/values-be/donottranslate-more-keys.xml | 0 .../res/values-bg/donottranslate-more-keys.xml | 0 .../res/values-ca/donottranslate-more-keys.xml | 0 .../res/values-cs/donottranslate-more-keys.xml | 0 .../res/values-da/donottranslate-more-keys.xml | 0 .../res/values-de/donottranslate-more-keys.xml | 0 .../res/values-el/donottranslate-more-keys.xml | 0 .../res/values-en/donottranslate-more-keys.xml | 0 .../res/values-eo/donottranslate-more-keys.xml | 0 .../res/values-es/donottranslate-more-keys.xml | 0 .../res/values-et/donottranslate-more-keys.xml | 0 .../res/values-fa/donottranslate-more-keys.xml | 0 .../res/values-fi/donottranslate-more-keys.xml | 0 .../res/values-fr/donottranslate-more-keys.xml | 0 .../res/values-hi/donottranslate-more-keys.xml | 0 .../res/values-hr/donottranslate-more-keys.xml | 0 .../res/values-hu/donottranslate-more-keys.xml | 0 .../res/values-is/donottranslate-more-keys.xml | 0 .../res/values-it/donottranslate-more-keys.xml | 0 .../res/values-iw/donottranslate-more-keys.xml | 0 .../res/values-ka/donottranslate-more-keys.xml | 0 .../res/values-kk/donottranslate-more-keys.xml | 0 .../res/values-ky/donottranslate-more-keys.xml | 0 .../res/values-lt/donottranslate-more-keys.xml | 0 .../res/values-lv/donottranslate-more-keys.xml | 0 .../res/values-mk/donottranslate-more-keys.xml | 0 .../res/values-mn/donottranslate-more-keys.xml | 0 .../res/values-nb/donottranslate-more-keys.xml | 0 .../res/values-nl/donottranslate-more-keys.xml | 0 .../res/values-pl/donottranslate-more-keys.xml | 0 .../res/values-pt/donottranslate-more-keys.xml | 0 .../res/values-rm/donottranslate-more-keys.xml | 0 .../res/values-ro/donottranslate-more-keys.xml | 0 .../res/values-ru/donottranslate-more-keys.xml | 0 .../res/values-sk/donottranslate-more-keys.xml | 0 .../res/values-sl/donottranslate-more-keys.xml | 0 .../res/values-sr/donottranslate-more-keys.xml | 0 .../res/values-sv/donottranslate-more-keys.xml | 0 .../res/values-sw/donottranslate-more-keys.xml | 0 .../res/values-th/donottranslate-more-keys.xml | 0 .../res/values-tl/donottranslate-more-keys.xml | 0 .../res/values-tr/donottranslate-more-keys.xml | 0 .../res/values-uk/donottranslate-more-keys.xml | 0 .../res/values-vi/donottranslate-more-keys.xml | 0 .../res/values-zu/donottranslate-more-keys.xml | 0 .../res/values-zz/donottranslate-more-keys.xml | 0 .../res/values/donottranslate-more-keys.xml | 0 .../keyboard/tools}/ArrayInitializerFormatter.java | 2 +- .../android/inputmethod/keyboard/tools}/JarUtils.java | 2 +- .../inputmethod/keyboard/tools/MakeKeyboardText.java} | 8 ++++---- .../inputmethod/keyboard/tools}/MoreKeysResources.java | 2 +- .../inputmethod/keyboard/tools}/StringResource.java | 2 +- .../inputmethod/keyboard/tools}/StringResourceMap.java | 2 +- tools/maketext/etc/manifest.txt | 1 - 63 files changed, 23 insertions(+), 23 deletions(-) rename tools/{maketext => make-keyboard-text}/Android.mk (96%) rename tools/{maketext => make-keyboard-text}/etc/Android.mk (93%) rename tools/{maketext/etc/maketext => make-keyboard-text/etc/make-keyboard-text} (98%) create mode 100644 tools/make-keyboard-text/etc/manifest.txt rename tools/{maketext => make-keyboard-text}/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl (91%) rename tools/{maketext => make-keyboard-text}/res/values-af/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-ar/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-az/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-be/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-bg/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-ca/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-cs/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-da/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-de/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-el/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-en/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-eo/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-es/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-et/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-fa/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-fi/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-fr/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-hi/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-hr/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-hu/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-is/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-it/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-iw/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-ka/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-kk/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-ky/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-lt/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-lv/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-mk/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-mn/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-nb/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-nl/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-pl/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-pt/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-rm/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-ro/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-ru/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-sk/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-sl/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-sr/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-sv/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-sw/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-th/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-tl/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-tr/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-uk/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-vi/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-zu/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values-zz/donottranslate-more-keys.xml (100%) rename tools/{maketext => make-keyboard-text}/res/values/donottranslate-more-keys.xml (100%) rename tools/{maketext/src/com/android/inputmethod/latin/maketext => make-keyboard-text/src/com/android/inputmethod/keyboard/tools}/ArrayInitializerFormatter.java (98%) rename tools/{maketext/src/com/android/inputmethod/latin/maketext => make-keyboard-text/src/com/android/inputmethod/keyboard/tools}/JarUtils.java (98%) rename tools/{maketext/src/com/android/inputmethod/latin/maketext/LabelText.java => make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MakeKeyboardText.java} (88%) rename tools/{maketext/src/com/android/inputmethod/latin/maketext => make-keyboard-text/src/com/android/inputmethod/keyboard/tools}/MoreKeysResources.java (99%) rename tools/{maketext/src/com/android/inputmethod/latin/maketext => make-keyboard-text/src/com/android/inputmethod/keyboard/tools}/StringResource.java (95%) rename tools/{maketext/src/com/android/inputmethod/latin/maketext => make-keyboard-text/src/com/android/inputmethod/keyboard/tools}/StringResourceMap.java (99%) delete mode 100644 tools/maketext/etc/manifest.txt diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java index 99c44f42a..bb49f4758 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java @@ -27,18 +27,18 @@ import java.util.HashMap; /** * !!!!! DO NOT EDIT THIS FILE !!!!! * - * This file is generated by tools/maketext. The base template file is - * tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl + * This file is generated by tools/make-keyboard-text. The base template file is + * tools/make-keyboard-text/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl * * This file must be updated when any text resources in keyboard layout files have been changed. * These text resources are referred as "!text/" in keyboard XML definitions, * and should be defined in - * tools/maketext/res/values-/donottranslate-more-keys.xml + * tools/make-keyboard-text/res/values-/donottranslate-more-keys.xml * * To update this file, please run the following commands. * $ cd $ANDROID_BUILD_TOP - * $ mmm packages/inputmethods/LatinIME/tools/maketext - * $ maketext -java packages/inputmethods/LatinIME/java/src + * $ mmm packages/inputmethods/LatinIME/tools/make-keyboard-text + * $ make-keyboard-text -java packages/inputmethods/LatinIME/java/src * * The updated source file will be generated to the following path (this file). * packages/inputmethods/LatinIME/java/src/com/android/inputmethod/keyboard/internal/ diff --git a/tools/maketext/Android.mk b/tools/make-keyboard-text/Android.mk similarity index 96% rename from tools/maketext/Android.mk rename to tools/make-keyboard-text/Android.mk index 77914cae6..87601489e 100644 --- a/tools/maketext/Android.mk +++ b/tools/make-keyboard-text/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES += $(call all-java-files-under,src) LOCAL_JAR_MANIFEST := etc/manifest.txt LOCAL_JAVA_RESOURCE_DIRS := res -LOCAL_MODULE := maketext +LOCAL_MODULE := make-keyboard-text include $(BUILD_HOST_JAVA_LIBRARY) include $(LOCAL_PATH)/etc/Android.mk diff --git a/tools/maketext/etc/Android.mk b/tools/make-keyboard-text/etc/Android.mk similarity index 93% rename from tools/maketext/etc/Android.mk rename to tools/make-keyboard-text/etc/Android.mk index 475676b3a..0fbf4ffe9 100644 --- a/tools/maketext/etc/Android.mk +++ b/tools/make-keyboard-text/etc/Android.mk @@ -15,6 +15,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_PREBUILT_EXECUTABLES := maketext +LOCAL_PREBUILT_EXECUTABLES := make-keyboard-text include $(BUILD_HOST_PREBUILT) diff --git a/tools/maketext/etc/maketext b/tools/make-keyboard-text/etc/make-keyboard-text similarity index 98% rename from tools/maketext/etc/maketext rename to tools/make-keyboard-text/etc/make-keyboard-text index 0edd36020..156f9ec5f 100755 --- a/tools/maketext/etc/maketext +++ b/tools/make-keyboard-text/etc/make-keyboard-text @@ -33,7 +33,7 @@ progdir=`pwd` prog="${progdir}"/`basename "${prog}"` cd "${oldwd}" -jarfile=maketext.jar +jarfile=make-keyboard-text.jar frameworkdir="$progdir" if [ ! -r "$frameworkdir/$jarfile" ] then diff --git a/tools/make-keyboard-text/etc/manifest.txt b/tools/make-keyboard-text/etc/manifest.txt new file mode 100644 index 000000000..8ad4db059 --- /dev/null +++ b/tools/make-keyboard-text/etc/manifest.txt @@ -0,0 +1 @@ +Main-Class: com.android.inputmethod.keyboard.tools.MakeKeyboardText diff --git a/tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl b/tools/make-keyboard-text/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl similarity index 91% rename from tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl rename to tools/make-keyboard-text/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl index 479a766fb..4cd9c236b 100644 --- a/tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl +++ b/tools/make-keyboard-text/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl @@ -27,18 +27,18 @@ import java.util.HashMap; /** * !!!!! DO NOT EDIT THIS FILE !!!!! * - * This file is generated by tools/maketext. The base template file is - * tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl + * This file is generated by tools/make-keyboard-text. The base template file is + * tools/make-keyboard-text/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl * * This file must be updated when any text resources in keyboard layout files have been changed. * These text resources are referred as "!text/" in keyboard XML definitions, * and should be defined in - * tools/maketext/res/values-/donottranslate-more-keys.xml + * tools/make-keyboard-text/res/values-/donottranslate-more-keys.xml * * To update this file, please run the following commands. * $ cd $ANDROID_BUILD_TOP - * $ mmm packages/inputmethods/LatinIME/tools/maketext - * $ maketext -java packages/inputmethods/LatinIME/java/src + * $ mmm packages/inputmethods/LatinIME/tools/make-keyboard-text + * $ make-keyboard-text -java packages/inputmethods/LatinIME/java/src * * The updated source file will be generated to the following path (this file). * packages/inputmethods/LatinIME/java/src/com/android/inputmethod/keyboard/internal/ diff --git a/tools/maketext/res/values-af/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-af/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-af/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-af/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-ar/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-ar/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-az/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-az/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-az/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-az/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-be/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-be/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-be/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-be/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-bg/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-bg/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-bg/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-bg/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-ca/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ca/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-ca/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-ca/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-cs/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-cs/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-cs/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-cs/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-da/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-da/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-da/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-da/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-de/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-de/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-de/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-de/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-el/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-el/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-el/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-el/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-en/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-en/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-en/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-en/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-eo/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-eo/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-eo/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-eo/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-es/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-es/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-es/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-es/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-et/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-et/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-et/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-et/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-fa/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-fa/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-fi/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-fi/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-fi/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-fi/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-fr/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-fr/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-fr/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-fr/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-hi/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-hi/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-hi/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-hi/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-hr/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-hr/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-hr/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-hr/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-hu/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-hu/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-hu/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-hu/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-is/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-is/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-is/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-is/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-it/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-it/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-it/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-it/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-iw/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-iw/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-ka/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ka/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-ka/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-ka/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-kk/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-kk/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-kk/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-kk/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-ky/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ky/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-ky/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-ky/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-lt/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-lt/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-lt/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-lt/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-lv/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-lv/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-lv/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-lv/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-mk/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-mk/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-mk/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-mk/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-mn/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-mn/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-mn/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-mn/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-nb/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-nb/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-nb/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-nb/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-nl/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-nl/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-nl/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-nl/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-pl/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-pl/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-pl/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-pl/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-pt/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-pt/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-pt/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-pt/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-rm/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-rm/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-rm/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-rm/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-ro/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ro/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-ro/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-ro/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-ru/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ru/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-ru/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-ru/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-sk/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-sk/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-sk/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-sk/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-sl/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-sl/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-sl/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-sl/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-sr/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-sr/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-sr/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-sr/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-sv/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-sv/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-sv/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-sv/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-sw/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-sw/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-sw/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-sw/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-th/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-th/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-th/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-th/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-tl/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-tl/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-tl/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-tl/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-tr/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-tr/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-tr/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-tr/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-uk/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-uk/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-uk/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-uk/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-vi/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-vi/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-vi/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-vi/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-zu/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-zu/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-zu/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-zu/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values-zz/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-zz/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values-zz/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values-zz/donottranslate-more-keys.xml diff --git a/tools/maketext/res/values/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml similarity index 100% rename from tools/maketext/res/values/donottranslate-more-keys.xml rename to tools/make-keyboard-text/res/values/donottranslate-more-keys.xml diff --git a/tools/maketext/src/com/android/inputmethod/latin/maketext/ArrayInitializerFormatter.java b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/ArrayInitializerFormatter.java similarity index 98% rename from tools/maketext/src/com/android/inputmethod/latin/maketext/ArrayInitializerFormatter.java rename to tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/ArrayInitializerFormatter.java index 3365c7273..331003e67 100644 --- a/tools/maketext/src/com/android/inputmethod/latin/maketext/ArrayInitializerFormatter.java +++ b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/ArrayInitializerFormatter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.inputmethod.latin.maketext; +package com.android.inputmethod.keyboard.tools; import java.io.PrintStream; diff --git a/tools/maketext/src/com/android/inputmethod/latin/maketext/JarUtils.java b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/JarUtils.java similarity index 98% rename from tools/maketext/src/com/android/inputmethod/latin/maketext/JarUtils.java rename to tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/JarUtils.java index 6d6bc0ea6..a74096e79 100644 --- a/tools/maketext/src/com/android/inputmethod/latin/maketext/JarUtils.java +++ b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/JarUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.inputmethod.latin.maketext; +package com.android.inputmethod.keyboard.tools; import java.io.IOException; import java.io.InputStream; diff --git a/tools/maketext/src/com/android/inputmethod/latin/maketext/LabelText.java b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MakeKeyboardText.java similarity index 88% rename from tools/maketext/src/com/android/inputmethod/latin/maketext/LabelText.java rename to tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MakeKeyboardText.java index 4a9236962..36a03f8dc 100644 --- a/tools/maketext/src/com/android/inputmethod/latin/maketext/LabelText.java +++ b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MakeKeyboardText.java @@ -14,14 +14,14 @@ * the License. */ -package com.android.inputmethod.latin.maketext; +package com.android.inputmethod.keyboard.tools; import java.util.Arrays; import java.util.LinkedList; import java.util.NoSuchElementException; import java.util.jar.JarFile; -public class LabelText { +public class MakeKeyboardText { static class Options { private static final String OPTION_JAVA = "-java"; @@ -31,7 +31,7 @@ public class LabelText { if (message != null) { System.err.println(message); } - System.err.println("usage: makelabel " + OPTION_JAVA + " "); + System.err.println("usage: make-keyboard-text " + OPTION_JAVA + " "); System.exit(1); } @@ -58,7 +58,7 @@ public class LabelText { public static void main(final String[] args) { final Options options = new Options(args); - final JarFile jar = JarUtils.getJarFile(LabelText.class); + final JarFile jar = JarUtils.getJarFile(MakeKeyboardText.class); final MoreKeysResources resources = new MoreKeysResources(jar); resources.writeToJava(options.mJava); } diff --git a/tools/maketext/src/com/android/inputmethod/latin/maketext/MoreKeysResources.java b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MoreKeysResources.java similarity index 99% rename from tools/maketext/src/com/android/inputmethod/latin/maketext/MoreKeysResources.java rename to tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MoreKeysResources.java index fd427020e..2643e01ec 100644 --- a/tools/maketext/src/com/android/inputmethod/latin/maketext/MoreKeysResources.java +++ b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MoreKeysResources.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.inputmethod.latin.maketext; +package com.android.inputmethod.keyboard.tools; import java.io.Closeable; import java.io.File; diff --git a/tools/maketext/src/com/android/inputmethod/latin/maketext/StringResource.java b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/StringResource.java similarity index 95% rename from tools/maketext/src/com/android/inputmethod/latin/maketext/StringResource.java rename to tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/StringResource.java index 568a896a9..a49b8fe70 100644 --- a/tools/maketext/src/com/android/inputmethod/latin/maketext/StringResource.java +++ b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/StringResource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.inputmethod.latin.maketext; +package com.android.inputmethod.keyboard.tools; public class StringResource { public final String mName; diff --git a/tools/maketext/src/com/android/inputmethod/latin/maketext/StringResourceMap.java b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/StringResourceMap.java similarity index 99% rename from tools/maketext/src/com/android/inputmethod/latin/maketext/StringResourceMap.java rename to tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/StringResourceMap.java index ff133425c..cc7ff6a9c 100644 --- a/tools/maketext/src/com/android/inputmethod/latin/maketext/StringResourceMap.java +++ b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/StringResourceMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.inputmethod.latin.maketext; +package com.android.inputmethod.keyboard.tools; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/tools/maketext/etc/manifest.txt b/tools/maketext/etc/manifest.txt deleted file mode 100644 index bfd1a52be..000000000 --- a/tools/maketext/etc/manifest.txt +++ /dev/null @@ -1 +0,0 @@ -Main-Class: com.android.inputmethod.latin.maketext.LabelText