Author: wrowe Date: Sun Nov 21 12:18:41 2004 New Revision: 106112 Modified: httpd/mod_aspdotnet/trunk/Apache.Web/Apache.Web.vcproj httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.vcproj httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln Log:
Add .pdb output for external Release build debugging, and Create Debug 2.2 / Release 2.2 targets using APACHE22_PATH for parallel builds of 2.0 and 2.2 (2.1-dev) flavors. Versioning/GAC registration still needs work. Modified: httpd/mod_aspdotnet/trunk/Apache.Web/Apache.Web.vcproj Url: http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/Apache.Web/Apache.Web.vcproj?view=diff&rev=106112&p1=httpd/mod_aspdotnet/trunk/Apache.Web/Apache.Web.vcproj&r1=106111&p2=httpd/mod_aspdotnet/trunk/Apache.Web/Apache.Web.vcproj&r2=106112 ============================================================================== --- httpd/mod_aspdotnet/trunk/Apache.Web/Apache.Web.vcproj (original) +++ httpd/mod_aspdotnet/trunk/Apache.Web/Apache.Web.vcproj Sun Nov 21 12:18:41 2004 @@ -82,7 +82,8 @@ BufferSecurityCheck="TRUE" UsePrecompiledHeader="0" ProgramDataBaseFileName="$(IntDir)/$(ProjectName)_src.pdb" - WarningLevel="4"/> + WarningLevel="4" + DebugInformationFormat="3"/> <Tool Name="VCCustomBuildTool"/> <Tool @@ -95,8 +96,8 @@ IgnoreDefaultLibraryNames="" AddModuleNamesToAssembly="" DelayLoadDLLs="libapr.dll;libaprutil.dll;libhttpd.dll" - GenerateDebugInformation="FALSE" - GenerateMapFile="TRUE" + GenerateDebugInformation="TRUE" + GenerateMapFile="FALSE" OptimizeReferences="2"/> <Tool Name="VCMIDLTool"/> @@ -115,6 +116,113 @@ <Tool Name="VCWebDeploymentTool"/> </Configuration> + <Configuration + Name="Release 2.2|Win32" + OutputDirectory="..\Release22" + IntermediateDirectory="..\Release22" + ConfigurationType="2" + CharacterSet="2" + ManagedExtensions="TRUE" + WholeProgramOptimization="FALSE"> + <Tool + Name="VCCLCompilerTool" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories=""$(APACHE22_PATH)\include"" + AdditionalUsingDirectories="$(OutDir)" + PreprocessorDefinitions="WIN32;NDEBUG" + ExceptionHandling="FALSE" + RuntimeLibrary="0" + BufferSecurityCheck="TRUE" + UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)/$(ProjectName)_src.pdb" + WarningLevel="4" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libapr-1.lib libaprutil-1.lib libhttpd.lib" + OutputFile="$(OutDir)/$(ProjectName).dll" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories=""$(APACHE22_PATH)\lib"" + IgnoreDefaultLibraryNames="" + AddModuleNamesToAssembly="" + DelayLoadDLLs="libapr-1.dll;libaprutil-1.dll;libhttpd.dll" + GenerateDebugInformation="TRUE" + GenerateMapFile="FALSE" + OptimizeReferences="2"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool" + Description="Exporting .tlb" + CommandLine="regasm /nologo /tlb:"$(IntDir)/Apache.Web.tlb" "$(OutDir)\Apache.Web.dll" && regasm /nologo /unregister "$(OutDir)\Apache.Web.dll""/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + <Configuration + Name="Debug 2.2|Win32" + OutputDirectory="..\Debug22" + IntermediateDirectory="..\Debug22" + ConfigurationType="2" + CharacterSet="2" + ManagedExtensions="TRUE"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(APACHE22_PATH)\include"" + AdditionalUsingDirectories="$(OutDir)" + PreprocessorDefinitions="WIN32;_DEBUG" + MinimalRebuild="FALSE" + ExceptionHandling="FALSE" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + ProgramDataBaseFileName="$(IntDir)/$(ProjectName)_src.pdb" + BrowseInformation="1" + WarningLevel="4" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + RegisterOutput="FALSE" + AdditionalDependencies="libapr-1.lib libaprutil-1.lib libhttpd.lib" + OutputFile="$(OutDir)/$(ProjectName).dll" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories=""$(APACHE22_PATH)\lib"" + IgnoreDefaultLibraryNames="" + AddModuleNamesToAssembly="" + DelayLoadDLLs="libapr-1.dll;libaprutil-1.dll;libhttpd.dll" + TypeLibraryFile="" + GenerateDebugInformation="TRUE" + SupportUnloadOfDelayLoadedDLL="FALSE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool" + Description="Exporting .tlb and Installing debug components to the GAC" + CommandLine="regasm /nologo /tlb:"$(IntDir)/Apache.Web.tlb" "$(OutDir)\Apache.Web.dll" && gacutil /ir "$(OutDir)\Apache.Web.dll" FILEPATH "$(OutDir)\Apache.Web.dll" Apache.Web"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> </Configurations> <Files> <Filter @@ -143,6 +251,24 @@ Name="VCCustomBuildTool" Description="Compiling Apache.Web.Helpers" CommandLine="csc.exe /nologo /w:4 /debug- /o+ /t:module /out:"$(OutDir)\Apache.Web.Helpers.netmodule" $(InputPath) +" + Outputs="$(OutDir)/Apache.Web.Helpers.netmodule"/> + </FileConfiguration> + <FileConfiguration + Name="Release 2.2|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Compiling Apache.Web.Helpers" + CommandLine="csc.exe /nologo /w:4 /debug- /o+ /t:module /out:"$(OutDir)\Apache.Web.Helpers.netmodule" $(InputPath) +" + Outputs="$(OutDir)/Apache.Web.Helpers.netmodule"/> + </FileConfiguration> + <FileConfiguration + Name="Debug 2.2|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Compiling Apache.Web.Helpers" + CommandLine="csc.exe /nologo /w:4 /debug+ /debug:full /o- /incr- /t:module /out:"$(OutDir)\Apache.Web.Helpers.netmodule" $(InputPath) " Outputs="$(OutDir)/Apache.Web.Helpers.netmodule"/> </FileConfiguration> Modified: httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.vcproj Url: http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.vcproj?view=diff&rev=106112&p1=httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.vcproj&r1=106111&p2=httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.vcproj&r2=106112 ============================================================================== --- httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.vcproj (original) +++ httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.vcproj Sun Nov 21 12:18:41 2004 @@ -108,6 +108,104 @@ <Tool Name="VCWebDeploymentTool"/> </Configuration> + <Configuration + Name="Release 2.2|Win32" + OutputDirectory="..\Release22" + IntermediateDirectory="..\Release22" + ConfigurationType="2" + CharacterSet="2" + ManagedExtensions="FALSE"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\Apache.Web;"$(APACHE22_PATH)\include";$(IntDir)" + AdditionalUsingDirectories="$(IntDir)" + PreprocessorDefinitions="WIN32;NDEBUG" + MinimalRebuild="FALSE" + RuntimeLibrary="0" + ProgramDataBaseFileName="$(IntDir)/$(ProjectName)_src.pdb" + WarningLevel="4" + DebugInformationFormat="3" + CompileAsManaged="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libapr-1.lib libaprutil-1.lib libhttpd.lib mscoree.lib" + OutputFile="$(OutDir)/mod_aspdotnet.so" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories=""$(APACHE22_PATH)\lib"" + IgnoreAllDefaultLibraries="FALSE" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb" + OptimizeReferences="2"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + <Configuration + Name="Debug 2.2|Win32" + OutputDirectory="..\Debug22" + IntermediateDirectory="..\Debug22" + ConfigurationType="2" + CharacterSet="2" + ManagedExtensions="FALSE"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\Apache.Web;"$(APACHE22_PATH)\include";$(IntDir)" + AdditionalUsingDirectories="$(IntDir)" + PreprocessorDefinitions="WIN32;_DEBUG" + MinimalRebuild="FALSE" + ExceptionHandling="TRUE" + RuntimeLibrary="1" + ProgramDataBaseFileName="$(IntDir)/$(ProjectName)_src.pdb" + BrowseInformation="1" + WarningLevel="4" + DebugInformationFormat="3" + CompileAsManaged="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libapr-1.lib libaprutil-1.lib libhttpd.lib mscoree.lib" + OutputFile="$(OutDir)/$(ProjectName).so" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories=""$(APACHE22_PATH)\lib"" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="TRUE"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool" + Description="Installing debug module to $(APACHE22_PATH)\modules" + CommandLine="copy /y "$(OutDir)\mod_aspdotnet.so" "$(APACHE22_PATH)\modules" && copy /y "$(OutDir)\mod_aspdotnet.pdb" "$(APACHE22_PATH)\modules""/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> </Configurations> <Files> <Filter @@ -128,6 +226,21 @@ Name="Release|Win32"> <Tool Name="VCCLCompilerTool" + CompileAsManaged="0"/> + </FileConfiguration> + <FileConfiguration + Name="Release 2.2|Win32"> + <Tool + Name="VCCLCompilerTool" + CompileAsManaged="0"/> + </FileConfiguration> + <FileConfiguration + Name="Debug 2.2|Win32"> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + PrecompiledHeaderThrough="Mscoree.h" + PrecompiledHeaderFile="$(IntDir)/mod_aspdotnet.pch" CompileAsManaged="0"/> </FileConfiguration> </File> Modified: httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln Url: http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln?view=diff&rev=106112&p1=httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln&r1=106111&p2=httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln&r2=106112 ============================================================================== --- httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln (original) +++ httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln Sun Nov 21 12:18:41 2004 @@ -10,31 +10,49 @@ Global GlobalSection(SolutionConfiguration) = preSolution ConfigName.0 = Debug - ConfigName.1 = Release + ConfigName.1 = Debug 2.2 + ConfigName.2 = Release + ConfigName.3 = Release 2.2 EndGlobalSection GlobalSection(ProjectDependencies) = postSolution {B86D2326-9565-4494-B609-3E770ED14607}.0 = {4B4F627E-C6DE-4614-9135-306D94F8755B} - {D68E7F9F-9DF7-4C42-A8C0-D4E6BB129488}.0 = {5149E89D-79D2-4FE7-B088-4987CF385D46} + {D68E7F9F-9DF7-4C42-A8C0-D4E6BB129488}.0 = {4B4F627E-C6DE-4614-9135-306D94F8755B} {D68E7F9F-9DF7-4C42-A8C0-D4E6BB129488}.1 = {B86D2326-9565-4494-B609-3E770ED14607} - {D68E7F9F-9DF7-4C42-A8C0-D4E6BB129488}.2 = {4B4F627E-C6DE-4614-9135-306D94F8755B} + {D68E7F9F-9DF7-4C42-A8C0-D4E6BB129488}.2 = {5149E89D-79D2-4FE7-B088-4987CF385D46} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {B86D2326-9565-4494-B609-3E770ED14607}.Debug.ActiveCfg = Debug|Win32 {B86D2326-9565-4494-B609-3E770ED14607}.Debug.Build.0 = Debug|Win32 + {B86D2326-9565-4494-B609-3E770ED14607}.Debug 2.2.ActiveCfg = Debug 2.2|Win32 + {B86D2326-9565-4494-B609-3E770ED14607}.Debug 2.2.Build.0 = Debug 2.2|Win32 {B86D2326-9565-4494-B609-3E770ED14607}.Release.ActiveCfg = Release|Win32 {B86D2326-9565-4494-B609-3E770ED14607}.Release.Build.0 = Release|Win32 + {B86D2326-9565-4494-B609-3E770ED14607}.Release 2.2.ActiveCfg = Release 2.2|Win32 + {B86D2326-9565-4494-B609-3E770ED14607}.Release 2.2.Build.0 = Release 2.2|Win32 {4B4F627E-C6DE-4614-9135-306D94F8755B}.Debug.ActiveCfg = Debug|Win32 {4B4F627E-C6DE-4614-9135-306D94F8755B}.Debug.Build.0 = Debug|Win32 + {4B4F627E-C6DE-4614-9135-306D94F8755B}.Debug 2.2.ActiveCfg = Debug 2.2|Win32 + {4B4F627E-C6DE-4614-9135-306D94F8755B}.Debug 2.2.Build.0 = Debug 2.2|Win32 {4B4F627E-C6DE-4614-9135-306D94F8755B}.Release.ActiveCfg = Release|Win32 {4B4F627E-C6DE-4614-9135-306D94F8755B}.Release.Build.0 = Release|Win32 + {4B4F627E-C6DE-4614-9135-306D94F8755B}.Release 2.2.ActiveCfg = Release 2.2|Win32 + {4B4F627E-C6DE-4614-9135-306D94F8755B}.Release 2.2.Build.0 = Release 2.2|Win32 {D68E7F9F-9DF7-4C42-A8C0-D4E6BB129488}.Debug.ActiveCfg = x86-winnt {D68E7F9F-9DF7-4C42-A8C0-D4E6BB129488}.Debug.Build.0 = x86-winnt + {D68E7F9F-9DF7-4C42-A8C0-D4E6BB129488}.Debug 2.2.ActiveCfg = x86-winnt + {D68E7F9F-9DF7-4C42-A8C0-D4E6BB129488}.Debug 2.2.Build.0 = x86-winnt {D68E7F9F-9DF7-4C42-A8C0-D4E6BB129488}.Release.ActiveCfg = x86-winnt {D68E7F9F-9DF7-4C42-A8C0-D4E6BB129488}.Release.Build.0 = x86-winnt + {D68E7F9F-9DF7-4C42-A8C0-D4E6BB129488}.Release 2.2.ActiveCfg = x86-winnt + {D68E7F9F-9DF7-4C42-A8C0-D4E6BB129488}.Release 2.2.Build.0 = x86-winnt {5149E89D-79D2-4FE7-B088-4987CF385D46}.Debug.ActiveCfg = Debug|Win32 {5149E89D-79D2-4FE7-B088-4987CF385D46}.Debug.Build.0 = Debug|Win32 + {5149E89D-79D2-4FE7-B088-4987CF385D46}.Debug 2.2.ActiveCfg = Debug|Win32 + {5149E89D-79D2-4FE7-B088-4987CF385D46}.Debug 2.2.Build.0 = Debug|Win32 {5149E89D-79D2-4FE7-B088-4987CF385D46}.Release.ActiveCfg = Release|Win32 {5149E89D-79D2-4FE7-B088-4987CF385D46}.Release.Build.0 = Release|Win32 + {5149E89D-79D2-4FE7-B088-4987CF385D46}.Release 2.2.ActiveCfg = Release|Win32 + {5149E89D-79D2-4FE7-B088-4987CF385D46}.Release 2.2.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection
