You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by David Shane Holden <dp...@yahoo.com> on 2002/07/18 20:23:54 UTC

[PATCH] Makefile.win

   - Cleans up the garbled output.
 - Fixes a few grammatical errors and incorrect path information.
 - Removes building from .mak files.

Is building browse information from the command line useful?  
It doesn't build as it is, and from what I know the only real benefit
of browse info is when it's used in conjunction with the IDE.

Shane



Re: [PATCH] Makefile.win

Posted by David Shane Holden <dp...@yahoo.com>.

William A. Rowe, Jr. wrote:
 >
 > Ugh.  -1 ... you eliminate the ability for VC5 users to build these
 > modules.
 > VC5 never supported invoking the IDE from the command line.
 >
 > No, we don't distribute .mak files from CVS, but any VC5 or VC6 user
 > can export the make files after doing one full build from the IDE [you need
 > all the files to exist before VC will determine the references correctly.]

I see, I see.


 >
 > Here is what's left of the patch I applied.  The intermingled stuff was
 > too much to battle, feel free to submit anything I'd missed, aside from
 > eliminating .mak builds.

A few 'silencers'.




Re: [PATCH] Makefile.win

Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
At 01:23 PM 7/18/2002, David Shane Holden wrote:
>   - Cleans up the garbled output.
>- Fixes a few grammatical errors and incorrect path information.

Cool, thanks.

>- Removes building from .mak files.

Ugh.  -1 ... you eliminate the ability for VC5 users to build these modules.
VC5 never supported invoking the IDE from the command line.

No, we don't distribute .mak files from CVS, but any VC5 or VC6 user
can export the make files after doing one full build from the IDE [you need
all the files to exist before VC will determine the references correctly.]

>Is building browse information from the command line useful?
>It doesn't build as it is, and from what I know the only real benefit
>of browse info is when it's used in conjunction with the IDE.

Yes, as a pseudotarget I'd never introduced, that would only be invoked
from within an ide project [say, BuildBrowse.dsp invoking makefile.win]

The concept is that we would like one amalgamated browse reference
to the entire project, and VC has never been really good on this point.


Here is what's left of the patch I applied.  The intermingled stuff was
too much to battle, feel free to submit anything I'd missed, aside from
eliminating .mak builds.

Index: Makefile.win
===================================================================
RCS file: /home/cvspublic/httpd-2.0/Makefile.win,v
retrieving revision 1.108
diff -u -r1.108 Makefile.win
--- Makefile.win        13 Jul 2002 06:01:10 -0000      1.108
+++ Makefile.win        18 Jul 2002 18:08:42 -0000
@@ -25,7 +25,7 @@
  # so the server root should be given in forward slashes (quoted),
  # preferably with the drive designation!

-default:        _apacher
+default: _apacher

  !IF ("$(CTARGET)" == "") && EXIST("Apache.sln")
  CTARGET=/build
@@ -78,11 +71,12 @@
  #     NOT EXIST("srclib\openssl")

  _tryssl:
-       echo mod_ssl and ab/ssl will not build without openssl
-       echo installed in $(INSTDIR)\srclib\openssl.  They must be precompiled
-       echo using the ms/ntdll.mak file, see srclib\openssl\INSTALL.W32.
-       echo The most recent version confirmed to build with mod_ssl and ab
-       echo was 0.9.6c available from http://www.openssl.org/
+       @echo -----
+       @echo mod_ssl and ab/ssl will not build unless openssl is installed
+       @echo in srclib\openssl.  They must be precompiled using the
+       @echo ms/ntdll.mak file, see srclib\openssl\INSTALL.W32.  The most
+       @echo recent version confirmed to build with mod_ssl and ab is 0.9.6c.
+       @echo Available from http://www.openssl.org/
  !ENDIF

  !IF EXIST("srclib\zlib")
@@ -103,25 +93,33 @@
  #     NOT EXIST("srclib\zlib")

  _tryzlib:
-       echo mod_deflate will not build without zlib installed in
-       echo $(INSTDIR)\srclib\zlib.
-       echo Zlib needs not be built, we compile the sources directly.
+       @echo -----
+       @echo mod_deflate will not build unless zlib is installed in 
srclib\zlib.
+       @echo zlib does not need to be built, we compile the sources directly.
+       @echo Available from http://www.gzip.org/zlib/

  !ENDIF

  !IF "$(INSTDIR)" == ""
  INSTDIR=\Apache2
-!MESSAGE INSTDIR not specified, installing to default $(INSTDIR)
-!ENDIF
+!ENDIF
+!IF "$(SERVERNAME)" == ""
+SERVERNAME=localhost
+!ENDIF
  !IF "$(PORT)" == ""
  PORT=80
-!MESSAGE PORT not specified, using default $(PORT)
-!MESSAGE To change this use $(MAKE) -f makefile.win PORT=8080 installr
  !ENDIF
-!IF "$(SERVERNAME)" == ""
-SERVERNAME=localhost
-!MESSAGE SERVERNAME not specified, using default $(SERVERNAME)
-!MESSAGE To change this use $(MAKE) -f makefile.win PORT=www.example.com 
installr
+
+!IF "$(LONG)" == ""
+!MESSAGE
+!MESSAGE INSTDIR    = $(INSTDIR)
+!MESSAGE SERVERNAME = $(SERVERNAME)
+!MESSAGE PORT       = $(PORT)
+!MESSAGE
+!MESSAGE To change these options use 'nmake /f Makefile.win [option=value]'
+!MESSAGE Example: nmake /f Makefile.win PORT=8080
+!MESSAGE
+!MESSAGE
  !ENDIF

  !IFNDEF MAKEOPT
@@ -306,22 +179,22 @@
  !ELSE

  _cleanr:
-       $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release 
CTARGET="/CLEAN" _build
+       @$(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
+       @$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D 
LONG=Debug   CTARGET="/CLEAN" _build

  _build:
-       echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
-       msdev Apache.dsw /USEENV /MAKE \
+       @echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
+       @msdev Apache.dsw /USEENV /MAKE \
                 "BuildBin - Win32 $(LONG)" $(CTARGET)
  !IF EXIST("srclib\openssl")
-       msdev Apache.dsw /USEENV /MAKE \
+       @msdev Apache.dsw /USEENV /MAKE \
                 "mod_ssl - Win32 $(LONG)" \
                 "abs - Win32 $(LONG)" /NORECURSE $(CTARGET)
  !ENDIF
  !IF EXIST("srclib\zlib")
-       msdev Apache.dsw /USEENV /MAKE \
+       @msdev Apache.dsw /USEENV /MAKE \
                 "mod_deflate - Win32 $(LONG)" /NORECURSE $(CTARGET)
  !ENDIF