-
Notifications
You must be signed in to change notification settings - Fork 123
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
upgrade marisa-trie to latest version
- Loading branch information
Showing
17 changed files
with
170 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # marisa-build -t /usr/share/dict/web2 -o ./dict-test | ||
|
|
||
| marisa-build -b ./google_227800_words.txt -o ./google_227800_words.bin | ||
|
|
||
| # ls -alh lib/marisa/.libs/libmarisa.a |
This file was deleted.
Oops, something went wrong.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| # Makefile.in generated by automake 1.15 from Makefile.am. | ||
| # Makefile.in generated by automake 1.16.3 from Makefile.am. | ||
| # include/Makefile. Generated from Makefile.in by configure. | ||
|
|
||
| # Copyright (C) 1994-2014 Free Software Foundation, Inc. | ||
| # Copyright (C) 1994-2020 Free Software Foundation, Inc. | ||
|
|
||
| # This Makefile.in is free software; the Free Software Foundation | ||
| # gives unlimited permission to copy and/or distribute it, | ||
|
|
@@ -86,11 +86,14 @@ POST_INSTALL = : | |
| NORMAL_UNINSTALL = : | ||
| PRE_UNINSTALL = : | ||
| POST_UNINSTALL = : | ||
| build_triplet = x86_64-apple-darwin16.3.0 | ||
| host_triplet = x86_64-apple-darwin16.3.0 | ||
| build_triplet = x86_64-apple-darwin20.2.0 | ||
| host_triplet = x86_64-apple-darwin20.2.0 | ||
| subdir = include | ||
| ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
| am__aclocal_m4_deps = $(top_srcdir)/configure.ac | ||
| am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ | ||
| $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ | ||
| $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ | ||
| $(top_srcdir)/configure.ac | ||
| am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | ||
| $(ACLOCAL_M4) | ||
| DIST_COMMON = $(srcdir)/Makefile.am $(include_HEADERS) \ | ||
|
|
@@ -161,7 +164,7 @@ am__recursive_targets = \ | |
| $(RECURSIVE_CLEAN_TARGETS) \ | ||
| $(am__extra_recursive_targets) | ||
| AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ | ||
| distdir | ||
| distdir distdir-am | ||
| am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) | ||
| # Read a list of newline-separated strings from the standard input, | ||
| # and print each of them once, without duplicates. Input order is | ||
|
|
@@ -209,13 +212,13 @@ am__relativize = \ | |
| dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ | ||
| done; \ | ||
| reldir="$$dir2" | ||
| ACLOCAL = ${SHELL} /Users/dongyuwei/code/input-methods/marisa-trie/missing aclocal-1.15 | ||
| ACLOCAL = ${SHELL} '/Users/yuwdong/code/mac/marisa-trie/missing' aclocal-1.16 | ||
| AMTAR = $${TAR-tar} | ||
| AM_DEFAULT_VERBOSITY = 1 | ||
| AR = ar | ||
| AUTOCONF = ${SHELL} /Users/dongyuwei/code/input-methods/marisa-trie/missing autoconf | ||
| AUTOHEADER = ${SHELL} /Users/dongyuwei/code/input-methods/marisa-trie/missing autoheader | ||
| AUTOMAKE = ${SHELL} /Users/dongyuwei/code/input-methods/marisa-trie/missing automake-1.15 | ||
| AUTOCONF = ${SHELL} '/Users/yuwdong/code/mac/marisa-trie/missing' autoconf | ||
| AUTOHEADER = ${SHELL} '/Users/yuwdong/code/mac/marisa-trie/missing' autoheader | ||
| AUTOMAKE = ${SHELL} '/Users/yuwdong/code/mac/marisa-trie/missing' automake-1.16 | ||
| AWK = awk | ||
| CC = gcc | ||
| CCDEPMODE = depmode=gcc3 | ||
|
|
@@ -227,7 +230,7 @@ CXXCPP = g++ -E | |
| CXXDEPMODE = depmode=gcc3 | ||
| CXXFLAGS = -g -O2 | ||
| CYGPATH_W = echo | ||
| DEFS = -DPACKAGE_NAME=\"marisa\" -DPACKAGE_TARNAME=\"marisa\" -DPACKAGE_VERSION=\"0.2.5\" -DPACKAGE_STRING=\"marisa\ 0.2.5\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DPACKAGE=\"marisa\" -DVERSION=\"0.2.5\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" | ||
| DEFS = -DPACKAGE_NAME=\"marisa\" -DPACKAGE_TARNAME=\"marisa\" -DPACKAGE_VERSION=\"0.2.6\" -DPACKAGE_STRING=\"marisa\ 0.2.6\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DPACKAGE=\"marisa\" -DVERSION=\"0.2.6\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" | ||
| DEPDIR = .deps | ||
| DLLTOOL = false | ||
| DSYMUTIL = dsymutil | ||
|
|
@@ -239,12 +242,12 @@ EGREP = /usr/bin/grep -E | |
| EXEEXT = | ||
| FGREP = /usr/bin/grep -F | ||
| GREP = /usr/bin/grep | ||
| INSTALL = /usr/local/bin/ginstall -c | ||
| INSTALL = /usr/bin/install -c | ||
| INSTALL_DATA = ${INSTALL} -m 644 | ||
| INSTALL_PROGRAM = ${INSTALL} | ||
| INSTALL_SCRIPT = ${INSTALL} | ||
| INSTALL_STRIP_PROGRAM = $(install_sh) -c -s | ||
| LD = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld | ||
| LD = /Applications/Xcode-beta.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld | ||
| LDFLAGS = | ||
| LIBOBJS = | ||
| LIBS = | ||
|
|
@@ -253,9 +256,9 @@ LIPO = lipo | |
| LN_S = ln -s | ||
| LTLIBOBJS = | ||
| LT_SYS_LIBRARY_PATH = | ||
| MAKEINFO = ${SHELL} /Users/dongyuwei/code/input-methods/marisa-trie/missing makeinfo | ||
| MAKEINFO = ${SHELL} '/Users/yuwdong/code/mac/marisa-trie/missing' makeinfo | ||
| MANIFEST_TOOL = : | ||
| MKDIR_P = /usr/local/bin/gmkdir -p | ||
| MKDIR_P = .././install-sh -c -d | ||
| NM = /usr/bin/nm -B | ||
| NMEDIT = nmedit | ||
| OBJDUMP = objdump | ||
|
|
@@ -265,21 +268,21 @@ OTOOL64 = : | |
| PACKAGE = marisa | ||
| PACKAGE_BUGREPORT = [email protected] | ||
| PACKAGE_NAME = marisa | ||
| PACKAGE_STRING = marisa 0.2.5 | ||
| PACKAGE_STRING = marisa 0.2.6 | ||
| PACKAGE_TARNAME = marisa | ||
| PACKAGE_URL = | ||
| PACKAGE_VERSION = 0.2.5 | ||
| PACKAGE_VERSION = 0.2.6 | ||
| PATH_SEPARATOR = : | ||
| RANLIB = ranlib | ||
| SED = /usr/bin/sed | ||
| SET_MAKE = | ||
| SHELL = /bin/sh | ||
| STRIP = strip | ||
| VERSION = 0.2.5 | ||
| abs_builddir = /Users/dongyuwei/code/input-methods/marisa-trie/include | ||
| abs_srcdir = /Users/dongyuwei/code/input-methods/marisa-trie/include | ||
| abs_top_builddir = /Users/dongyuwei/code/input-methods/marisa-trie | ||
| abs_top_srcdir = /Users/dongyuwei/code/input-methods/marisa-trie | ||
| VERSION = 0.2.6 | ||
| abs_builddir = /Users/yuwdong/code/mac/marisa-trie/include | ||
| abs_srcdir = /Users/yuwdong/code/mac/marisa-trie/include | ||
| abs_top_builddir = /Users/yuwdong/code/mac/marisa-trie | ||
| abs_top_srcdir = /Users/yuwdong/code/mac/marisa-trie | ||
| ac_ct_AR = ar | ||
| ac_ct_CC = gcc | ||
| ac_ct_CXX = g++ | ||
|
|
@@ -290,26 +293,26 @@ am__quote = | |
| am__tar = $${TAR-tar} chof - "$$tardir" | ||
| am__untar = $${TAR-tar} xf - | ||
| bindir = ${exec_prefix}/bin | ||
| build = x86_64-apple-darwin16.3.0 | ||
| build = x86_64-apple-darwin20.2.0 | ||
| build_alias = | ||
| build_cpu = x86_64 | ||
| build_os = darwin16.3.0 | ||
| build_os = darwin20.2.0 | ||
| build_vendor = apple | ||
| builddir = . | ||
| datadir = ${datarootdir} | ||
| datarootdir = ${prefix}/share | ||
| docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} | ||
| dvidir = ${docdir} | ||
| exec_prefix = ${prefix} | ||
| host = x86_64-apple-darwin16.3.0 | ||
| host = x86_64-apple-darwin20.2.0 | ||
| host_alias = | ||
| host_cpu = x86_64 | ||
| host_os = darwin16.3.0 | ||
| host_os = darwin20.2.0 | ||
| host_vendor = apple | ||
| htmldir = ${docdir} | ||
| includedir = ${prefix}/include | ||
| infodir = ${datarootdir}/info | ||
| install_sh = ${SHELL} /Users/dongyuwei/code/input-methods/marisa-trie/install-sh | ||
| install_sh = ${SHELL} /Users/yuwdong/code/mac/marisa-trie/install-sh | ||
| libdir = ${exec_prefix}/lib | ||
| libexecdir = ${exec_prefix}/libexec | ||
| localedir = ${datarootdir}/locale | ||
|
|
@@ -351,8 +354,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
| *config.status*) \ | ||
| cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ | ||
| *) \ | ||
| echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ | ||
| cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ | ||
| echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ | ||
| cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ | ||
| esac; | ||
|
|
||
| $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | ||
|
|
@@ -490,7 +493,10 @@ cscopelist-am: $(am__tagged_files) | |
| distclean-tags: | ||
| -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
|
|
||
| distdir: $(DISTFILES) | ||
| distdir: $(BUILT_SOURCES) | ||
| $(MAKE) $(AM_MAKEFLAGS) distdir-am | ||
|
|
||
| distdir-am: $(DISTFILES) | ||
| @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
| topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
| list='$(DISTFILES)'; \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.