Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 34230 invoked from network); 7 Jul 2006 02:06:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Jul 2006 02:06:53 -0000 Received: (qmail 33268 invoked by uid 500); 7 Jul 2006 02:06:52 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 33246 invoked by uid 500); 7 Jul 2006 02:06:52 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 33235 invoked by uid 99); 7 Jul 2006 02:06:52 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 19:06:52 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 19:06:51 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B05C71A981A; Thu, 6 Jul 2006 19:06:31 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060707020631.B05C71A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 @@ + OptimizeReferences="2" + ImportLibrary="$(OutDir)/$(TargetName).lib"/> @@ -88,15 +87,117 @@ Name="VCCustomBuildTool"/> + + + + + + + + + + + + + OptimizeReferences="2" + ImportLibrary="$(OutDir)/$(TargetName).lib"/> + + + + + + + + + + + +