[Build-System] Update libks and signalwire-c requirements to 2.0

diff --git a/configure.ac b/configure.ac
index 04738e93c109f947f619519b6c242d2c855dfd45..8a8bb102a795122ff21fa74f0c0d3a2efe6c06e5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1518,26 +1518,32 @@ PKG_CHECK_MODULES([V8FS_STATIC], [v8-6.1_static >= 6.1.298],[
   ])
 ])
 
-PKG_CHECK_MODULES([KS], [libks >= 1.8.2],[
+PKG_CHECK_MODULES([KS], [libks2 >= 2.0.0],[
   AM_CONDITIONAL([HAVE_KS],[true])],[
-    if module_enabled mod_verto; then
-      AC_MSG_ERROR([You need to either install libks or disable mod_verto in modules.conf])
-    else
-      if module_enabled mod_signalwire; then
-        AC_MSG_ERROR([You need to either install libks or disable mod_signalwire in modules.conf])
+  PKG_CHECK_MODULES([KS], [libks >= 1.8.2],[
+    AM_CONDITIONAL([HAVE_KS],[true])],[
+      if module_enabled mod_verto; then
+        AC_MSG_ERROR([You need to either install libks2 or libks or disable mod_verto in modules.conf])
       else
-        AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_KS],[false])
+        if module_enabled mod_signalwire; then
+          AC_MSG_ERROR([You need to either install libks2 or libks or disable mod_signalwire in modules.conf])
+        else
+          AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_KS],[false])
+        fi
       fi
-    fi
+  ])
 ])
 
-PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client >= 1.0.0],[
+PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client2 >= 2.0.0],[
   AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[true])],[
-    if module_enabled mod_signalwire; then
-      AC_MSG_ERROR([You need to either install signalwire-client-c or disable mod_signalwire in modules.conf])
-    else
-      AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[false])
-    fi
+  PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client >= 1.0.0],[
+    AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[true])],[
+      if module_enabled mod_signalwire; then
+        AC_MSG_ERROR([You need to either install signalwire-client-c2 or signalwire-client-c or disable mod_signalwire in modules.conf])
+      else
+        AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[false])
+      fi
+  ])
 ])
 
 PKG_CHECK_MODULES([AMQP], [librabbitmq >= 0.5.2],[

diff --git a/debian/control-modules b/debian/control-modules
index b9d7a059334e27efd5cfaea8e03df57fa14457d9..a578ad3ff39976fb8745a2933769033ba38ee471 100644 (file)
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -209,7 +209,7 @@ Description: Adds mod_skel
 Module: applications/mod_signalwire
 Description: mod_signalwire
  Adds mod_signalwire.
-Build-Depends: libks, signalwire-client-c
+Build-Depends: libks2, signalwire-client-c2
 
 Module: applications/mod_sms
 Description: Astract SMS

diff --git a/freeswitch.spec b/freeswitch.spec
index 1d985cc29951f8e63d5f9c771e41b744217e9524..ecf9dacf138437db68052e4a4377b76e2042d419 100644 (file)
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -497,7 +497,7 @@ the entries aloud via a TTS engine
 Summary:       FreeSWITCH mod_signalwire
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libks signalwire-client-c
+BuildRequires:  libks2 signalwire-client-c2
 
 %description application-signalwire
 Provides FreeSWITCH mod_signalwire

diff --git a/w32/libks-version.props b/w32/libks-version.props
index 44246b4d90ee664669e1538694cbbe309ff9eb63..9e013ef808ea9378ae4682053b3359e760f06e08 100644 (file)
--- a/w32/libks-version.props
+++ b/w32/libks-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros">\r
-    <libksVersion>1.8.2</libksVersion>\r
+    <libksVersion>2.0.0</libksVersion>\r
     <libksBuildNumber>1</libksBuildNumber>\r
   </PropertyGroup>\r
   <PropertyGroup>\r

diff --git a/w32/libks.props b/w32/libks.props
index fb7a82f200f4250a4c370e9bcdaf67e773bb77b0..df0b9721f387698ce0ea03475755418d3174338c 100644 (file)
--- a/w32/libks.props
+++ b/w32/libks.props
@@ -37,7 +37,7 @@
   <Target Name="libksBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  \r
       <DownloadPackageTask \r
            package="http://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"\r
-           expectfileordirectory="$(libksDir)\binaries\$(Platform)\$(Configuration)\ks.dll" \r
+           expectfileordirectory="$(libksDir)\binaries\$(Platform)\$(Configuration)\ks2.dll" \r
            outputfolder=""\r
            outputfilename="" \r
            extractto="$(BaseDir)libs\"\r
@@ -46,7 +46,7 @@
   <Target Name="libksHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  \r
       <DownloadPackageTask \r
            package="http://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-headers.zip"\r
-           expectfileordirectory="$(libksDir)\src\include\libks\ks.h" \r
+           expectfileordirectory="$(libksDir)\libks\src\include\libks\ks.h" \r
            outputfolder=""\r
            outputfilename="" \r
            extractto="$(BaseDir)libs\"\r
@@ -58,7 +58,7 @@
         <ItemGroup>  \r
              <libksFiles Include="$(libksDir)\binaries\$(Platform)\$(Configuration)\*.dll"/>  \r
         </ItemGroup>  \r
-        <Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\ks.dll')"\r
+        <Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\ks2.dll')"\r
             SourceFiles="@(libksFiles)"  \r
             DestinationFiles="@(libksFiles->'$(BaseDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)')"  \r
         />  \r
@@ -67,12 +67,12 @@
 \r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>$(libksDir)\src\include;$(libksDir)\src\include\libks;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>__PRETTY_FUNCTION__=__FUNCSIG__;WIN32;_WINDOWS;SWCLT_VERSION_MAJOR=1;SWCLT_VERSION_MINOR=0;SWCLT_VERSION_REVISION=0;_WIN32_WINNT=0x0600;_WINSOCK_DEPRECATED_NO_WARNINGS=1;WIN32_LEAN_AND_MEAN=1;KS_PLAT_WIN=1;NOMAXMIN=1;_CRT_SECURE_NO_WARNINGS=1;SWCLT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>$(libksDir)\libks\src\include;$(libksDir)\libks\src\include\libks;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>__KS_FUNC__=__FUNCSIG__;WIN32;_WINDOWS;SWCLT_VERSION_MAJOR=1;SWCLT_VERSION_MINOR=0;SWCLT_VERSION_REVISION=0;_WIN32_WINNT=0x0600;_WINSOCK_DEPRECATED_NO_WARNINGS=1;WIN32_LEAN_AND_MEAN=1;KS_PLAT_WIN=1;NOMAXMIN=1;_CRT_SECURE_NO_WARNINGS=1;SWCLT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>$(libksDir)\binaries\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <AdditionalDependencies>ks.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>ks2.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
   </ItemDefinitionGroup>\r
 </Project>\r

diff --git a/w32/signalwire-client-c-version.props b/w32/signalwire-client-c-version.props
index 337dc4cc197bce769449ffc1c90bcf6b1eac615a..db6eb873cb43c96fa01e6eb58dbf2ce96b746aa0 100644 (file)
--- a/w32/signalwire-client-c-version.props
+++ b/w32/signalwire-client-c-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros">\r
-    <signalwire-client-cVersion>1.3.2</signalwire-client-cVersion>\r
+    <signalwire-client-cVersion>2.0.0</signalwire-client-cVersion>\r
     <signalwire-client-cBuildNumber>1</signalwire-client-cBuildNumber>\r
   </PropertyGroup>\r
   <PropertyGroup>\r

diff --git a/w32/signalwire-client-c.props b/w32/signalwire-client-c.props
index 4d5f917b7eb69dd3a0dacba764af11cb55ce21f6..df82dff00e98e0d9fa0bab510f76f2b1ce3b27b6 100644 (file)
--- a/w32/signalwire-client-c.props
+++ b/w32/signalwire-client-c.props
@@ -35,7 +35,7 @@
   <Target Name="signalwire-client-cBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  \r
       <DownloadPackageTask \r
            package="http://files.freeswitch.org/windows/packages/signalwire-client-c/$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)/signalwire-client-c-$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"\r
-           expectfileordirectory="$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\signalwire_client.dll" \r
+           expectfileordirectory="$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\signalwire_client2.dll" \r
            outputfolder=""\r
            outputfilename="" \r
            extractto="$(BaseDir)libs\"\r
@@ -56,7 +56,7 @@
         <ItemGroup>  \r
              <signalwire-client-cFiles Include="$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\*.dll"/>  \r
         </ItemGroup>  \r
-        <Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\signalwire_client.dll')"\r
+        <Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\signalwire_client2.dll')"\r
             SourceFiles="@(signalwire-client-cFiles)"  \r
             DestinationFiles="@(signalwire-client-cFiles->'$(BaseDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)')"  \r
         />  \r
@@ -70,7 +70,7 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <AdditionalDependencies>signalwire_client.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>signalwire_client2.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
   </ItemDefinitionGroup>\r
 </Project>\r