null+****@clear*****
null+****@clear*****
2012年 4月 12日 (木) 15:55:26 JST
Kouhei Sutou 2012-04-12 15:55:26 +0900 (Thu, 12 Apr 2012)
New Revision: 592be6de749b6050989abfff736cb70a694726ac
Log:
GROONGA_VERSEION -> GRN_VERSION
Modified files:
Makefile.am
configure.ac
doc/source/conf.py
groonga.pc.in
lib/Makefile.am
lib/ctx.c
mkmfwin32.vbs
version-gen.sh
Modified: Makefile.am (+1 -1)
===================================================================
--- Makefile.am 2012-04-12 15:48:29 +0900 (c3376dd)
+++ Makefile.am 2012-04-12 15:55:26 +0900 (e856107)
@@ -31,7 +31,7 @@ $(srcdir)/version.sh: FORCE
include $(srcdir)/version.sh
dist-hook:
- echo "$(GROONGA_VERSION)" > $(distdir)/version
+ echo "$(GRN_VERSION)" > $(distdir)/version
@if test -d $(top_srcdir)/.git; then \
cd $(top_srcdir) && release/gitlog2changelog.py > \
$(distdir)/ChangeLog; \
Modified: configure.ac (+1 -1)
===================================================================
--- configure.ac 2012-04-12 15:48:29 +0900 (18b49ab)
+++ configure.ac 2012-04-12 15:55:26 +0900 (3198825)
@@ -189,7 +189,7 @@ AC_SUBST(GRN_DLL_FILENAME)
if test "$srcdir/version.sh"; then
source "$srcdir/version.sh"
- AC_SUBST(GROONGA_VERSION)
+ AC_SUBST(GRN_VERSION)
fi
AC_CONFIG_FILES([
Modified: doc/source/conf.py (+3 -3)
===================================================================
--- doc/source/conf.py 2012-04-12 15:48:29 +0900 (3ce53b8)
+++ doc/source/conf.py 2012-04-12 15:55:26 +0900 (77107c7)
@@ -71,13 +71,13 @@ copyright = u'2009-' + unicode(datetime.today().year) + ', Brazil, Inc'
#
# read version from env/file.
-if os.environ.has_key('GROONGA_VERSION'):
- version_sh = 'GROONGA_VERSION=' + os.environ['GROONGA_VERSION']
+if os.environ.has_key('GRN_VERSION'):
+ version_sh = 'GRN_VERSION=' + os.environ['GRN_VERSION']
else:
os.system('../../version-gen.sh')
version_sh = open(os.path.join(os.path.dirname(__file__), '../../version.sh')).read()
-release_regex = re.compile(r'^GROONGA_VERSION=(?P<release>.*)$')
+release_regex = re.compile(r'^GRN_VERSION=(?P<release>.*)$')
# The full version, including alpha/beta/rc tags.
release = release_regex.search(version_sh).group('release')
Modified: groonga.pc.in (+1 -1)
===================================================================
--- groonga.pc.in 2012-04-12 15:48:29 +0900 (f53a923)
+++ groonga.pc.in 2012-04-12 15:55:26 +0900 (e1060ad)
@@ -8,7 +8,7 @@ datadir=@datadir@
document_root=@GRN_EXPANDED_DEFAULT_DOCUMENT_ROOT@
groonga=${bindir}/groonga ＠ EXEEXT@
groonga_suggest_create_dataset=${bindir}/groonga-suggest-create-dataset ＠ EXEEXT@
-groonga_version=@GROONGA_VERSION@
+groonga_version=@GRN_VERSION@
Name: Groonga
Description: An Embeddable Fulltext Search Engine
Modified: lib/Makefile.am (+1 -1)
===================================================================
--- lib/Makefile.am 2012-04-12 15:48:29 +0900 (93b7a18)
+++ lib/Makefile.am 2012-04-12 15:55:26 +0900 (707b888)
@@ -9,7 +9,7 @@ AM_CFLAGS = \
$(GRN_CFLAGS) \
$(MESSAGE_PACK_CFLAGS)
DEFAULT_INCLUDES = -I$(top_builddir) -I$(top_srcdir)/include
-DEFS += -D_REENTRANT -DGROONGA_VERSION=\"$(GROONGA_VERSION)\" $(GRN_DEFS)
+DEFS += -D_REENTRANT -DGRN_VERSION=\"$(GRN_VERSION)\" $(GRN_DEFS)
libgroonga_la_SOURCES = \
com.c \
Modified: lib/ctx.c (+1 -1)
===================================================================
--- lib/ctx.c 2012-04-12 15:48:29 +0900 (f65b1af)
+++ lib/ctx.c 2012-04-12 15:55:26 +0900 (c996807)
@@ -2352,7 +2352,7 @@ grn_assert(grn_ctx *ctx, int cond, const char* file, int line, const char* func)
const char *
grn_get_version(void)
{
- return GROONGA_VERSION;
+ return GRN_VERSION;
}
const char *
Modified: mkmfwin32.vbs (+1 -1)
===================================================================
--- mkmfwin32.vbs 2012-04-12 15:48:29 +0900 (0e3a2ed)
+++ mkmfwin32.vbs 2012-04-12 15:55:26 +0900 (eceeaba)
@@ -133,7 +133,7 @@ sub common_header()
ts.write "\"""" \" + vbLf
if make_lib = 1 then
- ts.write " -DGROONGA_VERSION=""\"""
+ ts.write " -DGRN_VERSION=""\"""
ts.write revision
ts.write "\"""" \" + vbLf
end if
Modified: version-gen.sh (+2 -2)
===================================================================
--- version-gen.sh 2012-04-12 15:48:29 +0900 (d3ba328)
+++ version-gen.sh 2012-04-12 15:55:26 +0900 (58725bb)
@@ -20,12 +20,12 @@ GRN_VN=`expr "$GRN_VN" : v*'\(.*\)'`
if test -r $GRN_VERSION_SH
then
- GRN_VN_OLD=`sed -e 's/^GROONGA_VERSION=//' <$GRN_VERSION_SH`
+ GRN_VN_OLD=`sed -e 's/^GRN_VERSION=//' <$GRN_VERSION_SH`
else
GRN_VN_OLD=unset
fi
if test "$GRN_VN_OLD" != "$GRN_VN"
then
- echo "GROONGA_VERSION=$GRN_VN" >$GRN_VERSION_SH
+ echo "GRN_VERSION=$GRN_VN" >$GRN_VERSION_SH
fi