Browse Source

bumped 2.2.4-dev

git-svn-id: svn://svn.sphinxsearch.com/sphinx/trunk@4691 406a0c4d-033a-0410-8de8-e80135713968
deogar 11 years ago
parent
commit
45450126aa
13 changed files with 563 additions and 297 deletions
  1. 10 10
      configure
  2. 1 1
      configure.ac
  3. 2 2
      doc/indexer.1
  4. 2 2
      doc/indextool.1
  5. 5 5
      doc/manpages.xml
  6. 2 2
      doc/search.1
  7. 2 2
      doc/searchd.1
  8. 2 2
      doc/spelldump.1
  9. 260 260
      doc/sphinx.html
  10. 273 7
      doc/sphinx.txt
  11. 1 1
      doc/sphinx.xml
  12. 1 1
      mysqlse/ha_sphinx.cc
  13. 2 2
      src/sphinx.h

+ 10 - 10
configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for sphinx 2.2.3.
+# Generated by GNU Autoconf 2.68 for sphinx 2.2.4.
 #
 # Report bugs to <shodan(at)sphinxsearch.com>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sphinx'
 PACKAGE_TARNAME='sphinx'
-PACKAGE_VERSION='2.2.3'
-PACKAGE_STRING='sphinx 2.2.3'
+PACKAGE_VERSION='2.2.4'
+PACKAGE_STRING='sphinx 2.2.4'
 PACKAGE_BUGREPORT='shodan(at)sphinxsearch.com'
 PACKAGE_URL=''
 
@@ -1302,7 +1302,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sphinx 2.2.3 to adapt to many kinds of systems.
+\`configure' configures sphinx 2.2.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1368,7 +1368,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sphinx 2.2.3:";;
+     short | recursive ) echo "Configuration of sphinx 2.2.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1492,7 +1492,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sphinx configure 2.2.3
+sphinx configure 2.2.4
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1995,7 +1995,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sphinx $as_me 2.2.3, which was
+It was created by sphinx $as_me 2.2.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2824,7 +2824,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sphinx'
- VERSION='2.2.3'
+ VERSION='2.2.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9554,7 +9554,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sphinx $as_me 2.2.3, which was
+This file was extended by sphinx $as_me 2.2.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9620,7 +9620,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-sphinx config.status 2.2.3
+sphinx config.status 2.2.4
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

+ 1 - 1
configure.ac

@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([sphinx], [2.2.3], [shodan(at)sphinxsearch.com])
+AC_INIT([sphinx], [2.2.4], [shodan(at)sphinxsearch.com])
 
 dnl --------------------------------------------------------------------------
 

+ 2 - 2
doc/indexer.1

@@ -4,10 +4,10 @@
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
 .\"      Date: 05/13/2014
 .\"    Manual: Sphinxsearch
-.\"    Source: 2.2.3-beta
+.\"    Source: 2.2.4-dev
 .\"  Language: English
 .\"
-.TH "INDEXER" "1" "05/13/2014" "2\&.2\&.3\-beta" "Sphinxsearch"
+.TH "INDEXER" "1" "05/13/2014" "2\&.2\&.4\-dev" "Sphinxsearch"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

+ 2 - 2
doc/indextool.1

@@ -4,10 +4,10 @@
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
 .\"      Date: 05/13/2014
 .\"    Manual: Sphinxsearch
-.\"    Source: 2.2.3-beta
+.\"    Source: 2.2.4-dev
 .\"  Language: English
 .\"
-.TH "INDEXTOOL" "1" "05/13/2014" "2\&.2\&.3\-beta" "Sphinxsearch"
+.TH "INDEXTOOL" "1" "05/13/2014" "2\&.2\&.4\-dev" "Sphinxsearch"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

+ 5 - 5
doc/manpages.xml

@@ -12,7 +12,7 @@
 
       <refmiscinfo class="manual">Sphinxsearch</refmiscinfo>
 
-      <refmiscinfo class="version">2.2.3-beta</refmiscinfo>
+      <refmiscinfo class="version">2.2.4-dev</refmiscinfo>
     </refmeta>
 
     <refnamediv>
@@ -467,7 +467,7 @@ $ indexer mysmallindex mybigindex</programlisting>
 
       <refmiscinfo class="manual">Sphinxsearch</refmiscinfo>
 
-      <refmiscinfo class="version">2.2.3-beta</refmiscinfo>
+      <refmiscinfo class="version">2.2.4-dev</refmiscinfo>
     </refmeta>
 
     <refnamediv>
@@ -932,7 +932,7 @@ $ searchd --config /home/myuser/sphinx.conf --status</programlisting>
 
       <refmiscinfo class="manual">Sphinxsearch</refmiscinfo>
 
-      <refmiscinfo class="version">2.2.3-beta</refmiscinfo>
+      <refmiscinfo class="version">2.2.4-dev</refmiscinfo>
     </refmeta>
 
     <refnamediv>
@@ -1321,7 +1321,7 @@ $ searchd --config /home/myuser/sphinx.conf --status</programlisting>
 
       <refmiscinfo class="manual">Sphinxsearch</refmiscinfo>
 
-      <refmiscinfo class="version">2.2.3-beta</refmiscinfo>
+      <refmiscinfo class="version">2.2.4-dev</refmiscinfo>
     </refmeta>
 
     <refnamediv>
@@ -1440,7 +1440,7 @@ zoning &gt; zoning </programlisting></para>
 
       <refmiscinfo class="manual">Sphinxsearch</refmiscinfo>
 
-      <refmiscinfo class="version">2.2.3-beta</refmiscinfo>
+      <refmiscinfo class="version">2.2.4-dev</refmiscinfo>
     </refmeta>
 
     <refnamediv>

+ 2 - 2
doc/search.1

@@ -4,10 +4,10 @@
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
 .\"      Date: 05/13/2014
 .\"    Manual: Sphinxsearch
-.\"    Source: 2.2.3-beta
+.\"    Source: 2.2.4-dev
 .\"  Language: English
 .\"
-.TH "SEARCH" "1" "05/13/2014" "2\&.2\&.3\-beta" "Sphinxsearch"
+.TH "SEARCH" "1" "05/13/2014" "2\&.2\&.4\-dev" "Sphinxsearch"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

+ 2 - 2
doc/searchd.1

@@ -4,10 +4,10 @@
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
 .\"      Date: 05/13/2014
 .\"    Manual: Sphinxsearch
-.\"    Source: 2.2.3-beta
+.\"    Source: 2.2.4-dev
 .\"  Language: English
 .\"
-.TH "SEARCHD" "1" "05/13/2014" "2\&.2\&.3\-beta" "Sphinxsearch"
+.TH "SEARCHD" "1" "05/13/2014" "2\&.2\&.4\-dev" "Sphinxsearch"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

+ 2 - 2
doc/spelldump.1

@@ -4,10 +4,10 @@
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
 .\"      Date: 05/13/2014
 .\"    Manual: Sphinxsearch
-.\"    Source: 2.2.3-beta
+.\"    Source: 2.2.4-dev
 .\"  Language: English
 .\"
-.TH "SPELLDUMP" "1" "05/13/2014" "2\&.2\&.3\-beta" "Sphinxsearch"
+.TH "SPELLDUMP" "1" "05/13/2014" "2\&.2\&.4\-dev" "Sphinxsearch"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

File diff suppressed because it is too large
+ 260 - 260
doc/sphinx.html


File diff suppressed because it is too large
+ 273 - 7
doc/sphinx.txt


+ 1 - 1
doc/sphinx.xml

@@ -5,7 +5,7 @@
 ]>
 <book lang="en">
 
-<title>Sphinx 2.2.3-beta reference manual</title>
+<title>Sphinx 2.2.4-dev reference manual</title>
 <subtitle>Free open-source SQL full-text search engine</subtitle>
 
 <bookinfo>

+ 1 - 1
mysqlse/ha_sphinx.cc

@@ -154,7 +154,7 @@ void sphUnalignedWrite ( void * pPtr, const T & tVal )
 #define SPHINXSE_MAX_ALLOC			(16*1024*1024)
 #define SPHINXSE_MAX_KEYWORDSTATS	4096
 
-#define SPHINXSE_VERSION			"2.2.3-beta"
+#define SPHINXSE_VERSION			"2.2.4-dev"
 
 // FIXME? the following is cut-n-paste from sphinx.h and searchd.cpp
 // cut-n-paste is somewhat simpler that adding dependencies however..

+ 2 - 2
src/sphinx.h

@@ -196,10 +196,10 @@ inline const	DWORD *	STATIC2DOCINFO ( const DWORD * pAttrs )	{ return STATIC2DOC
 #include "sphinxversion.h"
 
 #ifndef SPHINX_TAG
-#define SPHINX_TAG "-beta"
+#define SPHINX_TAG "-dev"
 #endif
 
-#define SPHINX_VERSION			"2.2.3" SPHINX_BITS_TAG SPHINX_TAG " (" SPH_SVN_TAGREV ")"
+#define SPHINX_VERSION			"2.2.4" SPHINX_BITS_TAG SPHINX_TAG " (" SPH_SVN_TAGREV ")"
 #define SPHINX_BANNER			"Sphinx " SPHINX_VERSION "\nCopyright (c) 2001-2014, Andrew Aksyonoff\nCopyright (c) 2008-2014, Sphinx Technologies Inc (http://sphinxsearch.com)\n\n"
 #define SPHINX_SEARCHD_PROTO	1
 #define SPHINX_CLIENT_VERSION	1

Some files were not shown because too many files changed in this diff