merged rt branch (upto r2149) back into trunk

nzinfo · Jan 4, 2010 · 14a1201 · 14a1201
1 parent 8849031
commit 14a1201
Show file tree

Hide file tree

Showing 57 changed files with 9,507 additions and 1,186 deletions.
diff --git a/codeblocks/libsphinx.cbp b/codeblocks/libsphinx.cbp
@@ -51,9 +51,13 @@
 		<Unit filename="../src/sphinxexpr.cpp" />
 		<Unit filename="../src/sphinxexpr.h" />
 		<Unit filename="../src/sphinxfilter.cpp" />
+		<Unit filename="../src/sphinxfilter.h" />
+		<Unit filename="../src/sphinxint.h" />
 		<Unit filename="../src/sphinxmetaphone.cpp" />
 		<Unit filename="../src/sphinxquery.cpp" />
 		<Unit filename="../src/sphinxquery.h" />
+		<Unit filename="../src/sphinxrt.cpp" />
+		<Unit filename="../src/sphinxrt.h" />
 		<Unit filename="../src/sphinxsearch.cpp" />
 		<Unit filename="../src/sphinxsearch.h" />
 		<Unit filename="../src/sphinxsort.cpp" />

diff --git a/codeblocks/testrt.cbp b/codeblocks/testrt.cbp
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="testrt" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="./bin/Debug/tests" prefix_auto="1" extension_auto="1" />
+				<Option object_output="./junk/Debug" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-O0" />
+				</Compiler>
+				<Linker>
+					<Add library="bin/Debug/libsphinx.a" />
+				</Linker>
+			</Target>
+			<Target title="Release">
+				<Option output="./bin/Release/tests" prefix_auto="1" extension_auto="1" />
+				<Option object_output="./junk/Release" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-O3" />
+					<Add option="-Wall" />
+					<Add option="-DNDEBUG" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+					<Add library="bin/Release/libsphinx.a" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-D_FILE_OFFSET_BITS=64" />
+			<Add option="-DHAVE_CONFIG_H" />
+			<Add directory="../config/" />
+		</Compiler>
+		<Linker>
+			<Add library="pthread" />
+			<Add library="rt" />
+			<Add library="expat" />
+			<Add library="mysqlclient" />
+		</Linker>
+		<Unit filename="../src/testrt.cpp" />
+		<Extensions>
+			<AutoVersioning>
+				<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
+				<Settings autoincrement="1" date_declarations="1" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
+				<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
+			</AutoVersioning>
+			<envvars />
+			<code_completion />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/sphinx.workspace b/sphinx.workspace
@@ -2,7 +2,7 @@
 <CodeBlocks_workspace_file>
 	<Workspace title="Sphinx">
 		<Project filename="codeblocks/libsphinx.cbp" />
-		<Project filename="codeblocks/indexer.cbp" active="1">
+		<Project filename="codeblocks/indexer.cbp">
 			<Depends filename="codeblocks/libsphinx.cbp" />
 		</Project>
 		<Project filename="codeblocks/indextool.cbp">
@@ -20,5 +20,6 @@
 		<Project filename="codeblocks/tests.cbp">
 			<Depends filename="codeblocks/libsphinx.cbp" />
 		</Project>
+		<Project filename="codeblocks/testrt.cbp" active="1" />
 	</Workspace>
 </CodeBlocks_workspace_file>
diff --git a/sphinx05.sln b/sphinx05.sln
@@ -32,6 +32,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "indextool", "win\indextool0
 		{6A1685DE-0265-4243-965F-96CB53EBBCA6} = {6A1685DE-0265-4243-965F-96CB53EBBCA6}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrt", "win\testrt05.vcproj", "{651CEFE5-9BDB-4003-9D35-8D05FA2C06D7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6A1685DE-0265-4243-965F-96CB53EBBCA6} = {6A1685DE-0265-4243-965F-96CB53EBBCA6}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -66,6 +71,10 @@ Global
 		{6A78A67D-A743-4594-858A-A4F1C536A8C1}.Debug|Win32.Build.0 = Debug|Win32
 		{6A78A67D-A743-4594-858A-A4F1C536A8C1}.Release|Win32.ActiveCfg = Release|Win32
 		{6A78A67D-A743-4594-858A-A4F1C536A8C1}.Release|Win32.Build.0 = Release|Win32
+		{651CEFE5-9BDB-4003-9D35-8D05FA2C06D7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{651CEFE5-9BDB-4003-9D35-8D05FA2C06D7}.Debug|Win32.Build.0 = Debug|Win32
+		{651CEFE5-9BDB-4003-9D35-8D05FA2C06D7}.Release|Win32.ActiveCfg = Release|Win32
+		{651CEFE5-9BDB-4003-9D35-8D05FA2C06D7}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/sphinx08.sln b/sphinx08.sln
@@ -17,26 +17,27 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "searchd", "win\searchd08.vc
 		{6A1685DE-0265-4243-965F-96CB53EBBCA6} = {6A1685DE-0265-4243-965F-96CB53EBBCA6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "win\tests08.vcproj", "{B47166A1-4827-4D80-97E3-743BDE61146F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spelldump", "win\spelldump08.vcproj", "{AE5236EB-62AC-4AD9-81A3-F4BDC85D3876}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6A1685DE-0265-4243-965F-96CB53EBBCA6} = {6A1685DE-0265-4243-965F-96CB53EBBCA6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spelldump", "win\spelldump08.vcproj", "{AE5236EB-62AC-4AD9-81A3-F4BDC85D3876}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "indextool", "win\indextool08.vcproj", "{6A78A67D-A743-4594-858A-A4F1C536A8C1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6A1685DE-0265-4243-965F-96CB53EBBCA6} = {6A1685DE-0265-4243-965F-96CB53EBBCA6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "indextool", "win\indextool08.vcproj", "{6A78A67D-A743-4594-858A-A4F1C536A8C1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrt", "win\testrt08.vcproj", "{651CEFE5-9BDB-4003-9D35-8D05FA2C06D7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6A1685DE-0265-4243-965F-96CB53EBBCA6} = {6A1685DE-0265-4243-965F-96CB53EBBCA6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "win\tests08.vcproj", "{B47166A1-4827-4D80-97E3-743BDE61146F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6A1685DE-0265-4243-965F-96CB53EBBCA6} = {6A1685DE-0265-4243-965F-96CB53EBBCA6}
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(SubversionScc) = preSolution
-		Svn-Managed = True
-		Manager = AnkhSVN - Subversion Support for Visual Studio
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
@@ -76,14 +77,6 @@ Global
 		{0BBD34CB-5891-477F-B665-3D7C9FC22A02}.Release|Win32.Build.0 = Release|Win32
 		{0BBD34CB-5891-477F-B665-3D7C9FC22A02}.Release|x64.ActiveCfg = Release|x64
 		{0BBD34CB-5891-477F-B665-3D7C9FC22A02}.Release|x64.Build.0 = Release|x64
-		{B47166A1-4827-4D80-97E3-743BDE61146F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B47166A1-4827-4D80-97E3-743BDE61146F}.Debug|Win32.Build.0 = Debug|Win32
-		{B47166A1-4827-4D80-97E3-743BDE61146F}.Debug|x64.ActiveCfg = Debug|x64
-		{B47166A1-4827-4D80-97E3-743BDE61146F}.Debug|x64.Build.0 = Debug|x64
-		{B47166A1-4827-4D80-97E3-743BDE61146F}.Release|Win32.ActiveCfg = Release|Win32
-		{B47166A1-4827-4D80-97E3-743BDE61146F}.Release|Win32.Build.0 = Release|Win32
-		{B47166A1-4827-4D80-97E3-743BDE61146F}.Release|x64.ActiveCfg = Release|x64
-		{B47166A1-4827-4D80-97E3-743BDE61146F}.Release|x64.Build.0 = Release|x64
 		{AE5236EB-62AC-4AD9-81A3-F4BDC85D3876}.Debug|Win32.ActiveCfg = Debug|Win32
 		{AE5236EB-62AC-4AD9-81A3-F4BDC85D3876}.Debug|Win32.Build.0 = Debug|Win32
 		{AE5236EB-62AC-4AD9-81A3-F4BDC85D3876}.Debug|x64.ActiveCfg = Debug|x64
@@ -100,6 +93,22 @@ Global
 		{6A78A67D-A743-4594-858A-A4F1C536A8C1}.Release|Win32.Build.0 = Release|Win32
 		{6A78A67D-A743-4594-858A-A4F1C536A8C1}.Release|x64.ActiveCfg = Release|x64
 		{6A78A67D-A743-4594-858A-A4F1C536A8C1}.Release|x64.Build.0 = Release|x64
+		{651CEFE5-9BDB-4003-9D35-8D05FA2C06D7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{651CEFE5-9BDB-4003-9D35-8D05FA2C06D7}.Debug|Win32.Build.0 = Debug|Win32
+		{651CEFE5-9BDB-4003-9D35-8D05FA2C06D7}.Debug|x64.ActiveCfg = Debug|x64
+		{651CEFE5-9BDB-4003-9D35-8D05FA2C06D7}.Debug|x64.Build.0 = Debug|x64
+		{651CEFE5-9BDB-4003-9D35-8D05FA2C06D7}.Release|Win32.ActiveCfg = Release|Win32
+		{651CEFE5-9BDB-4003-9D35-8D05FA2C06D7}.Release|Win32.Build.0 = Release|Win32
+		{651CEFE5-9BDB-4003-9D35-8D05FA2C06D7}.Release|x64.ActiveCfg = Release|x64
+		{651CEFE5-9BDB-4003-9D35-8D05FA2C06D7}.Release|x64.Build.0 = Release|x64
+		{B47166A1-4827-4D80-97E3-743BDE61146F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B47166A1-4827-4D80-97E3-743BDE61146F}.Debug|Win32.Build.0 = Debug|Win32
+		{B47166A1-4827-4D80-97E3-743BDE61146F}.Debug|x64.ActiveCfg = Debug|x64
+		{B47166A1-4827-4D80-97E3-743BDE61146F}.Debug|x64.Build.0 = Debug|x64
+		{B47166A1-4827-4D80-97E3-743BDE61146F}.Release|Win32.ActiveCfg = Release|Win32
+		{B47166A1-4827-4D80-97E3-743BDE61146F}.Release|Win32.Build.0 = Release|Win32
+		{B47166A1-4827-4D80-97E3-743BDE61146F}.Release|x64.ActiveCfg = Release|x64
+		{B47166A1-4827-4D80-97E3-743BDE61146F}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,7 +1,7 @@
 SRC_SPHINX = sphinx.cpp sphinxexcerpt.cpp sphinxquery.cpp \
 	sphinxsoundex.cpp sphinxmetaphone.cpp sphinxstemen.cpp sphinxstemru.cpp sphinxstemcz.cpp \
 	sphinxutils.cpp md5.cpp sphinxstd.cpp sphinxsort.cpp sphinxexpr.cpp sphinxfilter.cpp \
-	sphinxsearch.cpp
+	sphinxsearch.cpp sphinxrt.cpp
 
 noinst_LIBRARIES = libsphinx.a
 libsphinx_a_SOURCES = $(SRC_SPHINX)

diff --git a/src/Makefile.in b/src/Makefile.in
@@ -55,7 +55,8 @@ am__objects_1 = sphinx.$(OBJEXT) sphinxexcerpt.$(OBJEXT) \
 	sphinxstemru.$(OBJEXT) sphinxstemcz.$(OBJEXT) \
 	sphinxutils.$(OBJEXT) md5.$(OBJEXT) sphinxstd.$(OBJEXT) \
 	sphinxsort.$(OBJEXT) sphinxexpr.$(OBJEXT) \
-	sphinxfilter.$(OBJEXT) sphinxsearch.$(OBJEXT)
+	sphinxfilter.$(OBJEXT) sphinxsearch.$(OBJEXT) \
+	sphinxrt.$(OBJEXT)
 am_libsphinx_a_OBJECTS = $(am__objects_1)
 libsphinx_a_OBJECTS = $(am_libsphinx_a_OBJECTS)
 am__installdirs = "$(DESTDIR)$(bindir)"
@@ -207,7 +208,7 @@ top_srcdir = @top_srcdir@
 SRC_SPHINX = sphinx.cpp sphinxexcerpt.cpp sphinxquery.cpp \
 	sphinxsoundex.cpp sphinxmetaphone.cpp sphinxstemen.cpp sphinxstemru.cpp sphinxstemcz.cpp \
 	sphinxutils.cpp md5.cpp sphinxstd.cpp sphinxsort.cpp sphinxexpr.cpp sphinxfilter.cpp \
-	sphinxsearch.cpp
+	sphinxsearch.cpp sphinxrt.cpp
 
 noinst_LIBRARIES = libsphinx.a
 libsphinx_a_SOURCES = $(SRC_SPHINX)
@@ -328,6 +329,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sphinxfilter.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sphinxmetaphone.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sphinxquery.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sphinxrt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sphinxsearch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sphinxsort.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sphinxsoundex.Po@am__quote@