[Build-System] Remove mod_unimrcp from the Windows build.

diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln
index 46fc1a7e8823d1c8170cb1bde5527cfe2064f728..e99c333c3da5334b6118ed8c74ea0b51fa2f265d 100644 (file)
--- a/Freeswitch.2017.sln
+++ b/Freeswitch.2017.sln
@@ -370,8 +370,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbroadvoice", "libs\win32
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_bv", "src\mod\codecs\mod_bv\mod_bv.2017.vcxproj", "{D5C87B19-150D-4EF3-A671-96589BD2D14A}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_unimrcp", "src\mod\asr_tts\mod_unimrcp\mod_unimrcp.2017.vcxproj", "{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcelt", "libs\win32\celt\libcelt.2017.vcxproj", "{ABB71A76-42B0-47A4-973A-42E3D920C6FD}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FSComm", "fscomm\FSComm.2017.vcxproj", "{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}"\r
@@ -1622,17 +1620,6 @@ Global
                {D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|Win32.Build.0 = Release|Win32\r
                {D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.ActiveCfg = Release|x64\r
                {D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.Build.0 = Release|x64\r
-               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|Win32.ActiveCfg = Release|x64\r
-               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64.ActiveCfg = Release|x64\r
-               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64.Build.0 = Release|x64\r
-               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|Win32.Build.0 = Debug|Win32\r
-               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x64.ActiveCfg = Debug|x64\r
-               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x64.Build.0 = Debug|x64\r
-               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.ActiveCfg = Release|Win32\r
-               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.Build.0 = Release|Win32\r
-               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.ActiveCfg = Release|x64\r
-               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.Build.0 = Release|x64\r
                {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|Win32.ActiveCfg = Release|x64\r
                {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.ActiveCfg = Release|x64\r
                {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.Build.0 = Release|x64\r
@@ -2661,7 +2648,6 @@ Global
                {432DB165-1EB2-4781-A9C0-71E62610B20A} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}\r
                {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {D5C87B19-150D-4EF3-A671-96589BD2D14A} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
-               {D07C378A-F5F7-438F-ADF3-4AC4FB1883CD} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}\r
                {ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
                {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}\r
                {AFA983D6-4569-4F88-BA94-555ED00FD9A8} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r

diff --git a/libs/win32/apr/apr.hw b/libs/win32/apr/fspr.hw
similarity index 92%
rename from libs/win32/apr/apr.hw
rename to libs/win32/apr/fspr.hw
index 27be40106e3950d7848c67eb3892dca793df682a..a9c7eab316b9a3bc7440e281594c12ea0a67e304 100644 (file)
--- a/libs/win32/apr/apr.hw
+++ b/libs/win32/apr/fspr.hw
@@ -106,7 +106,7 @@
 #endif /* !_WINDOWS_ */
 
 /**
- * @defgroup apr_platform Platform Definitions
+ * @defgroup fspr_platform Platform Definitions
  * @ingroup APR 
  * @{
  */
@@ -275,7 +275,7 @@ extern "C" {
 #endif
 
 /**
- * @addtogroup apr_platform
+ * @addtogroup fspr_platform
  * @ingroup APR 
  * @{
  */
@@ -322,29 +322,29 @@ extern "C" {
 
 /* Typedefs that APR needs. */
 
-typedef  unsigned char     apr_byte_t;
+typedef  unsigned char     fspr_byte_t;
 
-typedef  short             apr_int16_t;
-typedef  unsigned short    apr_uint16_t;
+typedef  short             fspr_int16_t;
+typedef  unsigned short    fspr_uint16_t;
                                                
-typedef  int               apr_int32_t;
-typedef  unsigned int      apr_uint32_t;
+typedef  int               fspr_int32_t;
+typedef  unsigned int      fspr_uint32_t;
                                                
-typedef  __int64           apr_int64_t;
-typedef  unsigned __int64  apr_uint64_t;
+typedef  __int64           fspr_int64_t;
+typedef  unsigned __int64  fspr_uint64_t;
 
-typedef  size_t      apr_size_t;
+typedef  size_t      fspr_size_t;
 #if APR_HAVE_STDDEF_H
-typedef  ptrdiff_t   apr_ssize_t;
+typedef  ptrdiff_t   fspr_ssize_t;
 #else
-typedef  int         apr_ssize_t;
+typedef  int         fspr_ssize_t;
 #endif
 #if APR_HAS_LARGE_FILES
-typedef  __int64     apr_off_t;
+typedef  __int64     fspr_off_t;
 #else
-typedef  int         apr_off_t;
+typedef  int         fspr_off_t;
 #endif
-typedef  int         apr_socklen_t;
+typedef  int         fspr_socklen_t;
 
 /* Are we big endian? */
 /* XXX: Fatal assumption on Alpha platforms */
@@ -356,7 +356,7 @@ typedef  int         apr_socklen_t;
 #define APR_SIZEOF_VOIDP   4
 #endif
 
-/* XXX These simply don't belong here, perhaps in apr_portable.h
+/* XXX These simply don't belong here, perhaps in fspr_portable.h
  * based on some APR_HAVE_PID/GID/UID?
  */
 typedef  int         pid_t;
@@ -378,8 +378,8 @@ typedef  int         gid_t;
 
 #ifndef WS2TCPIP_INLINE
 #define IN6_IS_ADDR_V4MAPPED(a) \
-    (   (*(const apr_uint64_t *)(const void *)(&(a)->s6_addr[0]) == 0) \
-     && (*(const apr_uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
+    (   (*(const fspr_uint64_t *)(const void *)(&(a)->s6_addr[0]) == 0) \
+     && (*(const fspr_uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
 #endif
 
 #endif /* APR_HAS_IPV6 */
@@ -391,7 +391,7 @@ typedef  int         gid_t;
  * so that they follow the platform's calling convention.
  * @example
  */
-/** void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
+/** void* APR_THREAD_FUNC my_thread_entry_fn(fspr_thread_t *thd, void *data);
  */
 #define APR_THREAD_FUNC  __stdcall
 
@@ -406,7 +406,7 @@ typedef  int         gid_t;
  * @remark Both the declaration and implementations must use the same macro.
  * @example
  */
-/** APR_DECLARE(rettype) apr_func(args)
+/** APR_DECLARE(rettype) fspr_func(args)
  * @see APR_DECLARE_NONSTD @see APR_DECLARE_DATA
  * @remark Note that when APR compiles the library itself, it passes the 
  * symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32) 
@@ -427,7 +427,7 @@ typedef  int         gid_t;
  * @remark Both the declaration and implementations must use the same macro.
  * @example
  */
-/** APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
+/** APR_DECLARE_NONSTD(rettype) fspr_func(args, ...);
  */
 #define APR_DECLARE_NONSTD(type)     type
 
@@ -439,8 +439,8 @@ typedef  int         gid_t;
  * but both must include the macro.
  * @example
  */
-/** extern APR_DECLARE_DATA type apr_variable;\n
- * APR_DECLARE_DATA type apr_variable = value;
+/** extern APR_DECLARE_DATA type fspr_variable;\n
+ * APR_DECLARE_DATA type fspr_variable = value;
  */
 #define APR_DECLARE_DATA
 
@@ -484,12 +484,12 @@ typedef  int         gid_t;
 /* No difference between PROC and GLOBAL mutex */
 #define APR_PROC_MUTEX_IS_GLOBAL      1
 
-typedef int apr_wait_t;
+typedef int fspr_wait_t;
 
 /* struct iovec is needed to emulate Unix writev */
 struct iovec {
     char*      iov_base;
-    apr_size_t iov_len;
+    fspr_size_t iov_len;
 };
 
 /* Nasty Win32 .h ommissions we really need */

diff --git a/w32/Setup/Setup.2017.wixproj b/w32/Setup/Setup.2017.wixproj
index 8b6b616b2da68ef1e42226799e0a0a089b501596..dd745e8438a3fa69062b9627685f9c468add4587 100644 (file)
--- a/w32/Setup/Setup.2017.wixproj
+++ b/w32/Setup/Setup.2017.wixproj
@@ -385,14 +385,6 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>\r
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\..\src\mod\asr_tts\mod_unimrcp\mod_unimrcp.2017.vcxproj">\r
-      <Name>mod_unimrcp</Name>\r
-      <Project>{d07c378a-f5f7-438f-adf3-4ac4fb1883cd}</Project>\r
-      <Private>True</Private>\r
-      <DoNotHarvest>True</DoNotHarvest>\r
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>\r
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>\r
-    </ProjectReference>\r
     <ProjectReference Include="..\..\src\mod\codecs\mod_amr\mod_amr.2017.vcxproj">\r
       <Name>mod_amr</Name>\r
       <Project>{8deb383c-4091-4f42-a56f-c9e46d552d79}</Project>\r
@@ -529,14 +521,6 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>\r
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\..\src\mod\endpoints\mod_dingaling\mod_dingaling.2017.vcxproj">\r
-      <Name>mod_dingaling</Name>\r
-      <Project>{ffaa4c52-3a53-4f99-90c1-d59d1f0427f3}</Project>\r
-      <Private>True</Private>\r
-      <DoNotHarvest>True</DoNotHarvest>\r
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>\r
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>\r
-    </ProjectReference>\r
     <ProjectReference Include="..\..\src\mod\endpoints\mod_gsmopen\mod_gsmopen.2017.vcxproj">\r
       <Name>mod_gsmopen</Name>\r
       <Project>{74b120ff-6935-4dfe-a142-cdb6bea99c90}</Project>\r