httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r419767 - in /httpd/mod_aspdotnet/trunk: mod_aspdotnet.sln msi_dll/resolve_apache.c msi_dll/resolve_apache.vcproj
Date Fri, 07 Jul 2006 02:06:30 GMT
Author: wrowe
Date: Thu Jul  6 19:06:30 2006
New Revision: 419767

URL: http://svn.apache.org/viewvc?rev=419767&view=rev
Log:

  Two flavors of resolve_apache, compile for httpd.exe and apache.exe

Modified:
    httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln
    httpd/mod_aspdotnet/trunk/msi_dll/resolve_apache.c
    httpd/mod_aspdotnet/trunk/msi_dll/resolve_apache.vcproj

Modified: httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln
URL: http://svn.apache.org/viewvc/httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln?rev=419767&r1=419766&r2=419767&view=diff
==============================================================================
--- httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln (original)
+++ httpd/mod_aspdotnet/trunk/mod_aspdotnet.sln Thu Jul  6 19:06:30 2006
@@ -16,9 +16,9 @@
 	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
@@ -47,12 +47,12 @@
 		{D68E7F9F-9DF7-4C42-A8C0-D4E6BB129488}.Release 2.2.Build.0 = Release 2.2
 		{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}.Debug 2.2.ActiveCfg = Debug 2.2|Win32
+		{5149E89D-79D2-4FE7-B088-4987CF385D46}.Debug 2.2.Build.0 = Debug 2.2|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
+		{5149E89D-79D2-4FE7-B088-4987CF385D46}.Release 2.2.ActiveCfg = Release 2.2|Win32
+		{5149E89D-79D2-4FE7-B088-4987CF385D46}.Release 2.2.Build.0 = Release 2.2|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

Modified: httpd/mod_aspdotnet/trunk/msi_dll/resolve_apache.c
URL: http://svn.apache.org/viewvc/httpd/mod_aspdotnet/trunk/msi_dll/resolve_apache.c?rev=419767&r1=419766&r2=419767&view=diff
==============================================================================
--- httpd/mod_aspdotnet/trunk/msi_dll/resolve_apache.c (original)
+++ httpd/mod_aspdotnet/trunk/msi_dll/resolve_apache.c Thu Jul  6 19:06:30 2006
@@ -25,6 +25,8 @@
 #include "MsiQuery.h"
 #include "quicksearch.h"
 
+#define stringize(var) #var
+
 struct cbResolverArg {
     MSIHANDLE hInstall;
     MSIHANDLE hDB;
@@ -88,7 +90,7 @@
         return res;
     }
 
-    drsearch("bin\\apache.exe", 3, cbResolver, &wrk);
+    drsearch("bin\\" stringize(BINARY), 3, cbResolver, &wrk);
 
     MsiCloseHandle(wrk.hView);
     MsiCloseHandle(wrk.hDB);
@@ -141,7 +143,7 @@
 
 UINT __declspec(dllexport) __stdcall VerifyApachePath(MSIHANDLE hInstall) 
 {
-    char chkfile[] = "bin\\apache.exe";
+    char chkfile[] = "bin\\" stringize(BINARY);
     WIN32_FILE_ATTRIBUTE_DATA fi;
     DWORD len = MAX_PATH;
     char str[MAX_PATH + 1];

Modified: httpd/mod_aspdotnet/trunk/msi_dll/resolve_apache.vcproj
URL: http://svn.apache.org/viewvc/httpd/mod_aspdotnet/trunk/msi_dll/resolve_apache.vcproj?rev=419767&r1=419766&r2=419767&view=diff
==============================================================================
--- httpd/mod_aspdotnet/trunk/msi_dll/resolve_apache.vcproj (original)
+++ httpd/mod_aspdotnet/trunk/msi_dll/resolve_apache.vcproj Thu Jul  6 19:06:30 2006
@@ -13,7 +13,7 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="."
+			OutputDirectory="..\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
 			UseOfMFC="0"
@@ -21,28 +21,28 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;BINARY=Apache.exe"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\Release/resolve_apache.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName="Release\resolve_apache"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ProgramDataBaseFileName=".\Release\resolve_apache_src"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="msi.lib wsock32.lib"
-				OutputFile="./resolve_apache.dll"
+				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile="./resolve_apache.pdb"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
 				SubSystem="2"
-				ImportLibrary="./resolve_apache.lib"/>
+				OptimizeReferences="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="NDEBUG"
@@ -67,7 +67,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="."
+			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
 			UseOfMFC="0"
@@ -75,12 +75,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;BINARY=Apache.exe"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/resolve_apache.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName="Debug\resolve_apache"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ProgramDataBaseFileName=".\Debug\resolve_apache_src"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="3"/>
@@ -88,15 +87,117 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="msi.lib wsock32.lib"
-				OutputFile="./resolve_apache.dll"
+				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="./resolve_apache.pdb"
+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="./resolve_apache.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release 2.2|Win32"
+			OutputDirectory="..\Release22"
+			IntermediateDirectory=".\Release22"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;BINARY=httpd.exe"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ProgramDataBaseFileName=".\Release22\resolve_apache_src"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="msi.lib wsock32.lib"
+				OutputFile="$(OutDir)/$(ProjectName).dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/$(ProjectName).pdb"
 				SubSystem="2"
-				ImportLibrary="./resolve_apache.lib"/>
+				OptimizeReferences="2"
+				ImportLibrary="$(OutDir)/$(TargetName).lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName="./resolve_apache.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug 2.2|Win32"
+			OutputDirectory=".\Debug22"
+			IntermediateDirectory=".\Debug22"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;BINARY=httpd.exe"
+				RuntimeLibrary="1"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=""
+				ProgramDataBaseFileName=".\Debug22\resolve_apache_src"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="msi.lib wsock32.lib"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				SubSystem="2"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="_DEBUG"



Mime
View raw message