Commit 771afd21 authored by YunQiang Su's avatar YunQiang Su
Browse files

Merge branch 'master' into unstable 

Conflicts:
	debian/compat
	debian/control
	debian/copyright
	debian/docs
	debian/rules
parents 170f9bed 6d9c3cdf

.gitignore

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ confinc 
confmf

depcomp

libpyzy-*.tar.gz

libpyzy.spec

pyzy.spec

pyzy-1.0.pc

install-sh

libtool

ltmain.sh

Makefile.am

+16 −12
Original line number Diff line number Diff line
@@ -4,27 +4,31 @@ 
#

# Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>

#

# This library is free software; you can redistribute it and/or modify

# it under the terms of the GNU Lesser General Public License as

# published by the Free Software Foundation; either version 2.1 of the

# License, or (at your option) any later version.

# This library is free software; you can redistribute it and/or

# modify it under the terms of the GNU Lesser General Public

# License as published by the Free Software Foundation; either

# version 2.1 of the License, or (at your option) any later version.

#

# This library is distributed in the hope that it will be useful, but

# WITHOUT ANY WARRANTY; without even the implied warranty of

# This library is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

# Lesser General Public License for more details.

#

# You should have received a copy of the GNU Lesser General Public

# License along with this library; if not, write to the Free Software

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301

# USA



SUBDIRS = \

	data \

	src \

        docs \

	m4 \

	src \

	$(NULL)



pkgconfigdir = $(libdir)/pkgconfig

pkgconfig_DATA = pyzy-@PYZY_API_VERSION@.pc



DISTCHECK_CONFIGURE_FLAGS = \

	CFLAGS='-g3 -O3 -Wall' \

	CXXFLAGS='-g3 -O3 -Wall' \
@@ -36,7 +40,7 @@ ACLOCAL_AMFLAGS = -I m4 


EXTRA_DIST = \

	autogen.sh \

	libpyzy.spec.in \

	@PACKAGE_NAME@.spec.in \

	$(NULL)



noinst_DIST = \
@@ -114,8 +118,8 @@ dpkg: dist debian/changelog 


upload: dist

	./tools/googlecode_upload.py \

		-s "libpyzy source code" \

		-p ibus \

		-s "pyzy source code" \

		-p pyzy \

		-l "Type-Source,OpSys-Linux,Chinese,Unstable" \

		$(distdir).tar.gz

configure.ac

+95 −33
Original line number Diff line number Diff line
@@ -4,45 +4,86 @@ 
#

# Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>

#

# This library is free software; you can redistribute it and/or modify

# it under the terms of the GNU Lesser General Public License as

# published by the Free Software Foundation; either version 2.1 of the

# License, or (at your option) any later version.

# This library is free software; you can redistribute it and/or

# modify it under the terms of the GNU Lesser General Public

# License as published by the Free Software Foundation; either

# version 2.1 of the License, or (at your option) any later version.

#

# This library is distributed in the hope that it will be useful, but

# WITHOUT ANY WARRANTY; without even the implied warranty of

# This library is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

# Lesser General Public License for more details.

#

# You should have received a copy of the GNU Lesser General Public

# License along with this library; if not, write to the Free Software

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301

# USA



# if not 1, append datestamp to the version number.

m4_define([ibus_released], [0])

m4_define([ibus_major_version], [1])

m4_define([ibus_minor_version], [3])

m4_define([ibus_micro_version], [99])

m4_define(ibus_maybe_datestamp,

    m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))

# If pyzy_released is 0, append datestamp to the version number.

m4_define([pyzy_released], [1])



m4_define([pyzy_major_version], [0])

m4_define([pyzy_minor_version], [1])

m4_define([pyzy_micro_version], [0])

m4_define([pyzy_interface_age], [0])

m4_define([pyzy_binary_age],

          [m4_eval(100 * pyzy_minor_version + pyzy_micro_version)])

m4_define([pyzy_maybe_datestamp],

    m4_esyscmd([test x]pyzy_released[ != x1 && date +.%Y%m%d | tr -d '\n\r']))

m4_define([pyzy_version],

    pyzy_major_version.pyzy_minor_version.pyzy_micro_version[]pyzy_maybe_datestamp)

m4_define([pyzy_api_version], [1.0])



AC_PREFEQ([2.62])

AC_INIT([pyzy], [pyzy_version],

        [http://code.google.com/p/pyzy/issues/entry],

        [pyzy])



m4_define([ibus_version],

    ibus_major_version.ibus_minor_version.ibus_micro_version[]ibus_maybe_datestamp)

AC_CONFIG_HEADERS([config.h])

AC_CONFIG_MACRO_DIR([m4])



m4_define([pyzy_binary_version], [1.0.0])



AC_INIT([libpyzy], [ibus_version], [http://code.google.com/p/ibus/issues/entry],[libpyzy])

# Init automake.

AM_INIT_AUTOMAKE([1.10])

AM_MAINTAINER_MODE([enable])

AC_GNU_SOURCE



AC_CONFIG_HEADERS([config.h])

AC_CONFIG_MACRO_DIR([m4])

m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

# Support silent build rules. Disable

# by either passing --disable-silent-rules to configure or passing V=1

# to make

AM_SILENT_RULES([yes])



# Define sustituted variables:

PYZY_MAJOR_VERSION=pyzy_major_version

PYZY_MINOR_VERSION=pyzy_minor_version

PYZY_MICRO_VERSION=pyzy_micro_version

PYZY_INTERFACE_AGE=pyzy_interface_age

PYZY_BINARY_AGE=pyzy_binary_age

PYZY_VERSION=pyzy_version

PYZY_API_VERSION=pyzy_api_version

PYZY_BINARY_VERSION=pyzy_binary_version

AC_SUBST(PYZY_MAJOR_VERSION)

AC_SUBST(PYZY_MINOR_VERSION)

AC_SUBST(PYZY_MICRO_VERSION)

AC_SUBST(PYZY_INTERFACE_AGE)

AC_SUBST(PYZY_BINARY_AGE)

AC_SUBST(PYZY_API_VERSION)

AC_SUBST(PYZY_VERSION)

AC_SUBST(PYZY_BINARY_VERSION)



# libtool versioning

m4_define([lt_current],

          [m4_eval(100 * pyzy_minor_version + pyzy_micro_version - pyzy_interface_age)])

m4_define([lt_revision], [pyzy_interface_age])

m4_define([lt_age], [m4_eval(pyzy_binary_age - pyzy_interface_age)])

LT_VERSION_INFO="lt_current:lt_revision:lt_age"

LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)

AC_SUBST(LT_VERSION_INFO)

AC_SUBST(LT_CURRENT_MINUS_AGE)



# define PACKAGE_VERSION_* variables

AS_VERSION

AS_NANO

AM_SANITY_CHECK

AM_MAINTAINER_MODE

AM_DISABLE_STATIC

AC_PROG_CC

AC_PROG_CXX
@@ -54,7 +95,7 @@ AM_PROG_LIBTOOL 
# check glib2

AM_PATH_GLIB_2_0

PKG_CHECK_MODULES(GLIB2, [

    glib-2.0 >= 2.26.0

    glib-2.0 >= 2.24.0

])



# check sqlite
@@ -93,12 +134,12 @@ AM_CONDITIONAL(HAVE_LIBUUID, test x"$HAVE_LIBUUID" = x"yes") 
AC_PATH_PROG(ENV, env)

AC_SUBST(ENV)



# --disble-boost

# --enable-boost

AC_ARG_ENABLE(boost,

    AC_HELP_STRING([--disable-boost],

    AC_HELP_STRING([--enable-boost],

        [Do not use boost and use stdc++0x to replace boost.]),

        [enable_boost=$enableval],

        [enable_boost=yes]

        [enable_boost=no]

)

if test x"$enable_boost" = x"yes"; then

    # check boost
@@ -122,14 +163,14 @@ if test x"$enable_opencc" = x"yes"; then 
    ])

fi



# --enable-db-android

# --disable-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_ANDROID, [test x"$enable_db_android" = x"yes" ])

AM_CONDITIONAL(PYZY_BUILD_DB_ANDROID, [test x"$enable_db_android" = x"yes" ])



# --enable-db-open-phrase

AC_ARG_ENABLE(db-open-phrase,
@@ -138,18 +179,38 @@ AC_ARG_ENABLE(db-open-phrase, 
    [enable_db_open_phrase=$enableval],

    [enable_db_open_phrase=no]

)

AM_CONDITIONAL(IBUS_BUILD_DB_OPEN_PHRASE, [test x"$enable_db_open_phrase" = x"yes" ])

AM_CONDITIONAL(PYZY_BUILD_DB_OPEN_PHRASE, [test x"$enable_db_open_phrase" = x"yes" ])



# --enable-tests option.

AC_ARG_ENABLE(tests,

    AS_HELP_STRING([--enable-tests],

                   [Run tests]),

    [enable_tests=$enableval],

    [enable_tests=no]

)

AM_CONDITIONAL([ENABLE_TESTS], [test x"$enable_tests" = x"yes"])



# doxygen

AC_CHECK_PROGS([DOXYGEN], [doxygen])

if test -z "$DOXYGEN"; then

    AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])

fi

AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])

AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([docs/Doxyfile])])   



# OUTPUT files

AC_CONFIG_FILES([

Makefile

libpyzy.spec

src/Makefile

data/Makefile

data/db/Makefile

data/db/android/Makefile

data/db/open-phrase/Makefile

docs/Makefile

m4/Makefile

pyzy-1.0.pc

pyzy.spec

src/Makefile

src/tests/Makefile

])



AC_OUTPUT
@@ -162,5 +223,6 @@ Build options: 
    Use opencc                  $enable_opencc

    Build database android      $enable_db_android

    Build database open-phrase  $enable_db_open_phrase

    Run test cases              $enable_tests

])

data/.gitignore

+2 −1
Original line number Diff line number Diff line 
db

stamp-db

db/android/android.db

db/open-phrase/open-phrase.db

data/Makefile.am

+8 −8
Original line number Diff line number Diff line
@@ -4,19 +4,19 @@ 
#

# Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>

#

# This library is free software; you can redistribute it and/or modify

# it under the terms of the GNU Lesser General Public License as

# published by the Free Software Foundation; either version 2.1 of the

# License, or (at your option) any later version.

# This library is free software; you can redistribute it and/or

# modify it under the terms of the GNU Lesser General Public

# License as published by the Free Software Foundation; either

# version 2.1 of the License, or (at your option) any later version.

#

# This library is distributed in the hope that it will be useful, but

# WITHOUT ANY WARRANTY; without even the implied warranty of

# This library is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

# Lesser General Public License for more details.

#

# You should have received a copy of the GNU Lesser General Public

# License along with this library; if not, write to the Free Software

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301

# USA



SUBDIRS = \