unimrcp vs2008 upgrade

libs/apr-util/xml/expat/lib/config.hnw

@@ -19,5 +19,6 @@
 #define XML_DTD 1
 #define XML_BYTE_ORDER 12
 #define XML_CONTEXT_BYTES 1024
+#define VERSION 1
 
 #endif /* ndef CONFIG_HNW */

libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj

@@ -270,19 +270,19 @@
 				>
 			</File>
 			<File
-				RelativePath=".\include\apt_log.h"
+				RelativePath=".\include\apt_header_field.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\apt_net.h"
+				RelativePath=".\include\apt_log.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\apt_net_client_task.h"
+				RelativePath=".\include\apt_multipart_content.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\apt_net_server_task.h"
+				RelativePath=".\include\apt_net.h"
 				>
 			</File>
 			<File
@@ -297,6 +297,10 @@
 				RelativePath=".\include\apt_pair.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\apt_poller_task.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\apt_pollset.h"
 				>
@@ -325,10 +329,18 @@
 				RelativePath=".\include\apt_test_suite.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\apt_text_message.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\apt_text_stream.h"
 				>
 			</File>
+			<File
+				RelativePath=".\include\apt_timer_queue.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="src"
@@ -347,19 +359,19 @@
 				>
 			</File>
 			<File
-				RelativePath=".\src\apt_log.c"
+				RelativePath=".\src\apt_header_field.c"
 				>
 			</File>
 			<File
-				RelativePath=".\src\apt_net.c"
+				RelativePath=".\src\apt_log.c"
 				>
 			</File>
 			<File
-				RelativePath=".\src\apt_net_client_task.c"
+				RelativePath=".\src\apt_multipart_content.c"
 				>
 			</File>
 			<File
-				RelativePath=".\src\apt_net_server_task.c"
+				RelativePath=".\src\apt_net.c"
 				>
 			</File>
 			<File
@@ -374,6 +386,10 @@
 				RelativePath=".\src\apt_pair.c"
 				>
 			</File>
+			<File
+				RelativePath=".\src\apt_poller_task.c"
+				>
+			</File>
 			<File
 				RelativePath=".\src\apt_pollset.c"
 				>
@@ -398,10 +414,18 @@
 				RelativePath=".\src\apt_test_suite.c"
 				>
 			</File>
+			<File
+				RelativePath=".\src\apt_text_message.c"
+				>
+			</File>
 			<File
 				RelativePath=".\src\apt_text_stream.c"
 				>
 			</File>
+			<File
+				RelativePath=".\src\apt_timer_queue.c"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

libs/unimrcp/libs/mpf/mpf.2008.vcproj

@@ -431,10 +431,6 @@
 				RelativePath=".\include\mpf_termination_factory.h"
 				>
 			</File>
-			<File
-				RelativePath=".\include\mpf_timer_manager.h"
-				>
-			</File>
 			<File
 				RelativePath=".\include\mpf_types.h"
 				>
@@ -556,10 +552,6 @@
 				RelativePath=".\src\mpf_termination_factory.c"
 				>
 			</File>
-			<File
-				RelativePath=".\src\mpf_timer_manager.c"
-				>
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj

@@ -274,6 +274,10 @@
 			Name="src"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			>
+			<File
+				RelativePath=".\src\mrcp_application.c"
+				>
+			</File>
 			<File
 				RelativePath=".\src\mrcp_client.c"
 				>

libs/unimrcp/libs/mrcp-engine/mrcpengine.2008.vcproj

@@ -130,12 +130,68 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath=".\include\mrcp_engine_factory.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mrcp_engine_iface.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mrcp_engine_impl.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mrcp_engine_loader.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mrcp_engine_plugin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mrcp_engine_types.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mrcp_recog_engine.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mrcp_recog_state_machine.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mrcp_recorder_engine.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mrcp_recorder_state_machine.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\mrcp_resource_engine.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\mrcp_resource_plugin.h"
+				RelativePath=".\include\mrcp_state_machine.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mrcp_synth_engine.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mrcp_synth_state_machine.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mrcp_verifier_engine.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\mrcp_verifier_state_machine.h"
 				>
 			</File>
 		</Filter>
@@ -144,7 +200,35 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			>
 			<File
-				RelativePath=".\src\mrcp_resource_engine.c"
+				RelativePath=".\src\mrcp_engine_factory.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mrcp_engine_iface.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mrcp_engine_impl.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mrcp_engine_loader.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mrcp_recog_state_machine.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mrcp_recorder_state_machine.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mrcp_synth_state_machine.c"
+				>
+			</File>
+			<File
+				RelativePath=".\src\mrcp_verifier_state_machine.c"
 				>
 			</File>
 		</Filter>

libs/unimrcp/libs/mrcp/mrcp.2008.vcproj

@@ -277,6 +277,10 @@
 					RelativePath=".\message\include\mrcp_generic_header.h"
 					>
 				</File>
+				<File
+					RelativePath=".\message\include\mrcp_header.h"
+					>
+				</File>
 				<File
 					RelativePath=".\message\include\mrcp_header_accessor.h"
 					>
@@ -298,6 +302,10 @@
 					RelativePath=".\message\src\mrcp_generic_header.c"
 					>
 				</File>
+				<File
+					RelativePath=".\message\src\mrcp_header.c"
+					>
+				</File>
 				<File
 					RelativePath=".\message\src\mrcp_header_accessor.c"
 					>
@@ -385,6 +393,14 @@
 					RelativePath=".\resources\include\mrcp_synth_resource.h"
 					>
 				</File>
+				<File
+					RelativePath=".\resources\include\mrcp_verifier_header.h"
+					>
+				</File>
+				<File
+					RelativePath=".\resources\include\mrcp_verifier_resource.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="src"
@@ -414,6 +430,14 @@
 					RelativePath=".\resources\src\mrcp_synth_resource.c"
 					>
 				</File>
+				<File
+					RelativePath=".\resources\src\mrcp_verifier_header.c"
+					>
+				</File>
+				<File
+					RelativePath=".\resources\src\mrcp_verifier_resource.c"
+					>
+				</File>
 			</Filter>
 		</Filter>
 	</Files>

libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.2008.vcproj

@@ -132,6 +132,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\..\build\uni_revision.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\build\uni_version.h"
 				>

libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.2008.vcproj

@@ -132,6 +132,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\..\build\uni_revision.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\build\uni_version.h"
 				>

libs/unimrcp/tests/apttest/apttest.2008.vcproj

@@ -153,6 +153,10 @@
 				RelativePath=".\src\main.c"
 				>
 			</File>
+			<File
+				RelativePath=".\src\multipart_suite.c"
+				>
+			</File>
 			<File
 				RelativePath=".\src\task_suite.c"
 				>

libs/unimrcp/tests/mrcptest/mrcptest.2008.vcproj

@@ -157,6 +157,10 @@
 				RelativePath=".\src\set_get_suite.c"
 				>
 			</File>
+			<File
+				RelativePath=".\src\transparent_set_get_suite.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="include"

libs/win32/apr-util/libaprutil.2008.vcproj

@@ -52,7 +52,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/EHsc "
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"
+				AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-util\xml\expat\lib";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"
 				PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile="$(IntDir)/libaprutil.pch"
@@ -150,7 +150,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/EHsc "
 				Optimization="0"
-				AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"
+				AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-util\xml\expat\lib";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"
 				PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile="$(IntDir)/libaprutil.pch"
@@ -246,7 +246,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"
+				AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-util\xml\expat\lib";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"
 				PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -347,7 +347,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"
+				AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-util\xml\expat\lib";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"
 				PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -2391,6 +2391,26 @@
 					</FileConfiguration>
 				</File>
 			</Filter>
+			<Filter
+				Name="xml"
+				>
+				<File
+					RelativePath="..\..\apr-util\xml\apr_xml.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\apr-util\xml\expat\lib\xmlparse.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\apr-util\xml\expat\lib\xmlrole.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\apr-util\xml\expat\lib\xmltok.c"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Generated Files"