Permalink
Browse files

rc2 release.

  • Loading branch information...
1 parent 3fb6b11 commit 6d3997f80aac34208989cf9e2d7925c71e1b7dfe @mikeandmore mikeandmore committed Jan 13, 2011
Showing with 14 additions and 195 deletions.
  1. +1 −0 .gitattributes
  2. +0 −178 wrapper/scim/Makefile.am
  3. +12 −16 wrapper/scim/SConstruct
  4. +1 −1 wrapper/xim/common.h
View
@@ -4,3 +4,4 @@
/wrapper/macos export-ignore
/wrapper/xim/debian export-ignore
/wrapper/ibus/debian export-ignore
+/wrapper/gtk_standalone export-ignore
View
@@ -1,178 +0,0 @@
-#
-# Copyright (c) 2007 Kov Chai <tchaikov@gmail.com>
-#
-# The contents of this file are subject to the terms of either the GNU Lesser
-# General Public License Version 2.1 only ("LGPL") or the Common Development and
-# Distribution License ("CDDL")(collectively, the "License"). You may not use this
-# file except in compliance with the License. You can obtain a copy of the CDDL at
-# http://www.opensource.org/licenses/cddl1.php and a copy of the LGPLv2.1 at
-# http://www.opensource.org/licenses/lgpl-license.php. See the License for the
-# specific language governing permissions and limitations under the License. When
-# distributing the software, include this License Header Notice in each file and
-# include the full text of the License in the License file as well as the
-# following notice:
-#
-# NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE
-# (CDDL)
-# For Covered Software in this distribution, this License shall be governed by the
-# laws of the State of California (excluding conflict-of-law provisions).
-# Any litigation relating to this License shall be subject to the jurisdiction of
-# the Federal Courts of the Northern District of California and the state courts
-# of the State of California, with venue lying in Santa Clara County, California.
-#
-# Contributor(s):
-#
-# If you wish your version of this file to be governed by only the CDDL or only
-# the LGPL Version 2.1, indicate your decision by adding "[Contributor]" elects to
-# include this software in this distribution under the [CDDL or LGPL Version 2.1]
-# license." If you don't indicate a single choice of license, a recipient has the
-# option to distribute your version of this file under either the CDDL or the LGPL
-# Version 2.1, or to extend the choice of license to its licensees as provided
-# above. However, if you add LGPL Version 2.1 code and therefore, elected the LGPL
-# Version 2 license, then the option applies only if the new code is made subject
-# to such option by the copyright holder.
-#
-
-SRC_DIR = $(top_srcdir)/src
-SUNPINYIN_SRC_DIR = $(top_srcdir)/src/ime-core
-SLM_SRC_DIR = $(top_srcdir)/src/slm
-LEXICON_SRC_DIR = $(top_srcdir)/src/lexicon
-PINYIN_SRC_DIR = $(top_srcdir)/src/pinyin
-SUNPINYIN_USERDATA_DIR_PREFIX = .scim/sunpinyin
-
-# libtool option to control which symbols are exported
-# right now, symbols starting with _ are not exported
-LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[^_].*"'
-
-IME_SO_DIR = $(libdir)/scim-1.0/1.4.0/IMEngine
-
-noinst_HEADERS = imi_scimwin.h \
- sunpinyin_imengine_config_keys.h \
- sunpinyin_imengine.h \
- sunpinyin_keycode.h \
- sunpinyin_lookup_table.h \
- sunpinyin_private.h \
- sunpinyin_utils.h
-
-#
-# SunPinyin
-#
-noinst_LTLIBRARIES = libsunpinyin.la
-
-libsunpinyin_la_SOURCES = \
- $(SRC_DIR)/portability.cpp $(SRC_DIR)/portability.h \
- $(SLM_SRC_DIR)/slm.cpp $(SLM_SRC_DIR)/slm.h \
- $(LEXICON_SRC_DIR)/pytrie.cpp $(LEXICON_SRC_DIR)/pytrie.h \
- $(PINYIN_SRC_DIR)/pinyin_data.cpp $(PINYIN_SRC_DIR)/pinyin_data.h \
- $(PINYIN_SRC_DIR)/pinyin_seg.cpp $(PINYIN_SRC_DIR)/pinyin_seg.h \
- $(PINYIN_SRC_DIR)/shuangpin_data.cpp $(PINYIN_SRC_DIR)/shuangpin_data.h \
- $(PINYIN_SRC_DIR)/shuangpin_seg.cpp $(PINYIN_SRC_DIR)/shuangpin_seg.h \
- $(PINYIN_SRC_DIR)/datrie.h $(PINYIN_SRC_DIR)/datrie_impl.h \
- $(SUNPINYIN_SRC_DIR)/imi_context.cpp $(SUNPINYIN_SRC_DIR)/imi_context.h \
- $(SUNPINYIN_SRC_DIR)/imi_data.cpp $(SUNPINYIN_SRC_DIR)/imi_data.h \
- $(SUNPINYIN_SRC_DIR)/lattice_states.cpp $(SUNPINYIN_SRC_DIR)/lattice_states.h \
- $(SUNPINYIN_SRC_DIR)/imi_view.cpp $(SUNPINYIN_SRC_DIR)/imi_view.h \
- $(SUNPINYIN_SRC_DIR)/imi_uiobjects.cpp $(SUNPINYIN_SRC_DIR)/imi_uiobjects.h \
- $(SUNPINYIN_SRC_DIR)/imi_keys.h \
- $(SUNPINYIN_SRC_DIR)/imi_view_classic.cpp $(SUNPINYIN_SRC_DIR)/imi_view_classic.h \
- $(SUNPINYIN_SRC_DIR)/imi_winHandler.cpp $(SUNPINYIN_SRC_DIR)/imi_winHandler.h \
- $(SUNPINYIN_SRC_DIR)/ic_history.cpp $(SUNPINYIN_SRC_DIR)/ic_history.h \
- $(SUNPINYIN_SRC_DIR)/imi_funcobjs.cpp $(SUNPINYIN_SRC_DIR)/imi_funcobjs.h \
- $(SUNPINYIN_SRC_DIR)/imi_options.cpp $(SUNPINYIN_SRC_DIR)/imi_options.h \
- $(SUNPINYIN_SRC_DIR)/imi_option_event.cpp $(SUNPINYIN_SRC_DIR)/imi_option_event.h \
- $(SUNPINYIN_SRC_DIR)/imi_option_keys.h \
- $(SUNPINYIN_SRC_DIR)/imi_defines.h \
- $(SUNPINYIN_SRC_DIR)/userdict.cpp $(SUNPINYIN_SRC_DIR)/userdict.h \
- $(SUNPINYIN_SRC_DIR)/utils.h
-
-libsunpinyin_la_CXXFLAGS = \
- -D_USE_RAW_PROBABILITY -DSCIM_INTERFACE \
- -DSUNPINYIN_DATA_DIR=\"@SCIM_SUNPINYIN_DATADIR@\" \
- -DSUNPINYIN_USERDATA_DIR_PREFIX=\"$(SUNPINYIN_USERDATA_DIR_PREFIX)\" \
- -I$(top_srcdir) \
- -I$(SUNPINYIN_SRC_DIR) \
- -I$(LEXICON_SRC_DIR) \
- -I$(SLM_SRC_DIR) \
- -I$(PINYIN_SRC_DIR)\
- -I$(top_builddir) \
- -I$(top_builddir)/src \
- $(sqlite3_CFLAGS) \
- -DENABLE_DEBUG
-
-libsunpinyin_la_LDFLAGS = \
- -no-undefined -avoid-version \
- $(LIBTOOL_EXPORT_OPTIONS) \
- @LTLIBINTL@ \
- $(sqlite3_LIBS)
-
-libsunpinyin_la_LIBADD = -lm
-
-#
-# scim-sunpinyin
-
-#
-# input method module
-#
-moduledir = @SCIM_MODULEDIR@/IMEngine
-module_LTLIBRARIES = sunpinyin.la
-
-sunpinyin_la_SOURCES = sunpinyin_utils.cpp \
- imi_scimwin.cpp \
- sunpinyin_imengine.cpp \
- sunpinyin_lookup_table.cpp
-
-sunpinyin_la_CXXFLAGS = @SCIM_CFLAGS@ \
- -I$(top_builddir)/src \
- -I$(SUNPINYIN_SRC_DIR) \
- -I$(PINYIN_SRC_DIR) \
- -I$(LEXICON_SRC_DIR) \
- -I$(SLM_SRC_DIR) \
- -DSUNPINYIN_USERDATA_DIR_PREFIX=\"$(SUNPINYIN_USERDATA_DIR_PREFIX)\" \
- -DSCIM_ICONDIR=\"@SCIM_ICONDIR@\" \
- -DSCIM_SUNPINYIN_LOCALEDIR=\"$(datadir)/locale\" \
- -DSUNPINYIN_DATA_DIR=\"@SCIM_SUNPINYIN_DATADIR@\" \
- -DSCIM_SUNPINYIN_ICON_FILE=\"@SCIM_ICONDIR@/sunpinyin_logo.xpm\" \
- -DENABLE_DEBUG
-
-sunpinyin_la_LDFLAGS = -avoid-version \
- -rpath $(moduledir) \
- -module \
- $(LIBTOOL_EXPORT_OPTIONS) \
- @SCIM_LIBS@ \
- @LTLIBINTL@
-
-sunpinyin_la_LIBADD = libsunpinyin.la
-
-#
-# Setup UI
-#
-if SCIM_BUILD_SETUP
-SETUP_MODULE = sunpinyin-imengine-setup.la
-endif
-
-setupmoduledir = @SCIM_MODULEDIR@/SetupUI
-setupmodule_LTLIBRARIES = $(SETUP_MODULE)
-
-sunpinyin_imengine_setup_la_SOURCES = sunpinyin_imengine_setup.cpp
-
-sunpinyin_imengine_setup_la_CXXFLAGS= @SCIM_GTKUTILS_CFLAGS@ \
- @SCIM_CFLAGS@ \
- -DSCIM_SUNPINYIN_LOCALEDIR=\"$(datadir)/locale\"
-
-sunpinyin_imengine_setup_la_LDFLAGS = -avoid-version \
- -rpath $(setupmoduledir) \
- -module \
- $(LIBTOOL_EXPORT_OPTIONS) \
- @SCIM_GTKUTILS_LIBS@ \
- @LTLIBINTL@ \
- @SCIM_LIBS@
-
-#
-# data files installation
-#
-scim_sunpinyin_datadir = @SCIM_SUNPINYIN_DATADIR@
-scim_sunpinyin_data_DATA = $(top_builddir)/data/lm_sc.t3g \
- $(top_builddir)/data/pydict_sc.bin
-
-icondir = $(SCIM_ICONDIR)
-icon_DATA = $(top_builddir)/data/sunpinyin_logo.xpm
View
@@ -23,6 +23,12 @@ opts.Add('LIBDIR', default='/usr/local/lib')
opts.Add('LIBEXECDIR', default='/usr/local/lib')
opts.Add('DATADIR', default='/usr/local/share')
+def PassVariables(envvar, env):
+ for (x, y) in envvar:
+ if x in os.environ:
+ print 'Warning: you\'ve set %s in the environmental variable!' % x
+ env[y] = os.environ[x]
+
env = Environment(ENV=os.environ,
CFLAGS=cflags, CXXFLAGS=cflags,
CPPPATH=['.'], SUBSTFILESUFFIX='.in')
@@ -48,22 +54,12 @@ opts.Save('configure.conf', env)
if GetOption('rpath') is not None:
env.Append(LINKFLAGS='-Wl,-R -Wl,%s' % GetOption('rpath'))
-if 'CC' in os.environ:
- print 'Warning: you\'ve set %s as C compiler' % os.environ['CC']
- env['CC']=os.environ['CC']
-
-if 'CXX' in os.environ:
- print 'Warning: you\'ve set %s as C++ compiler' % os.environ['CXX']
- env['CXX']=os.environ['CXX']
-
-if 'CFLAGS' in os.environ:
- print 'Warning: you\'ve set an external compiler flags for C.'
- env['CFLAGS'] = os.environ['CFLAGS']
-
-if 'CXXFLAGS' in os.environ:
- print 'Warning: you\'ve set an external compiler flags for C++.'
- env['CXXFLAGS'] = os.environ['CXXFLAGS']
-
+envvar = [('CC', 'CC'),
+ ('CXX', 'CXX'),
+ ('CFLAGS', 'CFLAGS'),
+ ('CXXFLAGS', 'CXXFLAGS'),
+ ('LDFLAGS', 'LINKFLAGS')]
+PassVariables(envvar, env)
data_dir = env['DATADIR'] + '/scim-sunpinyin'
icons_dir = env['DATADIR'] + '/scim-sunpinyin/icons'
View
@@ -80,7 +80,7 @@
#define DEBUG(...)
#endif
-#define XIM_VERSION "1.0.0"
+#define XIM_VERSION "2.0.3"
#define XIM_PROGRAM_NAME "SunPinyin-XIM"
#define XIM_WEBSITE "http://mike.struct.cn/sunpinyin-xim"
#define XIM_COMMENTS "a XIM front-end for SunPinyin."

0 comments on commit 6d3997f

Please sign in to comment.