You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2002/01/10 04:12:39 UTC
cvs commit: httpd-2.0 InstallBin.dsp Makefile.win
wrowe 02/01/09 19:12:39
Modified: . InstallBin.dsp Makefile.win
Log:
Change the name of the _tryssl to an underbar prefix so we know it is
an 'internal' thing, and try building explicit targets to avoid ever
dragging in .bsc construction.
Also introduce _browse. This is far from complete, but I'm working on
a mechansim to toggle browse database construction - of a single .bsc
file for DevStudio's browser database. The ugly bit is; it gobbles some
80MB for construction, so we will never waste that sort of space on
the typical case, but reserve it for developers who choose to toggle it.
Revision Changes Path
1.17 +3 -3 httpd-2.0/InstallBin.dsp
Index: InstallBin.dsp
===================================================================
RCS file: /home/cvs/httpd-2.0/InstallBin.dsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- InstallBin.dsp 31 Jul 2001 16:49:23 -0000 1.16
+++ InstallBin.dsp 10 Jan 2002 03:12:39 -0000 1.17
@@ -39,10 +39,10 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" SHORT=R LONG=Release tryssl _install"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" SHORT=R LONG=Release _tryssl _install"
# PROP Rebuild_Opt ""
# PROP Target_File "\Apache2\bin\Apache.exe"
-# PROP Bsc_Name ""
+# PROP Bsc_Name "Browse\Apache.bsc"
# PROP Target_Dir ""
!ELSEIF "$(CFG)" == "InstallBin - Win32 Debug"
@@ -58,7 +58,7 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" SHORT=D LONG=Debug tryssl _install"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" SHORT=D LONG=Debug _tryssl _install"
# PROP Rebuild_Opt ""
# PROP Target_File "\Apache2\bin\Apache.exe"
# PROP Bsc_Name ""
1.85 +15 -6 httpd-2.0/Makefile.win
Index: Makefile.win
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.win,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- Makefile.win 24 Nov 2001 16:38:01 -0000 1.84
+++ Makefile.win 10 Jan 2002 03:12:39 -0000 1.85
@@ -8,6 +8,7 @@
# clean - remove (most) generated files
# _cleanr - remove (most) files generated by a Release build
# _cleand - remove (most) files generated by a Debug build
+# _browse - build the browse info file
#
# The default installation directory is \Apache2.0. This can be changed
# with the INSTDIR macro, for example:
@@ -37,7 +38,7 @@
!ERROR Need $(INSTDIR)\srclib\apr-util
!ENDIF
-# Note; tryssl: is only used by the msvc developer studio environment to 'fix up'
+# Note; _tryssl: is only used by the msvc developer studio environment to 'fix up'
# the build, since conditional dependencies aren't supported.
#
!IF EXIST("srclib\openssl")
@@ -46,13 +47,13 @@
!ELSE
SSLBIN=out32dll
!ENDIF
-tryssl:
+_tryssl:
!IF EXIST("modules\ssl\mod_ssl.mak")
cd modules\ssl
- $(MAKE) $(MAKEOPT) -f mod_ssl.mak CFG="mod_ssl - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_ssl.mak CFG="mod_ssl - Win32 $(LONG)" RECURSE=0 $(LONG)/mod_ssl.so
cd ..\..
cd support
- $(MAKE) $(MAKEOPT) -f abs.mak CFG="abs - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f abs.mak CFG="abs - Win32 $(LONG)" RECURSE=0 $(LONG)/abs.exe
cd ..
!ELSE
msdev Apache.dsw /MAKE\
@@ -61,7 +62,7 @@
!ENDIF
!ELSE
-tryssl:
+_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 INSTALL.W32 for details.
@@ -83,6 +84,11 @@
!ENDIF
!ENDIF
+_browse:
+ cd Browse
+ bscmake.exe -nologo -Iu -o Apache.bsc *.sbr
+ cd ..
+
_apacher:
$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release _build
@@ -96,10 +102,13 @@
$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug _build _install
clean: _cleanr _cleand
+ rd /s Browse < <<
+y
+<<
!IF EXIST("Apache.mak")
-_cleanr:
+_cleanr:
$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _build
_cleand: