Skip to content

Commit

Permalink
Sync build changes, current to r569249, modulo those modules which
Browse files Browse the repository at this point in the history 
don't correpond between 2.3-dev and 2.2.

Introduces ALL=1 flag that will cause the modules which are only
interesting to developers to be built.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@569261 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
@wrowe
wrowe committed Aug 24, 2007
1 parent 8c30c34 commit 40efa4e
Show file tree
Hide file tree
Showing 12 changed files with 1,289 additions and 27 deletions.
264 changes: 240 additions & 24 deletions Apache.dsw
View file

Large diffs are not rendered by default.

97 changes: 97 additions & 0 deletions BuildAll.dsp
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 45 additions & 2 deletions Makefile.win
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
# SSLPORT 443
# SERVERNAME localhost
#
# ALL (unset) Includes additional modules for build testing
#
# For example;
#
# nmake -f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr
Expand Down Expand Up @@ -222,17 +224,19 @@ _build:
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)
$(MAKE) $(MAKEOPT) -f mod_authn_alias.mak CFG="mod_authn_alias - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authn_anon.mak CFG="mod_authn_anon - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authn_dbd.mak CFG="mod_authn_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authn_dbm.mak CFG="mod_authn_dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authn_default.mak CFG="mod_authn_default - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authn_file.mak CFG="mod_authn_file - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authnz_ldap.mak CFG="mod_authnz_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authz_dbm.mak CFG="mod_authz_dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authz_default.mak CFG="mod_authz_default - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(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_owner.mak CFG="mod_authz_owner - 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)
Expand All @@ -249,18 +253,34 @@ _build:
cd modules\dav\fs
$(MAKE) $(MAKEOPT) -f mod_dav_fs.mak CFG="mod_dav_fs - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..\..
cd modules\dav\lock
$(MAKE) $(MAKEOPT) -f mod_dav_lock.mak CFG="mod_dav_lock - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..\..
cd modules\debug
!IFDEF ALL
$(MAKE) $(MAKEOPT) -f mod_bucketeer.mak CFG="mod_bucketeer - Win32 $(LONG)" RECURSE=0 $(CTARGET)
!ENDIF
$(MAKE) $(MAKEOPT) -f mod_dumpio.mak CFG="mod_dumpio - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd modules\echo
!IFDEF ALL
$(MAKE) $(MAKEOPT) -f mod_echo.mak CFG="mod_echo - Win32 $(LONG)" RECURSE=0 $(CTARGET)
!ENDIF
cd ..\..
cd modules\experimental
!IFDEF ALL
$(MAKE) $(MAKEOPT) -f mod_case_filter.mak CFG="mod_case_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_case_filter_in.mak CFG="mod_case_filter_in - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_example.mak CFG="mod_example - Win32 $(LONG)" RECURSE=0 $(CTARGET)
!ENDIF
cd ..\..
cd modules\filters
$(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
!IF EXIST("srclib\zlib")
$(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
!ENDIF
$(MAKE) $(MAKEOPT) -f mod_ext_filter.mak CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_filter.mak CFG="mod_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_include.mak CFG="mod_include - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd modules\generators
Expand Down Expand Up @@ -323,6 +343,7 @@ _build:
$(MAKE) $(MAKEOPT) -f htdbm.mak CFG="htdbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f htdigest.mak CFG="htdigest - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f htpasswd.mak CFG="htpasswd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f httxt2dbm.mak CFG="httxt2dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f logresolve.mak CFG="logresolve - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f rotatelogs.mak CFG="rotatelogs - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..
Expand All @@ -341,7 +362,11 @@ _cleand:

_build:
echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
!IFDEF ALL
devenv Apache.sln /useenv $(CTARGET) $(LONG) /project BuildAll
!ELSE
devenv Apache.sln /useenv $(CTARGET) $(LONG) /project BuildBin
!ENDIF
!IF EXIST("srclib\openssl")
devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_ssl
devenv Apache.sln /useenv $(CTARGET) $(LONG) /project abs
Expand All @@ -360,8 +385,13 @@ _cleand:

_build:
@echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
!IFDEF ALL
@msdev Apache.dsw /USEENV /MAKE \
"BuildAll - Win32 $(LONG)" $(CTARGET)
!ELSE
@msdev Apache.dsw /USEENV /MAKE \
"BuildBin - Win32 $(LONG)" $(CTARGET)
!ENDIF
!IF "$(CTARGET)" == "/CLEAN"
@cd srclib\apr-iconv
@$(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
Expand Down Expand Up @@ -389,27 +419,38 @@ _copybin:
copy srclib\apr-util\$(LONG)\libaprutil-1.$(src_dll) "$(inst_dll)" <.y
copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_auth_digest.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authn_alias.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authn_anon.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authn_dbd.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authn_dbm.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authn_default.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authn_file.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authnz_ldap.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authz_dbm.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authz_default.$(src_so) "$(inst_so)" <.y
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_owner.$(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_cache.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_file_cache.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_mem_cache.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_disk_cache.$(src_so) "$(inst_so)" <.y
copy modules\database\$(LONG)\mod_dbd.$(src_so) "$(inst_so)" <.y
copy modules\dav\fs\$(LONG)\mod_dav_fs.$(src_so) "$(inst_so)" <.y
copy modules\dav\lock\$(LONG)\mod_dav_lock.$(src_so) "$(inst_so)" <.y
copy modules\dav\main\$(LONG)\mod_dav.$(src_so) "$(inst_so)" <.y
!IFDEF ALL
copy modules\debug\$(LONG)\mod_bucketeer.$(src_so) "$(inst_so)" <.y
!ENDIF
copy modules\debug\$(LONG)\mod_dumpio.$(src_so) "$(inst_so)" <.y
!IFDEF ALL
copy modules\echo\$(LONG)\mod_echo.$(src_so) "$(inst_so)" <.y
copy modules\experimental\$(LONG)\mod_case_filter.$(src_so) "$(inst_so)" <.y
copy modules\experimental\$(LONG)\mod_case_filter_in.$(src_so) "$(inst_so)" <.y
copy modules\experimental\$(LONG)\mod_example.$(src_so) "$(inst_so)" <.y
!ENDIF
copy modules\filters\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y
!IF EXIST("srclib\zlib")
copy modules\filters\$(LONG)\mod_deflate.$(src_so) "$(inst_so)" <.y
Expand All @@ -418,6 +459,7 @@ _copybin:
!ENDIF
!ENDIF
copy modules\filters\$(LONG)\mod_ext_filter.$(src_so) "$(inst_so)" <.y
copy modules\filters\$(LONG)\mod_filter.$(src_so) "$(inst_so)" <.y
copy modules\filters\$(LONG)\mod_include.$(src_so) "$(inst_so)" <.y
copy modules\generators\$(LONG)\mod_asis.$(src_so) "$(inst_so)" <.y
copy modules\generators\$(LONG)\mod_autoindex.$(src_so) "$(inst_so)" <.y
Expand Down Expand Up @@ -467,6 +509,7 @@ _copybin:
copy support\$(LONG)\htdbm.$(src_exe) "$(inst_exe)" <.y
copy support\$(LONG)\htdigest.$(src_exe) "$(inst_exe)" <.y
copy support\$(LONG)\htpasswd.$(src_exe) "$(inst_exe)" <.y
copy support\$(LONG)\httxt2dbm.$(src_exe) "$(inst_exe)" <.y
copy support\$(LONG)\logresolve.$(src_exe) "$(inst_exe)" <.y
copy support\$(LONG)\rotatelogs.$(src_exe) "$(inst_exe)" <.y
copy support\win32\$(LONG)\ApacheMonitor.$(src_exe) "$(inst_exe)" <.y
Expand Down
111 changes: 111 additions & 0 deletions modules/aaa/mod_authn_alias.dsp
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 40efa4e

Please sign in to comment.