From 04cccea2951ce052c568f242729cb7f527e38098 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 3 Aug 2012 20:53:28 +0900 Subject: [PATCH] Move makedict to live under dicttool (A5) This removes the makedict directory and makes a new target to replace it. The old command is still working the same way it used to. Change-Id: Ie73b12a7ef101dd2b282e0cb4206ac263af1093e --- tools/dicttool/etc/Android.mk | 2 +- .../etc/Android.mk => dicttool/etc/makedict} | 13 ++-- tools/makedict/Android.mk | 29 --------- tools/makedict/etc/makedict | 63 ------------------- tools/makedict/etc/manifest.txt | 1 - 5 files changed, 7 insertions(+), 101 deletions(-) rename tools/{makedict/etc/Android.mk => dicttool/etc/makedict} (64%) mode change 100644 => 100755 delete mode 100644 tools/makedict/Android.mk delete mode 100755 tools/makedict/etc/makedict delete mode 100644 tools/makedict/etc/manifest.txt diff --git a/tools/dicttool/etc/Android.mk b/tools/dicttool/etc/Android.mk index 03d4a96ee..1eab70fc1 100644 --- a/tools/dicttool/etc/Android.mk +++ b/tools/dicttool/etc/Android.mk @@ -16,5 +16,5 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := eng -LOCAL_PREBUILT_EXECUTABLES := dicttool +LOCAL_PREBUILT_EXECUTABLES := dicttool makedict include $(BUILD_HOST_PREBUILT) diff --git a/tools/makedict/etc/Android.mk b/tools/dicttool/etc/makedict old mode 100644 new mode 100755 similarity index 64% rename from tools/makedict/etc/Android.mk rename to tools/dicttool/etc/makedict index 1b7d7cf0e..fffeb2376 --- a/tools/makedict/etc/Android.mk +++ b/tools/dicttool/etc/makedict @@ -1,10 +1,11 @@ -# Copyright (C) 2011 The Android Open Source Project +#!/bin/sh +# Copyright (C) 2012, 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 +# 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, @@ -12,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_PREBUILT_EXECUTABLES := makedict -include $(BUILD_HOST_PREBUILT) +# Dicttool supports making the dictionary using the 'makedict' command and +# the same arguments that the old 'makedict' command used to accept. +dicttool makedict $@ diff --git a/tools/makedict/Android.mk b/tools/makedict/Android.mk deleted file mode 100644 index cac3a831c..000000000 --- a/tools/makedict/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright (C) 2011 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. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -MAKEDICT_CORE_SOURCE_DIRECTORY := ../../java/src/com/android/inputmethod/latin/makedict - -LOCAL_MAIN_SRC_FILES := $(call all-java-files-under,$(MAKEDICT_CORE_SOURCE_DIRECTORY)) -LOCAL_TOOL_SRC_FILES := $(call all-java-files-under,src) -LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) -LOCAL_JAR_MANIFEST := etc/manifest.txt -LOCAL_MODULE := makedict -LOCAL_JAVA_LIBRARIES := junit - -include $(BUILD_HOST_JAVA_LIBRARY) -include $(LOCAL_PATH)/etc/Android.mk diff --git a/tools/makedict/etc/makedict b/tools/makedict/etc/makedict deleted file mode 100755 index 7c1c02e85..000000000 --- a/tools/makedict/etc/makedict +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -# Copyright 2011, 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. - -# Set up prog to be the path of this script, including following symlinks, -# and set up progdir to be the fully-qualified pathname of its directory. -prog="$0" -while [ -h "${prog}" ]; do - newProg=`/bin/ls -ld "${prog}"` - newProg=`expr "${newProg}" : ".* -> \(.*\)$"` - if expr "x${newProg}" : 'x/' >/dev/null; then - prog="${newProg}" - else - progdir=`dirname "${prog}"` - prog="${progdir}/${newProg}" - fi -done -oldwd=`pwd` -progdir=`dirname "${prog}"` -cd "${progdir}" -progdir=`pwd` -prog="${progdir}"/`basename "${prog}"` -cd "${oldwd}" - -jarfile=makedict.jar -frameworkdir="$progdir" -if [ ! -r "$frameworkdir/$jarfile" ] -then - frameworkdir=`dirname "$progdir"`/tools/lib - libdir=`dirname "$progdir"`/tools/lib -fi -if [ ! -r "$frameworkdir/$jarfile" ] -then - frameworkdir=`dirname "$progdir"`/framework - libdir=`dirname "$progdir"`/lib -fi -if [ ! -r "$frameworkdir/$jarfile" ] -then - echo `basename "$prog"`": can't find $jarfile" - exit 1 -fi - -if [ "$OSTYPE" = "cygwin" ] ; then - jarpath=`cygpath -w "$frameworkdir/$jarfile"` - progdir=`cygpath -w "$progdir"` -else - jarpath="$frameworkdir/$jarfile" -fi - -# need to use "java.ext.dirs" because "-jar" causes classpath to be ignored -# might need more memory, e.g. -Xmx128M -exec java -ea -Djava.ext.dirs="$frameworkdir" -jar "$jarpath" "$@" diff --git a/tools/makedict/etc/manifest.txt b/tools/makedict/etc/manifest.txt deleted file mode 100644 index 4f085e7c8..000000000 --- a/tools/makedict/etc/manifest.txt +++ /dev/null @@ -1 +0,0 @@ -Main-Class: com.android.inputmethod.latin.makedict.DictionaryMaker