Commit 69453901 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Fix command line devenv builds for MS VS 7.0 users.  msdev is a command
  that no longer exists, and we won't count on .mak files [although they
  are much faster if they exist, as there is no such concept as /norecurse
  in this newer release.]  We will use the existance of a converted
  Apache.sln (solution) file as proof of 7.0, there isn't another graceful
  way to check that I see.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95084 13f79535-47bb-0310-9956-ffa450edef68
parent 8c57ac5c

Makefile.win

+29 −0
Changes for Makefile.win: 29 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -27,6 +27,10 @@ 


default:        _apacher



!IF ("$(CTARGET)" == "") && EXIST("Apache.sln")

CTARGET=/build

!ENDIF



!IF !EXIST("srclib\apr")

!MESSAGE Please check out or download and unpack the Apache Portability Runtime

!MESSAGE sources (apr and apr-util) into your $(INSTDIR)\srclib directory.
@@ -61,6 +65,9 @@ _tryssl: 
	cd support

	$(MAKE) $(MAKEOPT) -f abs.mak CFG="abs - Win32 $(LONG)" RECURSE=0 .\$(LONG)\abs.exe

	cd ..

!ELSEIF EXIST("Apache.sln")

	devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_ssl

	devenv Apache.sln /useenv $(CTARGET) $(LONG) /project abs

!ELSE

	msdev Apache.dsw /USEENV /MAKE \

		"mod_ssl - Win32 $(LONG)" \
@@ -85,6 +92,8 @@ _tryzlib: 
	cd modules\filters

	$(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 .\$(LONG)\mod_deflate.so

	cd ..\..

!ELSEIF EXIST("Apache.sln")

	devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_deflate

!ELSE

	msdev Apache.dsw /USEENV /MAKE \

		"mod_deflate - Win32 $(LONG)" /NORECURSE $(CTARGET)
@@ -276,6 +285,26 @@ _build: 
	 $(MAKE) $(MAKEOPT) -f wintty.mak          CFG="wintty - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	cd ..\..



!ELSEIF EXIST("Apache.sln")



_cleanr:  

	$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET="/clean" _build



_cleand:  

	$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug   CTARGET="/clean" _build



_build:

	echo Building Win32 $(LONG) targets ($(SHORT) suffixes)

	-del $(LONG)\buildmark.obj

	devenv Apache.sln /useenv $(CTARGET) $(LONG) /project BuildBin

!IF EXIST("srclib\openssl")

	devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_ssl

	devenv Apache.sln /useenv $(CTARGET) $(LONG) /project abs

!ENDIF

!IF EXIST("srclib\zlib")

	devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_deflate

!ENDIF



!ELSE



_cleanr: