You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by mi...@apache.org on 2013/05/28 16:27:32 UTC

svn commit: r1486938 - in /httpd/httpd/branches/2.4.x: ./ Makefile.win STATUS

Author: minfrin
Date: Tue May 28 14:27:32 2013
New Revision: 1486938

URL: http://svn.apache.org/r1486938
Log:
makefile.win: Adjust makefile to properly detect the need to use devenv
on applicable MSVC versions.

trunk patch: http://svn.apache.org/r1482041
Submitted by: gsmith
Reviewed by: jim, minfrin

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/Makefile.win
    httpd/httpd/branches/2.4.x/STATUS

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1482041,1486490

Modified: httpd/httpd/branches/2.4.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Makefile.win?rev=1486938&r1=1486937&r2=1486938&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Makefile.win (original)
+++ httpd/httpd/branches/2.4.x/Makefile.win Tue May 28 14:27:32 2013
@@ -42,7 +42,7 @@
 # so the server root should be given in forward slashes (quoted),
 # preferably with the drive designation!
 
-!IF EXIST("httpd.vcproj") && ([devenv /help > NUL 2>&1] == 0) \
+!IF EXIST("Apache.sln") && ([devenv /help > NUL 2>&1] == 0) \
     && !defined(USEMAK) && !defined(USEDSW)
 USESLN=1
 USEMAK=0

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1486938&r1=1486937&r2=1486938&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue May 28 14:27:32 2013
@@ -90,12 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
  
-    * makefile.win: Adjust makefile to properly detect the need to use devenv
-      on applicable MSVC versions.
-      trunk patch: http://svn.apache.org/r1482041
-      2.4.x patch: trunk patch works with offset
-      +1: gsmith, jim, minfrin
-
  
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK: