unimrcp vs2008 upgrade

diff --git a/libs/apr-util/xml/expat/lib/config.hnw b/libs/apr-util/xml/expat/lib/config.hnw
index de129d343c8ac20342ea98fa0160a6be95e37654..0878fa208b7ad8ddde67996b7bf1a39218cfe6c2 100644 (file)
--- a/libs/apr-util/xml/expat/lib/config.hnw
+++ b/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 */

diff --git a/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj b/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj
index d77441afa5b0176a93f651060f959cfe18994fe6..db29dc95dad3c37bdcb90085839562117c2e1c47 100644 (file)
--- a/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj
+++ b/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj
@@ -270,19 +270,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\include\apt_log.h"\r
+                               RelativePath=".\include\apt_header_field.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\include\apt_net.h"\r
+                               RelativePath=".\include\apt_log.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\include\apt_net_client_task.h"\r
+                               RelativePath=".\include\apt_multipart_content.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\include\apt_net_server_task.h"\r
+                               RelativePath=".\include\apt_net.h"\r
                                >\r
                        </File>\r
                        <File\r
@@ -297,6 +297,10 @@
                                RelativePath=".\include\apt_pair.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\include\apt_poller_task.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\include\apt_pollset.h"\r
                                >\r
@@ -325,10 +329,18 @@
                                RelativePath=".\include\apt_test_suite.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\include\apt_text_message.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\include\apt_text_stream.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\include\apt_timer_queue.h"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="src"\r
@@ -347,19 +359,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\src\apt_log.c"\r
+                               RelativePath=".\src\apt_header_field.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\src\apt_net.c"\r
+                               RelativePath=".\src\apt_log.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\src\apt_net_client_task.c"\r
+                               RelativePath=".\src\apt_multipart_content.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\src\apt_net_server_task.c"\r
+                               RelativePath=".\src\apt_net.c"\r
                                >\r
                        </File>\r
                        <File\r
@@ -374,6 +386,10 @@
                                RelativePath=".\src\apt_pair.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\src\apt_poller_task.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\src\apt_pollset.c"\r
                                >\r
@@ -398,10 +414,18 @@
                                RelativePath=".\src\apt_test_suite.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\src\apt_text_message.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\src\apt_text_stream.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\src\apt_timer_queue.c"\r
+                               >\r
+                       </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r

diff --git a/libs/unimrcp/libs/mpf/mpf.2008.vcproj b/libs/unimrcp/libs/mpf/mpf.2008.vcproj
index 2f02670890be2060d7a1e8b3770f60f355b0a2c3..95b925ea59e6fcf77a4fc10c4462e2d02b039cee 100644 (file)
--- a/libs/unimrcp/libs/mpf/mpf.2008.vcproj
+++ b/libs/unimrcp/libs/mpf/mpf.2008.vcproj
@@ -431,10 +431,6 @@
                                RelativePath=".\include\mpf_termination_factory.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath=".\include\mpf_timer_manager.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath=".\include\mpf_types.h"\r
                                >\r
@@ -556,10 +552,6 @@
                                RelativePath=".\src\mpf_termination_factory.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath=".\src\mpf_timer_manager.c"\r
-                               >\r
-                       </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r

diff --git a/libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj b/libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj
index ee8c9b43758bd90ac09d6652ebe5c04fb936fc52..6123fef4c481f3f42a4cb5ee2c99f79dd150225a 100644 (file)
--- a/libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj
+++ b/libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj
@@ -274,6 +274,10 @@
                        Name="src"\r
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        >\r
+                       <File\r
+                               RelativePath=".\src\mrcp_application.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\src\mrcp_client.c"\r
                                >\r

diff --git a/libs/unimrcp/libs/mrcp-engine/mrcpengine.2008.vcproj b/libs/unimrcp/libs/mrcp-engine/mrcpengine.2008.vcproj
index fbc62b016a609bdfeb2f6a29f86e6e49818f439e..6321572199d881686e60c2e82ed0d7fc561ecc84 100644 (file)
--- a/libs/unimrcp/libs/mrcp-engine/mrcpengine.2008.vcproj
+++ b/libs/unimrcp/libs/mrcp-engine/mrcpengine.2008.vcproj
@@ -130,12 +130,68 @@
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
+                       <File\r
+                               RelativePath=".\include\mrcp_engine_factory.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mrcp_engine_iface.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mrcp_engine_impl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mrcp_engine_loader.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mrcp_engine_plugin.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mrcp_engine_types.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mrcp_recog_engine.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mrcp_recog_state_machine.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mrcp_recorder_engine.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mrcp_recorder_state_machine.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\include\mrcp_resource_engine.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\include\mrcp_resource_plugin.h"\r
+                               RelativePath=".\include\mrcp_state_machine.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mrcp_synth_engine.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mrcp_synth_state_machine.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mrcp_verifier_engine.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\include\mrcp_verifier_state_machine.h"\r
                                >\r
                        </File>\r
                </Filter>\r
@@ -144,7 +200,35 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        >\r
                        <File\r
-                               RelativePath=".\src\mrcp_resource_engine.c"\r
+                               RelativePath=".\src\mrcp_engine_factory.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\mrcp_engine_iface.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\mrcp_engine_impl.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\mrcp_engine_loader.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\mrcp_recog_state_machine.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\mrcp_recorder_state_machine.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\mrcp_synth_state_machine.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\src\mrcp_verifier_state_machine.c"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/libs/unimrcp/libs/mrcp/mrcp.2008.vcproj b/libs/unimrcp/libs/mrcp/mrcp.2008.vcproj
index ae656d27493e0c6fa92d9e748d0b27a7017f2ca8..6f9eb5f0b59159bb16edbc3e4682af28dc87d958 100644 (file)
--- a/libs/unimrcp/libs/mrcp/mrcp.2008.vcproj
+++ b/libs/unimrcp/libs/mrcp/mrcp.2008.vcproj
@@ -277,6 +277,10 @@
                                        RelativePath=".\message\include\mrcp_generic_header.h"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath=".\message\include\mrcp_header.h"\r
+                                       >\r
+                               </File>\r
                                <File\r
                                        RelativePath=".\message\include\mrcp_header_accessor.h"\r
                                        >\r
@@ -298,6 +302,10 @@
                                        RelativePath=".\message\src\mrcp_generic_header.c"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath=".\message\src\mrcp_header.c"\r
+                                       >\r
+                               </File>\r
                                <File\r
                                        RelativePath=".\message\src\mrcp_header_accessor.c"\r
                                        >\r
@@ -385,6 +393,14 @@
                                        RelativePath=".\resources\include\mrcp_synth_resource.h"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath=".\resources\include\mrcp_verifier_header.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\resources\include\mrcp_verifier_resource.h"\r
+                                       >\r
+                               </File>\r
                        </Filter>\r
                        <Filter\r
                                Name="src"\r
@@ -414,6 +430,14 @@
                                        RelativePath=".\resources\src\mrcp_synth_resource.c"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath=".\resources\src\mrcp_verifier_header.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\resources\src\mrcp_verifier_resource.c"\r
+                                       >\r
+                               </File>\r
                        </Filter>\r
                </Filter>\r
        </Files>\r

diff --git a/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.2008.vcproj b/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.2008.vcproj
index cee4d73515aa462cf05b5c7cbbcf1f3dfbcb4ebe..da06fd96d984cc8d4abf3d20bbad99c2567884b5 100644 (file)
--- a/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.2008.vcproj
+++ b/libs/unimrcp/platforms/libunimrcp-client/libunimrcpclient.2008.vcproj
@@ -132,6 +132,10 @@
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
+                       <File\r
+                               RelativePath="..\..\build\uni_revision.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\build\uni_version.h"\r
                                >\r

diff --git a/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.2008.vcproj b/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.2008.vcproj
index d1b51c7929f1bf4bba1beee109d0e7c68028df8a..1982d770901e4a3e750f5bbf03a00db260d6a65b 100644 (file)
--- a/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.2008.vcproj
+++ b/libs/unimrcp/platforms/libunimrcp-server/libunimrcpserver.2008.vcproj
@@ -132,6 +132,10 @@
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
+                       <File\r
+                               RelativePath="..\..\build\uni_revision.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\build\uni_version.h"\r
                                >\r

diff --git a/libs/unimrcp/tests/apttest/apttest.2008.vcproj b/libs/unimrcp/tests/apttest/apttest.2008.vcproj
index e6f70ad86d50b4c379848e4f9397a1568abad494..0bdaaf1f439fed8eb55f6689ff4e13fd838e654f 100644 (file)
--- a/libs/unimrcp/tests/apttest/apttest.2008.vcproj
+++ b/libs/unimrcp/tests/apttest/apttest.2008.vcproj
@@ -153,6 +153,10 @@
                                RelativePath=".\src\main.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\src\multipart_suite.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\src\task_suite.c"\r
                                >\r

diff --git a/libs/unimrcp/tests/mrcptest/mrcptest.2008.vcproj b/libs/unimrcp/tests/mrcptest/mrcptest.2008.vcproj
index 7cfd450259118cabc223b2a3eea3cee6232e79d6..afe6314f0b6f7170d11eeec4b4632731a5cfd85a 100644 (file)
--- a/libs/unimrcp/tests/mrcptest/mrcptest.2008.vcproj
+++ b/libs/unimrcp/tests/mrcptest/mrcptest.2008.vcproj
@@ -157,6 +157,10 @@
                                RelativePath=".\src\set_get_suite.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\src\transparent_set_get_suite.c"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="include"\r

diff --git a/libs/win32/apr-util/libaprutil.2008.vcproj b/libs/win32/apr-util/libaprutil.2008.vcproj
index 971b97e8d40875045dce19a3b14be47280b85328..9125bcb5ac1eb0d9d152b616b0076ef71b1f8553 100644 (file)
--- a/libs/win32/apr-util/libaprutil.2008.vcproj
+++ b/libs/win32/apr-util/libaprutil.2008.vcproj
@@ -52,7 +52,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/EHsc "\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"\r
+                               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"\r
                                PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"\r
                                RuntimeLibrary="3"\r
                                PrecompiledHeaderFile="$(IntDir)/libaprutil.pch"\r
@@ -150,7 +150,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/EHsc "\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"\r
+                               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"\r
                                PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"\r
                                RuntimeLibrary="3"\r
                                PrecompiledHeaderFile="$(IntDir)/libaprutil.pch"\r
@@ -246,7 +246,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"\r
+                               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"\r
                                PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
@@ -347,7 +347,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include"\r
+                               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"\r
                                PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
@@ -2391,6 +2391,26 @@
                                        </FileConfiguration>\r
                                </File>\r
                        </Filter>\r
+                       <Filter\r
+                               Name="xml"\r
+                               >\r
+                               <File\r
+                                       RelativePath="..\..\apr-util\xml\apr_xml.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\apr-util\xml\expat\lib\xmlparse.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\apr-util\xml\expat\lib\xmlrole.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\apr-util\xml\expat\lib\xmltok.c"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="Generated Files"\r