kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Andrey Volk 2023-06-02 21:58:41 +03:00
parent 51dbe89df6
commit 7c1faeff48
7 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
configure.ac
View File

@ -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])],[ AM_CONDITIONAL([HAVE_KS],[true])],[
if module_enabled mod_verto; then PKG_CHECK_MODULES([KS], [libks >= 1.8.2],[
AC_MSG_ERROR([You need to either install libks or disable mod_verto in modules.conf]) AM_CONDITIONAL([HAVE_KS],[true])],[
else if module_enabled mod_verto; then
if module_enabled mod_signalwire; then AC_MSG_ERROR([You need to either install libks2 or libks or disable mod_verto in modules.conf])
AC_MSG_ERROR([You need to either install libks or disable mod_signalwire in modules.conf])
else 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
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])],[ AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[true])],[
if module_enabled mod_signalwire; then PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client >= 1.0.0],[
AC_MSG_ERROR([You need to either install signalwire-client-c or disable mod_signalwire in modules.conf]) AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[true])],[
else if module_enabled mod_signalwire; then
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[false]) AC_MSG_ERROR([You need to either install signalwire-client-c2 or signalwire-client-c or disable mod_signalwire in modules.conf])
fi else
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[false])
fi
])
]) ])
PKG_CHECK_MODULES([AMQP], [librabbitmq >= 0.5.2],[ PKG_CHECK_MODULES([AMQP], [librabbitmq >= 0.5.2],[

2
debian/control-modules vendored
View File

@ -209,7 +209,7 @@ Description: Adds mod_skel
Module: applications/mod_signalwire Module: applications/mod_signalwire
Description: mod_signalwire Description: mod_signalwire
Adds mod_signalwire. Adds mod_signalwire.
Build-Depends: libks, signalwire-client-c Build-Depends: libks2, signalwire-client-c2
Module: applications/mod_sms Module: applications/mod_sms
Description: Astract SMS Description: Astract SMS

2
freeswitch.spec
View File

@ -497,7 +497,7 @@ the entries aloud via a TTS engine
Summary: FreeSWITCH mod_signalwire Summary: FreeSWITCH mod_signalwire
Group: System/Libraries Group: System/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
BuildRequires: libks signalwire-client-c BuildRequires: libks2 signalwire-client-c2
%description application-signalwire %description application-signalwire
Provides FreeSWITCH mod_signalwire Provides FreeSWITCH mod_signalwire

2
w32/libks-version.props
View File

@ -4,7 +4,7 @@
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/> <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<libksVersion>1.8.2</libksVersion> <libksVersion>2.0.0</libksVersion>
<libksBuildNumber>1</libksBuildNumber> <libksBuildNumber>1</libksBuildNumber>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>

12
w32/libks.props
View File

@ -37,7 +37,7 @@
<Target Name="libksBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za"> <Target Name="libksBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask <DownloadPackageTask
package="http://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip" package="http://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
expectfileordirectory="$(libksDir)\binaries\$(Platform)\$(Configuration)\ks.dll" expectfileordirectory="$(libksDir)\binaries\$(Platform)\$(Configuration)\ks2.dll"
outputfolder="" outputfolder=""
outputfilename="" outputfilename=""
extractto="$(BaseDir)libs\" extractto="$(BaseDir)libs\"
@ -46,7 +46,7 @@
<Target Name="libksHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za"> <Target Name="libksHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask <DownloadPackageTask
package="http://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-headers.zip" package="http://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-headers.zip"
expectfileordirectory="$(libksDir)\src\include\libks\ks.h" expectfileordirectory="$(libksDir)\libks\src\include\libks\ks.h"
outputfolder="" outputfolder=""
outputfilename="" outputfilename=""
extractto="$(BaseDir)libs\" extractto="$(BaseDir)libs\"
@ -58,7 +58,7 @@
<ItemGroup> <ItemGroup>
<libksFiles Include="$(libksDir)\binaries\$(Platform)\$(Configuration)\*.dll"/> <libksFiles Include="$(libksDir)\binaries\$(Platform)\$(Configuration)\*.dll"/>
</ItemGroup> </ItemGroup>
<Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\ks.dll')" <Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\ks2.dll')"
SourceFiles="@(libksFiles)" SourceFiles="@(libksFiles)"
DestinationFiles="@(libksFiles->'$(BaseDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)')" DestinationFiles="@(libksFiles->'$(BaseDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)')"
/> />
@ -67,12 +67,12 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(libksDir)\src\include;$(libksDir)\src\include\libks;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(libksDir)\libks\src\include;$(libksDir)\libks\src\include\libks;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<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> <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>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalLibraryDirectories>$(libksDir)\binaries\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(libksDir)\binaries\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>ks.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ks2.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
</Project> </Project>

2
w32/signalwire-client-c-version.props
View File

@ -4,7 +4,7 @@
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/> <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<signalwire-client-cVersion>1.3.2</signalwire-client-cVersion> <signalwire-client-cVersion>2.0.0</signalwire-client-cVersion>
<signalwire-client-cBuildNumber>1</signalwire-client-cBuildNumber> <signalwire-client-cBuildNumber>1</signalwire-client-cBuildNumber>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>

6
w32/signalwire-client-c.props
View File

@ -35,7 +35,7 @@
<Target Name="signalwire-client-cBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za"> <Target Name="signalwire-client-cBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask <DownloadPackageTask
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" 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"
expectfileordirectory="$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\signalwire_client.dll" expectfileordirectory="$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\signalwire_client2.dll"
outputfolder="" outputfolder=""
outputfilename="" outputfilename=""
extractto="$(BaseDir)libs\" extractto="$(BaseDir)libs\"
@ -56,7 +56,7 @@
<ItemGroup> <ItemGroup>
<signalwire-client-cFiles Include="$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\*.dll"/> <signalwire-client-cFiles Include="$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\*.dll"/>
</ItemGroup> </ItemGroup>
<Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\signalwire_client.dll')" <Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\signalwire_client2.dll')"
SourceFiles="@(signalwire-client-cFiles)" SourceFiles="@(signalwire-client-cFiles)"
DestinationFiles="@(signalwire-client-cFiles->'$(BaseDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)')" DestinationFiles="@(signalwire-client-cFiles->'$(BaseDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)')"
/> />
@ -70,7 +70,7 @@
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalLibraryDirectories>$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>signalwire_client.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>signalwire_client2.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
</Project> </Project>