From 4977d27788bd14c73475c49b14d808b7680db8f0 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 10 May 2006 16:39:09 +0000 Subject: [PATCH] adding mod_xml_rpc to windows build part 1/2 git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1417 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- .../xml_int/mod_xml_rpc/mod_xml_rpc.vcproj | 26 +- w32/vsnet/Freeswitch.sln | 18 +- w32/vsnet/GetLibs.vbs | 57 +- w32/vsnet/Tools/xmlrpc/xmlrpc.vcproj | 747 ++++++++++++++++++ 4 files changed, 833 insertions(+), 15 deletions(-) create mode 100644 w32/vsnet/Tools/xmlrpc/xmlrpc.vcproj diff --git a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj index e184008dd1..4cd39aad12 100644 --- a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj +++ b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj @@ -3,8 +3,8 @@ ProjectType="Visual C++" Version="8.00" Name="mod_xml_rpc" - ProjectGUID="{E1794405-29D4-466D-9BE3-DD2344C2A663}" - RootNamespace="mod_xml_rpc"" + ProjectGUID="{CBEC7225-0C21-4DA8-978E-1F158F8AD950}" + RootNamespace="mod_xml_rpc" Keyword="Win32Proj" > @@ -25,6 +25,7 @@ > diff --git a/w32/vsnet/Freeswitch.sln b/w32/vsnet/Freeswitch.sln index b105c6a460..6b65421934 100644 --- a/w32/vsnet/Freeswitch.sln +++ b/w32/vsnet/Freeswitch.sln @@ -194,6 +194,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_console", "..\..\src\mo {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XML Interfaces", "XML Interfaces", "{F69A4A6B-9360-4EBB-A280-22AA3C455AC5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "..\..\src\mod\xml_int\mod_xml_rpc\mod_xml_rpc.vcproj", "{CBEC7225-0C21-4DA8-978E-1F158F8AD950}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{99D6D74B-32A8-4441-A417-551B0E0A4510}" + ProjectSection(SolutionItems) = preProject + GetLibs.vbs = GetLibs.vbs + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -332,6 +341,10 @@ Global {1C453396-D912-4213-89FD-9B489162B7B5}.Debug|Win32.Build.0 = Debug|Win32 {1C453396-D912-4213-89FD-9B489162B7B5}.Release|Win32.ActiveCfg = Release|Win32 {1C453396-D912-4213-89FD-9B489162B7B5}.Release|Win32.Build.0 = Release|Win32 + {CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Debug|Win32.ActiveCfg = Debug|Win32 + {CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Debug|Win32.Build.0 = Debug|Win32 + {CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|Win32.ActiveCfg = Release|Win32 + {CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -353,14 +366,14 @@ Global {419AA391-5F3F-4BFE-A869-9D154D62A792} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {0E2C6395-13B9-46E5-9264-8859D346018D} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {30A5B29C-983E-4580-9FD0-D647CCDCC7EB} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} - {07113B25-D3AF-4E04-BA77-4CD1171F022C} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} - {A27CCA23-1541-4337-81A4-F0A6413078A0} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} {3A5B9131-F20C-4A85-9447-6C1610941CEE} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {FE3540C5-3303-46E0-A69E-D92F775687F1} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5} = {2D57D093-3F8D-4729-AD9A-68E945C200A5} + {07113B25-D3AF-4E04-BA77-4CD1171F022C} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} + {A27CCA23-1541-4337-81A4-F0A6413078A0} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} {1A1FF289-4FD6-4285-A422-D31DD67A4723} = {CBD81696-EFB4-4D2F-8451-1B8DAA86155A} {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000} @@ -368,5 +381,6 @@ Global {7B077E7F-1BE7-4291-AB86-55E527B25CAC} = {0C808854-54D1-4230-BFF5-77B5FD905000} {692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0} {1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A} + {CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} EndGlobalSection EndGlobal diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs index 6c436be7bf..2cdd0f9a3f 100644 --- a/w32/vsnet/GetLibs.vbs +++ b/w32/vsnet/GetLibs.vbs @@ -29,6 +29,7 @@ BuildModldap=False BuildModzeroconf=False BuildModSpiderMonkey=False BuildModDingaling=False +BuildModXMLRpc=False quote=Chr(34) ScriptDir=Left(WScript.ScriptFullName,Len(WScript.ScriptFullName)-Len(WScript.ScriptName)) @@ -99,6 +100,8 @@ If objArgs.Count >=1 Then BuildModSpiderMonkey=True Case "Mod_Dingaling" BuildModDingaling=True + Case "Mod_XMLRpc" + BuildModXMLRpc=True Case Else BuildCore=True BuildModExosip=True @@ -115,6 +118,7 @@ If objArgs.Count >=1 Then BuildModSpiderMonkey=True BuildModDingaling=True BuildModilbc=True + BuildModXMLRpc=True End Select Else BuildCore=True @@ -132,6 +136,7 @@ Else BuildModSpiderMonkey=True BuildModDingaling=True BuildModilbc=True + BuildModXMLRpc=True End If ' ****************** @@ -172,6 +177,11 @@ If BuildCore Then FSO.CopyFile LibDestDir & "srtp\crypto\include\*.h", LibDestDir & "include" End If +If BuildModXMLRpc Then + BuildLibs_curl BuildDebug, BuildRelease + BuildLibs_xmlrpc BuildDebug, BuildRelease +End If + If BuildModzeroconf Then BuildLibs_howl BuildDebug, BuildRelease End If @@ -643,6 +653,33 @@ Sub BuildLibs_libsndfile(BuildDebug, BuildRelease) End If End Sub + +Sub BuildLibs_xmlrpc(BuildDebug, BuildRelease) + If Not FSO.FolderExists(LibDestDir & "xmlrpc") Then + WgetUnCompress LibsBase & "xmlrpc-c-1.03.14.tgz", LibDestDir + RenameFolder LibDestDir & "xmlrpc-c-1.03.14", "xmlrpc" + FSO.CopyFile Utilsdir & "xmlrpc\xmlrpc.vcproj", LibDestDir & "xmlrpc\Windows\", True + FSO.CopyFile LibDestDir & "xmlrpc\Windows\transport_config_win32.h", LibDestDir & "xmlrpc\transport_config.h", True + FSO.CopyFile LibDestDir & "xmlrpc\Windows\xmlrpc_win32_config.h", LibDestDir & "xmlrpc\config.h", True + FSO.CopyFile LibDestDir & "xmlrpc\Windows\xmlrpc_win32_config.h", LibDestDir & "xmlrpc\xmlrpc_config.h", True + End If + If FSO.FolderExists(LibDestDir & "xmlrpc") Then + If BuildDebug Then + If Not FSO.FileExists(LibDestDir & "xmlrpc\Debug\xmlrpc.lib") Then + BuildViaVCBuild LibDestDir & "xmlrpc\Windows\xmlrpc.vcproj", "Debug" + End If + End If + If BuildRelease Then + If Not FSO.FileExists(LibDestDir & "xmlrpc\Release\xmlrpc.lib") Then + BuildViaVCBuild LibDestDir & "xmlrpc\Windows\xmlrpc.vcproj", "Release" + End If + End If + Else + Wscript.echo "Unable to download xmlrpc" + End If +End Sub + + Sub BuildLibs_libetpan(BuildDebug, BuildRelease) If Not FSO.FolderExists(LibDestDir & "libetpan") Then WgetUnCompress LibsBase & "libetpan-0.45.tar.gz", LibDestDir @@ -756,13 +793,19 @@ Sub BuildLibs_curl(BuildDebug, BuildRelease) If BuildDebug Then If Not FSO.FileExists(LibDestDir & "curl\lib\Debug\curllib.lib") Then BuildViaVCBuild LibDestDir & "curl\lib\curllib.vcproj", "Debug" + FSO.CopyFile LibDestDir & "curl\lib\Debug\curllib.lib", ScriptDir & "Debug\", True End If End If If BuildRelease Then If Not FSO.FileExists(LibDestDir & "curl\lib\Release\curllib.lib") Then BuildViaVCBuild LibDestDir & "curl\lib\curllib.vcproj", "Release" + FSO.CopyFile LibDestDir & "curl\lib\Release\curllib.lib", ScriptDir & "Release\", True End If End If + If Not FSO.FolderExists(LibDestDir & "include\curl") Then + FSO.CreateFolder(LibDestDir & "include\curl") + End If + FSO.CopyFile LibDestDir & "curl\include\curl\*.h", LibDestDir & "include\curl" Else Wscript.echo "Unable to download curl" End If @@ -1011,7 +1054,7 @@ Sub UnCompress(Archive, DestFolder) Do WScript.Echo OExec.StdOut.ReadLine() Loop While Not OExec.StdOut.atEndOfStream - If FSO.FileExists(Left(Archive, Len(Archive)-3)) Then + If FSO.FileExists(Left(Archive, Len(Archive)-3))Then Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True) MyFile.WriteLine("@" & UtilsDir & "7za.exe x " & Left(Archive, Len(Archive)-3) & " -y -o" & DestFolder) MyFile.Close @@ -1022,6 +1065,18 @@ Sub UnCompress(Archive, DestFolder) WScript.Sleep(500) FSO.DeleteFile Left(Archive, Len(Archive)-3) ,true End If + If FSO.FileExists(Left(Archive, Len(Archive)-3) & "tar")Then + Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True) + MyFile.WriteLine("@" & UtilsDir & "7za.exe x " & Left(Archive, Len(Archive)-3) & "tar -y -o" & DestFolder) + MyFile.Close + Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat") + Do + WScript.Echo OExec.StdOut.ReadLine() + Loop While Not OExec.StdOut.atEndOfStream + WScript.Sleep(500) + FSO.DeleteFile Left(Archive, Len(Archive)-3) & "tar",true + End If + WScript.Sleep(500) End Sub diff --git a/w32/vsnet/Tools/xmlrpc/xmlrpc.vcproj b/w32/vsnet/Tools/xmlrpc/xmlrpc.vcproj new file mode 100644 index 0000000000..10f9c2fbe7 --- /dev/null +++ b/w32/vsnet/Tools/xmlrpc/xmlrpc.vcproj @@ -0,0 +1,747 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +