httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/os/win32 BaseAddr.ref
Date Tue, 31 Aug 2004 20:11:35 GMT
wrowe       2004/08/31 13:11:35

  Modified:    .        Apache.dsw Makefile.win
               os/win32 BaseAddr.ref
  Added:       modules/ldap mod_ldap.dsp
  Removed:     modules/ldap util_ldap.dsp
  Log:
    Catch up for Win32 to authnz_ldap changes, and make win32's module
    for util_ldap features named mod_ldap.so as on Unix.
  
  Revision  Changes    Path
  1.106     +48 -24    httpd-2.0/Apache.dsw
  
  Index: Apache.dsw
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Apache.dsw,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- Apache.dsw	24 Aug 2004 08:02:26 -0000	1.105
  +++ Apache.dsw	31 Aug 2004 20:11:35 -0000	1.106
  @@ -78,9 +78,6 @@
       Project_Dep_Name mod_auth_digest
       End Project Dependency
       Begin Project Dependency
  -    Project_Dep_Name mod_auth_ldap
  -    End Project Dependency
  -    Begin Project Dependency
       Project_Dep_Name mod_authn_anon
       End Project Dependency
       Begin Project Dependency
  @@ -93,6 +90,9 @@
       Project_Dep_Name mod_authn_file
       End Project Dependency
       Begin Project Dependency
  +    Project_Dep_Name mod_authnz_ldap
  +    End Project Dependency
  +    Begin Project Dependency
       Project_Dep_Name mod_authz_dbm
       End Project Dependency
       Begin Project Dependency
  @@ -666,6 +666,30 @@
   
   ###############################################################################
   
  +Project: "mod_authnz_ldap"=.\modules\aaa\mod_authnz_ldap.dsp - Package Owner=<4>
  +
  +Package=<5>
  +{{{
  +}}}
  +
  +Package=<4>
  +{{{
  +    Begin Project Dependency
  +    Project_Dep_Name libapr
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name libaprutil
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name libhttpd
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name mod_ldap
  +    End Project Dependency
  +}}}
  +
  +###############################################################################
  +
   Project: "mod_authn_anon"=.\modules\aaa\mod_authn_anon.dsp - Package Owner=<4>
   
   Package=<5>
  @@ -1350,6 +1374,27 @@
   
   ###############################################################################
   
  +Project: "mod_ldap"=.\modules\ldap\mod_ldap.dsp - Package Owner=<4>
  +
  +Package=<5>
  +{{{
  +}}}
  +
  +Package=<4>
  +{{{
  +    Begin Project Dependency
  +    Project_Dep_Name libapr
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name libaprutil
  +    End Project Dependency
  +    Begin Project Dependency
  +    Project_Dep_Name libhttpd
  +    End Project Dependency
  +}}}
  +
  +###############################################################################
  +
   Project: "mod_log_config"=.\modules\loggers\mod_log_config.dsp - Package Owner=<4>
   
   Package=<5>
  @@ -1894,27 +1939,6 @@
       End Project Dependency
       Begin Project Dependency
       Project_Dep_Name aprutil
  -    End Project Dependency
  -}}}
  -
  -###############################################################################
  -
  -Project: "util_ldap"=.\modules\ldap\util_ldap.dsp - Package Owner=<4>
  -
  -Package=<5>
  -{{{
  -}}}
  -
  -Package=<4>
  -{{{
  -    Begin Project Dependency
  -    Project_Dep_Name libapr
  -    End Project Dependency
  -    Begin Project Dependency
  -    Project_Dep_Name libaprutil
  -    End Project Dependency
  -    Begin Project Dependency
  -    Project_Dep_Name libhttpd
       End Project Dependency
   }}}
   
  
  
  
  1.141     +12 -6     httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.140
  retrieving revision 1.141
  diff -u -r1.140 -r1.141
  --- Makefile.win	19 Apr 2004 18:34:59 -0000	1.140
  +++ Makefile.win	31 Aug 2004 20:11:35 -0000	1.141
  @@ -98,8 +98,8 @@
   _tryzlib:
   	@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/
  +	@echo Version 1.2.1 and later available from http://www.gzip.org/zlib/
  +	@echo built w/ nmake -f win32/Makefile.msc will satisfy this requirement.
   
   !ENDIF
   
  @@ -209,6 +209,10 @@
   	cd ..
   	 $(MAKE) $(MAKEOPT) -f libhttpd.mak        CFG="libhttpd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f Apache.mak          CFG="Apache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  +# build ldap prior to authnz_ldap
  +	cd modules\ldap
  +	 $(MAKE) $(MAKEOPT) -f mod_ldap.mak        CFG="mod_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  +	cd ..\..
   	cd modules\aaa
   	 $(MAKE) $(MAKEOPT) -f mod_auth_basic.mak  CFG="mod_auth_basic - Win32 $(LONG)" RECURSE=0
$(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f mod_auth_digest.mak CFG="mod_auth_digest - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  @@ -221,6 +225,7 @@
   	 $(MAKE) $(MAKEOPT) -f mod_authz_groupfile.mak CFG="mod_authz_groupfile - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f mod_authz_host.mak  CFG="mod_authz_host - Win32 $(LONG)" RECURSE=0
$(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f mod_authz_user.mak  CFG="mod_authz_user - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  +	 $(MAKE) $(MAKEOPT) -f mod_authnz_ldap.mak CFG="mod_authnz_ldap - Win32 $(LONG)" RECURSE=0
$(CTARGET)
   	cd ..\..
   	cd modules\arch\win32
   	 $(MAKE) $(MAKEOPT) -f mod_isapi.mak       CFG="mod_isapi - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  @@ -239,8 +244,6 @@
   	 $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0
$(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f mod_mem_cache.mak   CFG="mod_mem_cache - Win32 $(LONG)" RECURSE=0
$(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f mod_disk_cache.mak  CFG="mod_disk_cache - Win32 $(LONG)" RECURSE=0
$(CTARGET)
  -	 $(MAKE) $(MAKEOPT) -f util_ldap.mak       CFG="util_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  -	 $(MAKE) $(MAKEOPT) -f mod_auth_ldap.mak   CFG="mod_auth_ldap - Win32 $(LONG)" RECURSE=0
$(CTARGET)
   	cd ..\..
   	cd modules\filters
   !IF EXIST("srclib\zlib")
  @@ -381,6 +384,7 @@
   	copy modules\aaa\$(LONG)\mod_authz_groupfile.$(src_so) 	"$(inst_so)" <.y
   	copy modules\aaa\$(LONG)\mod_authz_host.$(src_so) 	"$(inst_so)" <.y
   	copy modules\aaa\$(LONG)\mod_authz_user.$(src_so) 	"$(inst_so)" <.y
  +	copy modules\aaa\$(LONG)\mod_authnz_ldap.$(src_so)	"$(inst_so)" <.y
   	copy modules\arch\win32\$(LONG)\mod_isapi.$(src_so) 	"$(inst_so)" <.y
   	copy modules\cache\$(LONG)\mod_file_cache.$(src_so) 	"$(inst_so)" <.y
   	copy modules\dav\fs\$(LONG)\mod_dav_fs.$(src_so) 	"$(inst_so)" <.y
  @@ -389,10 +393,11 @@
   	copy modules\experimental\$(LONG)\mod_charset_lite.$(src_so)	"$(inst_so)" <.y
   	copy modules\experimental\$(LONG)\mod_mem_cache.$(src_so)	"$(inst_so)" <.y
   	copy modules\experimental\$(LONG)\mod_disk_cache.$(src_so)	"$(inst_so)" <.y
  -	copy modules\experimental\$(LONG)\util_ldap.$(src_so)		"$(inst_so)" <.y
  -	copy modules\experimental\$(LONG)\mod_auth_ldap.$(src_so)	"$(inst_so)" <.y
   !IF EXIST("srclib\zlib")
   	copy modules\filters\$(LONG)\mod_deflate.$(src_so) 	"$(inst_so)" <.y
  +!IF EXIST("srclib\zlib\zlib1.$(src_dll)")
  +	copy srclib\zlib\zlib1.$(src_dll)		 	"$(inst_dll)" <.y
  +!ENDIF
   !ENDIF
   	copy modules\filters\$(LONG)\mod_ext_filter.$(src_so) 	"$(inst_so)" <.y
   	copy modules\filters\$(LONG)\mod_include.$(src_so) 	"$(inst_so)" <.y
  @@ -402,6 +407,7 @@
   	copy modules\generators\$(LONG)\mod_info.$(src_so) 	"$(inst_so)" <.y
   	copy modules\generators\$(LONG)\mod_status.$(src_so) 	"$(inst_so)" <.y
   	copy modules\http\$(LONG)\mod_mime.$(src_so) 		"$(inst_so)" <.y
  +	copy modules\ldap\$(LONG)\mod_ldap.$(src_so)		"$(inst_so)" <.y
   	copy modules\loggers\$(LONG)\mod_log_config.$(src_so) 	"$(inst_so)" <.y
   	copy modules\loggers\$(LONG)\mod_log_forensic.$(src_so) "$(inst_so)" <.y
   	copy modules\loggers\$(LONG)\mod_logio.$(src_so) 	"$(inst_so)" <.y
  
  
  
  1.1                  httpd-2.0/modules/ldap/mod_ldap.dsp
  
  Index: mod_ldap.dsp
  ===================================================================
  # Microsoft Developer Studio Project File - Name="mod_ldap" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 6.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
  CFG=mod_ldap - Win32 Release
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "mod_ldap.mak".
  !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "mod_ldap.mak" CFG="mod_ldap - Win32 Release"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "mod_ldap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "mod_ldap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
  # Begin Project
  # PROP AllowPerConfigDependencies 0
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  CPP=cl.exe
  MTL=midl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "mod_ldap - Win32 Release"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "Release"
  # PROP Intermediate_Dir "Release"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo /MD /W3 /Zi /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include"
/D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "LDAP_DECLARE_EXPORT" /Fd"Release\mod_ldap_src" /FD
/c
  # ADD BASE MTL /nologo /D "NDEBUG" /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  # ADD RSC /l 0x409 /d "NDEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_ldap.so"
/base:@..\..\os\win32\BaseAddr.ref,mod_ldap.so
  # ADD LINK32 kernel32.lib wldap32.lib /nologo /subsystem:windows /dll /incremental:no /debug
/machine:I386 /out:"Release/mod_ldap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_ldap.so /opt:ref
  
  !ELSEIF  "$(CFG)" == "mod_ldap - Win32 Debug"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include"
/I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "LDAP_DECLARE_EXPORT"
/Fd"Debug\mod_ldap_src" /FD /c
  # ADD BASE MTL /nologo /D "_DEBUG" /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
  # ADD RSC /l 0x409 /d "_DEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386
/out:"Debug/mod_ldap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_ldap.so
  # ADD LINK32 kernel32.lib wldap32.lib /nologo /subsystem:windows /dll /incremental:no /debug
/machine:I386 /out:"Debug/mod_ldap.so" /base:@..\..\os\win32\BaseAddr.ref,mod_ldap.so
  
  !ENDIF 
  
  # Begin Target
  
  # Name "mod_ldap - Win32 Release"
  # Name "mod_ldap - Win32 Debug"
  # Begin Source File
  
  SOURCE=.\mod_ldap.rc
  # End Source File
  # Begin Source File
  
  SOURCE=.\util_ldap.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\util_ldap_cache.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\util_ldap_cache.h
  # End Source File
  # Begin Source File
  
  SOURCE=.\util_ldap_cache_mgr.c
  # End Source File
  # Begin Source File
  
  SOURCE=..\..\build\win32\win32ver.awk
  
  !IF  "$(CFG)" == "mod_ldap - Win32 Release"
  
  # PROP Ignore_Default_Tool 1
  # Begin Custom Build - Creating Version Resource
  InputPath=..\..\build\win32\win32ver.awk
  
  ".\mod_ldap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  	awk -f ../../build/win32/win32ver.awk mod_ldap.so "LDAP Utility Module for Apache" ../../include/ap_release.h
> .\mod_ldap.rc
  
  # End Custom Build
  
  !ELSEIF  "$(CFG)" == "mod_ldap - Win32 Debug"
  
  # PROP Ignore_Default_Tool 1
  # Begin Custom Build - Creating Version Resource
  InputPath=..\..\build\win32\win32ver.awk
  
  ".\mod_ldap.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  	awk -f ../../build/win32/win32ver.awk mod_ldap.so "LDAP Utility Module for Apache" ../../include/ap_release.h
> .\mod_ldap.rc
  
  # End Custom Build
  
  !ENDIF 
  
  # End Source File
  # End Target
  # End Project
  
  
  
  1.29      +2 -2      httpd-2.0/os/win32/BaseAddr.ref
  
  Index: BaseAddr.ref
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/win32/BaseAddr.ref,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- BaseAddr.ref	17 Aug 2004 16:35:26 -0000	1.28
  +++ BaseAddr.ref	31 Aug 2004 20:11:35 -0000	1.29
  @@ -61,8 +61,8 @@
   mod_authz_host.so       0x6FB00000    0x00010000
   mod_authz_user.so       0x6FAF0000    0x00010000
   mod_logio.so            0x6FAE0000    0x00010000
  -util_ldap.so            0x6FAD0000    0x00010000
  -mod_auth_ldap.so        0x6FAC0000    0x00010000
  +mod_ldap.so             0x6FAD0000    0x00010000
  +mod_authnz_ldap.so      0x6FAC0000    0x00010000
   mod_ident.so            0x6FAB0000    0x00010000
   mod_proxy_ajp.so        0x6FAA0000    0x00010000
   mod_proxy_balancer.so   0x6FA90000    0x00010000
  
  
  

Mime
View raw message