null+****@clear*****
null+****@clear*****
2010年 11月 16日 (火) 14:32:44 JST
Kouhei Sutou 2010-11-16 05:32:44 +0000 (Tue, 16 Nov 2010)
New Revision: cfc8219a215eb39f3cb3295687913c9424048647
Log:
GROONGA_* -> GRN_*.
Modified files:
configure.ac
lib/Makefile.am
lib/ctx.c
lib/expr.c
lib/plugin.c
lib/query.c
src/Makefile.am
src/groonga.c
Modified: configure.ac (+16 -16)
===================================================================
--- configure.ac 2010-11-16 05:22:27 +0000 (3bdd038)
+++ configure.ac 2010-11-16 05:32:44 +0000 (c2dbdcb)
@@ -170,25 +170,25 @@ int main(int argc, char **argv)
AC_ARG_WITH(log_path,
[AS_HELP_STRING([--with-log-path=PATH],
[specify groonga log path.])],
- groonga_log_path="$withval",
- groonga_log_path="\$(localstatedir)/log/\$(PACKAGE_NAME)/\$(PACKAGE_NAME).log")
-AC_SUBST(groonga_log_path)
+ grn_log_path="$withval",
+ grn_log_path="\$(localstatedir)/log/\$(PACKAGE_NAME)/\$(PACKAGE_NAME).log")
+AC_SUBST(grn_log_path)
# default encoding
AC_ARG_WITH(default_encoding,
[AS_HELP_STRING([--with-default-encoding=ENCODING],
[specify groonga default encoding(euc/sjis/utf8/latin1/koi8r/none)])],
- GROONGA_DEFAULT_ENCODING="$withval",
- GROONGA_DEFAULT_ENCODING="utf8")
-AC_DEFINE_UNQUOTED(GROONGA_DEFAULT_ENCODING, "$GROONGA_DEFAULT_ENCODING", "specified default encoding")
+ GRN_DEFAULT_ENCODING="$withval",
+ GRN_DEFAULT_ENCODING="utf8")
+AC_DEFINE_UNQUOTED(GRN_DEFAULT_ENCODING, "$GRN_DEFAULT_ENCODING", "specified default encoding")
# default match escalation threshold
AC_ARG_WITH(match_escalation_threshold,
[AS_HELP_STRING([--with-match-escalation-threshold=NUMBER],
[specify groonga default match escalation threshold])],
- GROONGA_DEFAULT_MATCH_ESCALATION_THRESHOLD="$withval",
- GROONGA_DEFAULT_MATCH_ESCALATION_THRESHOLD="0")
-AC_DEFINE_UNQUOTED(GROONGA_DEFAULT_MATCH_ESCALATION_THRESHOLD, $GROONGA_DEFAULT_MATCH_ESCALATION_THRESHOLD, "specified match escalation threshold")
+ GRN_DEFAULT_MATCH_ESCALATION_THRESHOLD="$withval",
+ GRN_DEFAULT_MATCH_ESCALATION_THRESHOLD="0")
+AC_DEFINE_UNQUOTED(GRN_DEFAULT_MATCH_ESCALATION_THRESHOLD, $GRN_DEFAULT_MATCH_ESCALATION_THRESHOLD, "specified match escalation threshold")
AC_CHECK_LIB(m, log, [M_LIBS="-lm"], [AC_MSG_ERROR("No libm found")])
AC_CHECK_LIB(pthread, pthread_mutex_init,
@@ -699,13 +699,13 @@ examples_dictionarydir="\$(examplesdir)/dictionary"
AC_SUBST(examples_dictionarydir)
# flags for compile groonga
-GROONGA_CFLAGS=""
-AC_SUBST(GROONGA_CFLAGS)
-GROONGA_DEFS=""
-GROONGA_DEFS="$GROONGA_DEFS -DGROONGA_PLUGINS_DIR=\\\"\"\$(pluginsdir)\"\\\""
-GROONGA_DEFS="$GROONGA_DEFS -DGROONGA_RELATIVE_PLUGINS_DIR=\\\"\"lib/\$(relative_pluginsdir)\"\\\""
-GROONGA_DEFS="$GROONGA_DEFS -DGROONGA_LOG_PATH=\\\"\"\$(groonga_log_path)\"\\\""
-AC_SUBST(GROONGA_DEFS)
+GRN_CFLAGS=""
+AC_SUBST(GRN_CFLAGS)
+GRN_DEFS=""
+GRN_DEFS="$GRN_DEFS -DGRN_PLUGINS_DIR=\\\"\"\$(pluginsdir)\"\\\""
+GRN_DEFS="$GRN_DEFS -DGRN_RELATIVE_PLUGINS_DIR=\\\"\"lib/\$(relative_pluginsdir)\"\\\""
+GRN_DEFS="$GRN_DEFS -DGRN_LOG_PATH=\\\"\"\$(grn_log_path)\"\\\""
+AC_SUBST(GRN_DEFS)
CFLAGS="$CFLAGS $OPT_CFLAGS "
LIBS="$LIBS $ZLIB_LIBS $LZO_LIBS $RT_LIBS $PTHREAD_LIBS $M_LIBS $NSL_LIBS $SOCKET_LIBS $WINDOWS_LIBS"
AC_DEFINE_UNQUOTED(CONFIGURE_OPTIONS, "$ac_configure_args", "specified configure options")
Modified: lib/Makefile.am (+2 -2)
===================================================================
--- lib/Makefile.am 2010-11-16 05:22:27 +0000 (8b81521)
+++ lib/Makefile.am 2010-11-16 05:32:44 +0000 (9f215fd)
@@ -1,9 +1,9 @@
lib_LTLIBRARIES = libgroonga.la
include $(top_srcdir)/version.sh
-AM_CFLAGS = -fno-strict-aliasing $(COVERAGE_CFLAGS) $(GROONGA_CFLAGS)
+AM_CFLAGS = -fno-strict-aliasing $(COVERAGE_CFLAGS) $(GRN_CFLAGS)
DEFAULT_INCLUDES = -I$(top_builddir) -I$(top_srcdir)/include
-DEFS += -D_REENTRANT -DGROONGA_VERSION=\"$(GROONGA_VERSION)\" $(GROONGA_DEFS)
+DEFS += -D_REENTRANT -DGROONGA_VERSION=\"$(GROONGA_VERSION)\" $(GRN_DEFS)
libgroonga_la_SOURCES = io.c str.c nfkc.c snip.c query.c store.c com.c ql.c scm.c ctx.c hash.c db.c pat.c ii.c token.c proc.c expr.c util.c plugin.c output.c geo.c
Modified: lib/ctx.c (+5 -5)
===================================================================
--- lib/ctx.c 2010-11-16 05:22:27 +0000 (1a126c2)
+++ lib/ctx.c 2010-11-16 05:32:44 +0000 (87c1006)
@@ -287,7 +287,7 @@ grn_ctx_impl_init(grn_ctx *ctx)
if (ctx == &grn_gctx) {
ctx->impl->match_escalation_threshold =
- GROONGA_DEFAULT_MATCH_ESCALATION_THRESHOLD;
+ GRN_DEFAULT_MATCH_ESCALATION_THRESHOLD;
} else {
ctx->impl->match_escalation_threshold =
grn_get_default_match_escalation_threshold();
@@ -504,7 +504,7 @@ grn_ctx_fin(grn_ctx *ctx)
}
grn_timeval grn_starttime;
-const char *grn_log_path = GROONGA_LOG_PATH;
+const char *grn_log_path = GRN_LOG_PATH;
const char *grn_qlog_path = NULL;
static FILE *default_logger_fp = NULL;
@@ -604,7 +604,7 @@ grn_init(void)
ctx->next = ctx;
ctx->prev = ctx;
grn_ctx_init(ctx, 0);
- ctx->encoding = grn_strtoenc(GROONGA_DEFAULT_ENCODING);
+ ctx->encoding = grn_strtoenc(GRN_DEFAULT_ENCODING);
grn_true = &grn_true_;
grn_false = &grn_false_;
grn_null = &grn_null_;
@@ -706,7 +706,7 @@ grn_set_default_encoding(grn_encoding encoding)
{
switch (encoding) {
case GRN_ENC_DEFAULT :
- grn_gctx.encoding = grn_strtoenc(GROONGA_DEFAULT_ENCODING);
+ grn_gctx.encoding = grn_strtoenc(GRN_DEFAULT_ENCODING);
return GRN_SUCCESS;
case GRN_ENC_NONE :
case GRN_ENC_EUC_JP :
@@ -833,7 +833,7 @@ grn_ctx_get_match_escalation_threshold(grn_ctx *ctx)
if (ctx->impl) {
return ctx->impl->match_escalation_threshold;
} else {
- return GROONGA_DEFAULT_MATCH_ESCALATION_THRESHOLD;
+ return GRN_DEFAULT_MATCH_ESCALATION_THRESHOLD;
}
}
Modified: lib/expr.c (+1 -1)
===================================================================
--- lib/expr.c 2010-11-16 05:22:27 +0000 (7298f7d)
+++ lib/expr.c 2010-11-16 05:32:44 +0000 (383f1da)
@@ -5552,7 +5552,7 @@ grn_expr_parse(grn_ctx *ctx, grn_obj *expr,
GRN_INT32_PUT(ctx, &efsi.op_stack, default_op);
GRN_INT32_PUT(ctx, &efsi.mode_stack, default_mode);
efsi.default_flags = efsi.flags = flags;
- efsi.escalation_threshold = GROONGA_DEFAULT_MATCH_ESCALATION_THRESHOLD;
+ efsi.escalation_threshold = GRN_DEFAULT_MATCH_ESCALATION_THRESHOLD;
efsi.escalation_decaystep = DEFAULT_DECAYSTEP;
efsi.weight_offset = 0;
efsi.opt.weight_vector = NULL;
Modified: lib/plugin.c (+4 -4)
===================================================================
--- lib/plugin.c 2010-11-16 05:22:27 +0000 (6102266)
+++ lib/plugin.c 2010-11-16 05:32:44 +0000 (c4d1021)
@@ -309,7 +309,7 @@ default_plugins_dir(void)
DWORD dll_filename_size;
dll_filename_size = GetModuleFileNameW(NULL, dll_filename, MAX_PATH);
if (dll_filename_size == 0) {
- win32_plugins_dir = GROONGA_PLUGINS_DIR;
+ win32_plugins_dir = GRN_PLUGINS_DIR;
} else {
char *plugins_dir;
DWORD ansi_dll_filename_size;
@@ -317,10 +317,10 @@ default_plugins_dir(void)
WideCharToMultiByte(CP_ACP, 0, dll_filename, dll_filename_size,
NULL, 0, NULL, NULL);
if (ansi_dll_filename_size == 0) {
- win32_plugins_dir = GROONGA_PLUGINS_DIR;
+ win32_plugins_dir = GRN_PLUGINS_DIR;
} else {
char *path;
- const char *relative_path = GROONGA_RELATIVE_PLUGINS_DIR;
+ const char *relative_path = GRN_RELATIVE_PLUGINS_DIR;
plugins_dir = malloc(ansi_dll_filename_size +
strlen(relative_path));
WideCharToMultiByte(CP_ACP, 0, dll_filename, dll_filename_size,
@@ -355,7 +355,7 @@ default_plugins_dir(void)
return win32_plugins_dir;
}
#else /* WIN32 */
-# define default_plugins_dir() GROONGA_PLUGINS_DIR;
+# define default_plugins_dir() GRN_PLUGINS_DIR;
#endif /* WIN32 */
grn_rc
Modified: lib/query.c (+1 -1)
===================================================================
--- lib/query.c 2010-11-16 05:22:27 +0000 (4240982)
+++ lib/query.c 2010-11-16 05:32:44 +0000 (c0fb2a6)
@@ -446,7 +446,7 @@ grn_query_open(grn_ctx *ctx, const char *str, unsigned int str_len,
q->max_cells = max_cells;
q->cur_cell = 0;
q->cur_expr = 0;
- q->escalation_threshold = GROONGA_DEFAULT_MATCH_ESCALATION_THRESHOLD;
+ q->escalation_threshold = GRN_DEFAULT_MATCH_ESCALATION_THRESHOLD;
q->escalation_decaystep = DEFAULT_DECAYSTEP;
q->weight_offset = 0;
q->opt.weight_vector = NULL;
Modified: src/Makefile.am (+2 -2)
===================================================================
--- src/Makefile.am 2010-11-16 05:22:27 +0000 (dbcfbe2)
+++ src/Makefile.am 2010-11-16 05:32:44 +0000 (6918be7)
@@ -1,8 +1,8 @@
bin_PROGRAMS = groonga grntest
noinst_PROGRAMS = grnslap
-AM_CFLAGS = -fno-strict-aliasing $(COVERAGE_CFLAGS) $(GROONGA_CFLAGS)
-DEFS += $(GROONGA_CFLAGS) -DDEFAULT_DOCUMENT_ROOT=\"$(pkgdatadir)/admin_html\"
+AM_CFLAGS = -fno-strict-aliasing $(COVERAGE_CFLAGS) $(GRN_CFLAGS)
+DEFS += $(GRN_CFLAGS) -DDEFAULT_DOCUMENT_ROOT=\"$(pkgdatadir)/admin_html\"
AM_LDFLAGS = -no-undefined
Modified: src/groonga.c (+1 -1)
===================================================================
--- src/groonga.c 2010-11-16 05:22:27 +0000 (c1674ca)
+++ src/groonga.c 2010-11-16 05:32:44 +0000 (c3d792c)
@@ -135,7 +135,7 @@ show_version(void)
#ifdef HOST_CPU
printf("%s,", HOST_CPU);
#endif
- printf("%s", GROONGA_DEFAULT_ENCODING);
+ printf("%s", GRN_DEFAULT_ENCODING);
printf(",match-escalation-threshold=%" GRN_FMT_LLD,
grn_get_default_match_escalation_threshold());