From af6d8fa271d7c438f5a4422363b49e2bf6d74b84 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Wed, 10 May 2006 17:48:15 +0000
Subject: [PATCH] adding mod_xml_rpc to windows build part 2/2
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1423 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
.../xml_int/mod_xml_rpc/mod_xml_rpc.vcproj | 10 +-
w32/vsnet/GetLibs.vbs | 7 +-
w32/vsnet/Tools/xmlrpc/Abyss.vcproj | 389 ++++++++++++++++++
w32/vsnet/Tools/xmlrpc/xmlrpc.vcproj | 6 +-
4 files changed, 403 insertions(+), 9 deletions(-)
create mode 100644 w32/vsnet/Tools/xmlrpc/Abyss.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 4cd39aad12..06f904a07c 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
@@ -46,7 +46,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
@@ -64,9 +64,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="curllib.lib Winmm.lib Ws2_32.lib xmlrpcD.lib Abyss.lib xml.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_xml_rpc.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
+ AdditionalLibraryDirectories=""..\..\..\..\w32\vsnet\$(OutDir)";..\..\..\..\libs\xmlrpc\lib;"..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibD""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_xml_rpc.pdb"
SubSystem="2"
@@ -126,7 +127,7 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc\include";"$(InputDir)..\..\..\..\libs\xmlrpc""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
@@ -144,9 +145,10 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="curllib.lib Winmm.lib Ws2_32.lib xmlrpc.lib Abyss.lib xml.lib"
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_xml_rpc.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
+ AdditionalLibraryDirectories=""..\..\..\..\w32\vsnet\$(OutDir)";..\..\..\..\libs\xmlrpc\lib;"..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibR""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index 2cdd0f9a3f..599cefd233 100644
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -659,19 +659,22 @@ Sub BuildLibs_xmlrpc(BuildDebug, BuildRelease)
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 Utilsdir & "xmlrpc\Abyss.vcproj", LibDestDir & "xmlrpc\lib\abyss\src\", 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
+ If Not FSO.FileExists(LibDestDir & "xmlrpc\lib\xmlrpcD.lib") Then
BuildViaVCBuild LibDestDir & "xmlrpc\Windows\xmlrpc.vcproj", "Debug"
+ BuildViaVCBuild LibDestDir & "xmlrpc\lib\abyss\src\Abyss.vcproj", "Debug"
End If
End If
If BuildRelease Then
- If Not FSO.FileExists(LibDestDir & "xmlrpc\Release\xmlrpc.lib") Then
+ If Not FSO.FileExists(LibDestDir & "xmlrpc\lib\xmlrpc.lib") Then
BuildViaVCBuild LibDestDir & "xmlrpc\Windows\xmlrpc.vcproj", "Release"
+ BuildViaVCBuild LibDestDir & "xmlrpc\lib\abyss\src\Abyss.vcproj", "Release"
End If
End If
Else
diff --git a/w32/vsnet/Tools/xmlrpc/Abyss.vcproj b/w32/vsnet/Tools/xmlrpc/Abyss.vcproj
new file mode 100644
index 0000000000..efbf169767
--- /dev/null
+++ b/w32/vsnet/Tools/xmlrpc/Abyss.vcproj
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="Abyss"
+ ProjectGUID="{356EC96D-4C9F-47B5-9083-FC328B87BA94}"
+ RootNamespace="Abyss"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory=".\objs"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../bin/Abyss.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(ProjectDir)../../../";"$(ProjectDir)../../../include/";"$(ProjectDir)../../util/include/""
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;ABYSS_WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+ MinimalRebuild="true"
+ RuntimeLibrary="3"
+ PrecompiledHeaderFile=".\objs/Abyss.pch"
+ AssemblerListingLocation=".\objs/"
+ ObjectFile=".\objs/"
+ ProgramDataBaseFileName=".\objs/"
+ WarningLevel="0"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1036"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\../bin/Abyss.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory=".\objs"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../bin/Abyss.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories=""$(ProjectDir)../../../";"$(ProjectDir)../../../include/";"$(ProjectDir)../../util/include/""
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;ABYSS_WIN32;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ PrecompiledHeaderFile=".\objs/Abyss.pch"
+ AssemblerListingLocation=".\objs/"
+ ObjectFile=".\objs/"
+ ProgramDataBaseFileName=".\objs/"
+ WarningLevel="0"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1036"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\../bin/Abyss.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="c"
+ >
+ <File
+ RelativePath="conf.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="conn.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="data.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="file.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="http.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="server.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="socket.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="thread.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\token.c"
+ >
+ </File>
+ <File
+ RelativePath="trace.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h"
+ >
+ <File
+ RelativePath="abyss.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/w32/vsnet/Tools/xmlrpc/xmlrpc.vcproj b/w32/vsnet/Tools/xmlrpc/xmlrpc.vcproj
index 10f9c2fbe7..e43acc0a75 100644
--- a/w32/vsnet/Tools/xmlrpc/xmlrpc.vcproj
+++ b/w32/vsnet/Tools/xmlrpc/xmlrpc.vcproj
@@ -51,7 +51,7 @@
AssemblerListingLocation=".\Debug\xmlrpc/"
ObjectFile=".\Debug\xmlrpc/"
ProgramDataBaseFileName=".\Debug\xmlrpc/"
- WarningLevel="3"
+ WarningLevel="0"
SuppressStartupBanner="true"
DebugInformationFormat="4"
/>
@@ -121,14 +121,14 @@
AdditionalIncludeDirectories=""$(ProjectDir)../lib/";"$(ProjectDir)../lib/curl_transport";"$(ProjectDir)../lib/util/include";"$(ProjectDir)../include";"$(ProjectDir)../";"$(ProjectDir)../lib/expat/xmlparse";"$(ProjectDir)../lib/w3c-libwww-5.3.2/Library/src";"$(ProjectDir)../lib/abyss/src";"$(ProjectDir)../lib/wininet_transport";"$(ProjectDir)../../include""
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;ABYSS_WIN32;CURL_STATICLIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\Release\xmlrpc/xmlrpc.pch"
AssemblerListingLocation=".\Release\xmlrpc/"
ObjectFile=".\Release\xmlrpc/"
ProgramDataBaseFileName=".\Release\xmlrpc/"
BrowseInformation="1"
- WarningLevel="3"
+ WarningLevel="0"
SuppressStartupBanner="true"
/>
<Tool