Rename database google to android

diff --git a/Makefile.am b/Makefile.am
index 2fc229e..c344762 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS = \
        $(NULL)
 
 DISTCHECK_CONFIGURE_FLAGS = \
-       --enable-db-google \
+       --enable-db-android \
        --enable-db-open-phrase \
        $(NULL)
 

diff --git a/configure.ac b/configure.ac
index 9205f21..438b767 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -80,14 +80,14 @@ AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.16.1)
 
 
-# --enable-db-google
-AC_ARG_ENABLE(db-google,
-    AS_HELP_STRING([--disable-db-google],
-        [do not build database from google android pinyin]),
-    [enable_db_google=$enableval],
-    [enable_db_google=yes]
+# --enable-db-android
+AC_ARG_ENABLE(db-android,
+    AS_HELP_STRING([--disable-db-android],
+        [do not build database from pinyin in android]),
+    [enable_db_android=$enableval],
+    [enable_db_android=yes]
 )
-AM_CONDITIONAL(IBUS_BUILD_DB_GOOGLE, [test x"$enable_db_google" = x"yes" ])
+AM_CONDITIONAL(IBUS_BUILD_DB_ANDROID, [test x"$enable_db_android" = x"yes" ])
 
 # --enable-db-open-phrase
 AC_ARG_ENABLE(db-open-phrase,
@@ -108,7 +108,7 @@ setup/Makefile
 setup/ibus-setup-pinyin
 data/Makefile
 data/db/Makefile
-data/db/google/Makefile
+data/db/android/Makefile
 data/db/open-phrase/Makefile
 data/icons/Makefile
 m4/Makefile
@@ -120,7 +120,7 @@ AC_MSG_RESULT([
 Build options:
     Version                     $VERSION
     Install prefix              $prefix
-    Build database google       $enable_db_google
+    Build database android      $enable_db_android
     Build database open-phrase  $enable_db_open_phrase
 ])
 

diff --git a/data/db/Makefile.am b/data/db/Makefile.am
index fd05490..67e2f95 100644 (file)
--- a/data/db/Makefile.am
+++ b/data/db/Makefile.am
@@ -28,7 +28,7 @@ EXTRA_DIST = \
        $(NULL)
 
 SUBDIRS = \
-       google \
+       android \
        open-phrase \
        $(NULL)
 
@@ -37,9 +37,9 @@ install-data-hook:
        @( \
 if test "$(NO_INDEX)" = ""; then \
   cd $(DESTDIR)$(main_dbdir); \
-  if test -f google.db; then \
-    echo "Creating index for google.db"; \
-    sqlite3 google.db ".read create_index.sql"; \
+  if test -f android.db; then \
+    echo "Creating index for android.db"; \
+    sqlite3 android.db ".read create_index.sql"; \
   fi; \
   if test -f open-phrase.db; then \
     echo "Creating index for open-phrase.db"; \

diff --git a/data/db/google/Makefile.am b/data/db/android/Makefile.am
similarity index 92%
rename from data/db/google/Makefile.am
rename to data/db/android/Makefile.am
index 885317b..a572656 100644 (file)
--- a/data/db/google/Makefile.am
+++ b/data/db/android/Makefile.am
@@ -29,14 +29,14 @@ data_files = \
        rawdict_utf16_65105_freq.txt \
        $(NULL)
 
-if IBUS_BUILD_DB_GOOGLE
+if IBUS_BUILD_DB_ANDROID
 main_db_DATA = \
-       google.db \
+       android.db \
        $(NULL)
 main_dbdir = $(pkgdatadir)/db
 endif
 
-google.db: $(google_raw_data) $(create_scripts)
+android.db: $(android_raw_data) $(create_scripts)
        $(RM) $@
        $(srcdir)/create_db.py $(srcdir)/rawdict_utf16_65105_freq.txt | sqlite3 $@
 
@@ -46,7 +46,7 @@ EXTRA_DIST = \
        $(NULL)
 
 CLEANFILES = \
-       google.db \
+       android.db \
        $(NULL)
 
 DISTCLEANFILES = \

diff --git a/data/db/google/README b/data/db/android/README
similarity index 100%
rename from data/db/google/README
rename to data/db/android/README

diff --git a/data/db/google/create_db.py b/data/db/android/create_db.py
similarity index 100%
rename from data/db/google/create_db.py
rename to data/db/android/create_db.py

diff --git a/data/db/google/create_valid_hanzi.py b/data/db/android/create_valid_hanzi.py
similarity index 100%
rename from data/db/google/create_valid_hanzi.py
rename to data/db/android/create_valid_hanzi.py

diff --git a/data/db/google/id.py b/data/db/android/id.py
similarity index 100%
rename from data/db/google/id.py
rename to data/db/android/id.py

diff --git a/data/db/google/pydict.py b/data/db/android/pydict.py
similarity index 100%
rename from data/db/google/pydict.py
rename to data/db/android/pydict.py

diff --git a/data/db/google/rawdict_utf16_65105_freq.txt b/data/db/android/rawdict_utf16_65105_freq.txt
similarity index 100%
rename from data/db/google/rawdict_utf16_65105_freq.txt
rename to data/db/android/rawdict_utf16_65105_freq.txt

diff --git a/data/db/google/valid_hanzi.py b/data/db/android/valid_hanzi.py
similarity index 100%
rename from data/db/google/valid_hanzi.py
rename to data/db/android/valid_hanzi.py

diff --git a/data/db/google/valid_utf16.txt b/data/db/android/valid_utf16.txt
similarity index 100%
rename from data/db/google/valid_utf16.txt
rename to data/db/android/valid_utf16.txt

diff --git a/ibus-pinyin.spec.in b/ibus-pinyin.spec.in
index 3b350c2..9e86600 100644 (file)
--- a/ibus-pinyin.spec.in
+++ b/ibus-pinyin.spec.in
@@ -52,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 cd %{_datadir}/ibus-pinyin/db
-sqlite3 google.db ".read create_index.sql"
+sqlite3 android.db ".read create_index.sql"
 
 %post open-phrase
 cd %{_datadir}/ibus-pinyin/db
@@ -66,7 +66,7 @@ sqlite3 open-phrase.db ".read create_index.sql"
 %{_datadir}/@PACKAGE@/icons
 %{_datadir}/@PACKAGE@/setup
 %{_datadir}/@PACKAGE@/db/create_index.sql
-%{_datadir}/@PACKAGE@/db/google.db
+%{_datadir}/@PACKAGE@/db/android.db
 %dir %{_datadir}/@PACKAGE@
 %dir %{_datadir}/@PACKAGE@/db
 %{_datadir}/ibus/component/*

diff --git a/src/Database.cc b/src/Database.cc
index d4f30da..d47098c 100644 (file)
--- a/src/Database.cc
+++ b/src/Database.cc
@@ -59,7 +59,7 @@ Database::init (void)
 
     static const gchar * maindb [] = {
         PKGDATADIR"/db/open-phrase.db",
-        PKGDATADIR"/db/google.db",
+        PKGDATADIR"/db/android.db",
         "main.db",
         NULL
     };