Skip to content

F
freeswitch
提交 13f7b299 authored 作者: Michael Jerris's avatar Michael Jerris
浏览文件
操作

Update to use exosip and osip 2.2.2. Modified GetLibs.vbs to rebuild jrtp when… 

Update to use exosip and osip 2.2.2.  Modified GetLibs.vbs to rebuild jrtp when any of the libs are not there.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@78 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 807742c9
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 506 行增加 和 253 行删除
w32/vsnet/GetLibs.vbs
浏览文件 @ 13f7b299
...@@ -114,13 +114,14 @@ End Sub ...@@ -114,13 +114,14 @@ End Sub
Sub BuildLibs_ModExosip(BuildDebug, BuildRelease) Sub BuildLibs_ModExosip(BuildDebug, BuildRelease)
If Not FSO.FolderExists(LibDestDir & "osip") Then If Not FSO.FolderExists(LibDestDir & "osip") Then
WgetUnTarGz "http://www.antisip.com/download/libosip2-2.2.1.tar.gz", LibDestDir WgetUnTarGz "http://www.antisip.com/download/libosip2-2.2.2.tar.gz", LibDestDir
If Not FSO.FolderExists(LibDestDir & "libosip2-2.2.1") Then If Not FSO.FolderExists(LibDestDir & "libosip2-2.2.2") Then
Wscript.echo "Unable to get osip from default download location, Trying backup location:" Wscript.echo "Unable to get osip from default download location, Trying backup location:"
WgetUnTarGz "http://www.sofaswitch.org/mikej/libosip2-2.2.1.tar.gz", LibDestDir WgetUnTarGz "http://www.sofaswitch.org/mikej/libosip2-2.2.2.tar.gz", LibDestDir
End If End If
RenameFolder LibDestDir & "libosip2-2.2.1", "osip" RenameFolder LibDestDir & "libosip2-2.2.2", "osip"
FSO.CopyFile Utilsdir & "osipparser2.vcproj", LibDestDir & "osip\platform\vsnet\", True FSO.CopyFile Utilsdir & "osipparser2.vcproj", LibDestDir & "osip\platform\vsnet\", True
FSO.CopyFile Utilsdir & "osip2.vcproj", LibDestDir & "osip\platform\vsnet\", True
End If End If
If FSO.FolderExists(LibDestDir & "osip") Then If FSO.FolderExists(LibDestDir & "osip") Then
If BuildDebug Then If BuildDebug Then
...@@ -140,13 +141,13 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease) ...@@ -140,13 +141,13 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease)
End If End If
If Not FSO.FolderExists(LibDestDir & "libeXosip2") Then If Not FSO.FolderExists(LibDestDir & "libeXosip2") Then
WgetUnTarGz "http://www.antisip.com/download/libeXosip2-1.9.1-pre17.tar.gz", LibDestDir WgetUnTarGz "http://www.antisip.com/download/libeXosip2-2.2.2.tar.gz", LibDestDir
If Not FSO.FolderExists(LibDestDir & "libeXosip2-1.9.1-pre17") Then If Not FSO.FolderExists(LibDestDir & "libeXosip2-2.2.2") Then
Wscript.echo "Unable to get eXosip from default download location, Trying backup location:" Wscript.echo "Unable to get eXosip from default download location, Trying backup location:"
WgetUnTarGz "http://www.sofaswitch.org/mikej/libeXosip2-1.9.1-pre17.tar.gz", LibDestDir WgetUnTarGz "http://www.sofaswitch.org/mikej/libeXosip2-2.2.2.tar.gz", LibDestDir
End If End If
RenameFolder LibDestDir & "libeXosip2-1.9.1-pre17", "libeXosip2" RenameFolder LibDestDir & "libeXosip2-2.2.2", "libeXosip2"
FSO.CopyFile Utilsdir & "eXosip.vcproj", LibDestDir & "libeXosip2\platform\vsnet\", True ' FSO.CopyFile Utilsdir & "eXosip.vcproj", LibDestDir & "libeXosip2\platform\vsnet\", True
End If End If
If FSO.FolderExists(LibDestDir & "libeXosip2") Then If FSO.FolderExists(LibDestDir & "libeXosip2") Then
If BuildDebug Then If BuildDebug Then
...@@ -183,13 +184,13 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease) ...@@ -183,13 +184,13 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease)
End If End If
If FSO.FolderExists(LibDestDir & "jrtplib") And FSO.FolderExists(LibDestDir & "jthread-1.1.2") And FSO.FolderExists(LibDestDir & "jrtp4c")Then If FSO.FolderExists(LibDestDir & "jrtplib") And FSO.FolderExists(LibDestDir & "jthread-1.1.2") And FSO.FolderExists(LibDestDir & "jrtp4c")Then
If BuildDebug Then If BuildDebug Then
If Not FSO.FileExists(LibDestDir & "jrtp4c\w32\Debug\jrtp4c.lib") Then If (Not FSO.FileExists(LibDestDir & "jrtp4c\w32\Debug\jrtp4c.lib")) Or (Not FSO.FileExists(LibDestDir & "jrtplib\Debug\jrtplib.lib")) Or (Not FSO.FileExists(LibDestDir & "jthread-1.1.2\Debug\jthread.lib")) Then
UpgradeViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln" UpgradeViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln"
BuildViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln", "Debug" BuildViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln", "Debug"
End If End If
End If End If
If BuildRelease Then If BuildRelease Then
If Not FSO.FileExists(LibDestDir & "jrtp4c\w32\Release\jrtp4c.lib") Then If (Not FSO.FileExists(LibDestDir & "jrtp4c\w32\Release\jrtp4c.lib")) Or (Not FSO.FileExists(LibDestDir & "jrtplib\Release\jrtplib.lib")) Or (Not FSO.FileExists(LibDestDir & "jthread-1.1.2\Release\jthread.lib")) Then
UpgradeViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln" UpgradeViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln"
BuildViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln", "Release" BuildViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln", "Release"
End If End If
......
w32/vsnet/Tools/osip2.vcproj 0 → 100644
浏览文件 @ 13f7b299
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="osip2"
ProjectGUID="{85255507-5D16-4218-85E2-F683BB2F04DA}"
Keyword="Win32Proj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="4"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="_WIN32_WINNT;WIN32;_DEBUG;_LIB;OSIP_MT;ENABLE_TRACE;SYSTEM_LOGGER_ENABLED"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
ProgramDataBaseFileName="$(OutDir)/$(ProjectName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)\osip2.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="4"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="_WIN32_WINNT;WIN32;NDEBUG;_LIB;OSIP_MT;ENABLE_TRACE;SYSTEM_LOGGER_ENABLED"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
ProgramDataBaseFileName="$(OutDir)/$(ProjectName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)\osip2.lib"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug DLL|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="_WIN32_WINNT;WIN32;_DEBUG;_LIB;OSIP_MT;ENABLE_TRACE;SYSTEM_LOGGER_ENABLED"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
ProgramDataBaseFileName="$(OutDir)/$(ProjectName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
ModuleDefinitionFile="..\windows\osip2.def"
GenerateDebugInformation="TRUE"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Release DLL|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="_WIN32_WINNT;WIN32;NDEBUG;_LIB;OSIP_MT;ENABLE_TRACE;SYSTEM_LOGGER_ENABLED"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
ProgramDataBaseFileName="$(OutDir)/$(ProjectName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
ModuleDefinitionFile="..\windows\osip2.def"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
RelativePath="..\..\src\osip2\fsm_misc.c">
</File>
<File
RelativePath="..\..\src\osip2\ict.c">
</File>
<File
RelativePath="..\..\src\osip2\ict_fsm.c">
</File>
<File
RelativePath="..\..\src\osip2\ist.c">
</File>
<File
RelativePath="..\..\src\osip2\ist_fsm.c">
</File>
<File
RelativePath="..\..\src\osip2\nict.c">
</File>
<File
RelativePath="..\..\src\osip2\nict_fsm.c">
</File>
<File
RelativePath="..\..\src\osip2\nist.c">
</File>
<File
RelativePath="..\..\src\osip2\nist_fsm.c">
</File>
<File
RelativePath="..\..\src\osip2\osip.c">
</File>
<File
RelativePath="..\..\src\osip2\osip_dialog.c">
</File>
<File
RelativePath="..\..\src\osip2\osip_event.c">
</File>
<File
RelativePath="..\..\src\osip2\osip_negotiation.c">
</File>
<File
RelativePath="..\..\src\osip2\osip_time.c">
</File>
<File
RelativePath="..\..\src\osip2\osip_transaction.c">
</File>
<File
RelativePath="..\..\src\osip2\port_condv.c">
</File>
<File
RelativePath="..\..\src\osip2\port_fifo.c">
</File>
<File
RelativePath="..\..\src\osip2\port_sema.c">
</File>
<File
RelativePath="..\..\src\osip2\port_thread.c">
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
<File
RelativePath="..\..\src\osip2\fsm.h">
</File>
<File
RelativePath="..\..\include\osip2\internal.h">
</File>
<File
RelativePath="..\..\include\osip2\osip.h">
</File>
<File
RelativePath="..\..\include\osip2\osip_condv.h">
</File>
<File
RelativePath="..\..\include\osip2\osip_dialog.h">
</File>
<File
RelativePath="..\..\include\osip2\osip_fifo.h">
</File>
<File
RelativePath="..\..\include\osip2\osip_mt.h">
</File>
<File
RelativePath="..\..\include\osip2\osip_negotiation.h">
</File>
<File
RelativePath="..\..\src\osip2\xixt.h">
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论