A star is born ... adds mod_dav and mod_dav_fs to the Win32 build/install

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

diff --git a/Apache.dsw b/Apache.dsw
index 866d1ec78393d2257f75dc8b49de7699178af4ca..f17fb875ba15364359b3fbfe623c11ca747f8309 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -69,7 +69,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_auth_anon"=".\os\win32\mod_auth_anon.dsp" - Package Owner=<4>
+Project: "InstallBin"=".\InstallBin.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -81,13 +81,79 @@ Package=<4>
     Project_Dep_Name aprlibdll
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name ApacheCore
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Apache
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_auth_anon
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_auth_dbm
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_auth_digest
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_cern_meta
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_expires
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_file_cache
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_headers
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_rewrite
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_speling
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_status
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_usertrack
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name htpasswd
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name rotatelogs
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name htdigest
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name logresolve
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name ab
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name ApacheCoreDll
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pcreposix
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name xmlparse
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_dav
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_dav_fs
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_auth_dbm"=".\os\win32\mod_auth_dbm.dsp" - Package Owner=<4>
+Project: "ab"=".\support\ab.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -96,19 +162,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name aprlib
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name sdbmlib
+    Project_Dep_Name ApacheCore
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_auth_digest"=".\os\win32\mod_auth_digest.dsp" - Package Owner=<4>
+Project: "aprlib"=".\lib\apr\aprlib.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -116,17 +179,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_cern_meta"=".\os\win32\mod_cern_meta.dsp" - Package Owner=<4>
+Project: "aprlibdll"=".\lib\apr\aprlibdll.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -135,16 +192,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name aprlib
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_expires"=".\os\win32\mod_expires.dsp" - Package Owner=<4>
+Project: "dftables"=".\lib\pcre\dftables.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -152,17 +206,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_file_cache"=".\os\win32\mod_file_cache.dsp" - Package Owner=<4>
+Project: "gen_test_char"=".\main\gen_test_char.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -170,17 +218,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_headers"=".\os\win32\mod_headers.dsp" - Package Owner=<4>
+Project: "gen_uri_delims"=".\main\gen_uri_delims.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -188,17 +230,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_info"=".\os\win32\mod_info.dsp" - Package Owner=<4>
+Project: "htdigest"=".\support\htdigest.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -207,16 +243,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name aprlib
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_proxy"=".\os\win32\mod_proxy.dsp" - Package Owner=<4>
+Project: "htpasswd"=".\support\htpasswd.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -225,16 +258,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name aprlib
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name ApacheCore
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_rewrite"=".\os\win32\mod_rewrite.dsp" - Package Owner=<4>
+Project: "install"=".\os\win32\installer\installdll\install.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -243,16 +276,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name aprlib
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_speling"=".\os\win32\mod_speling.dsp" - Package Owner=<4>
+Project: "logresolve"=".\support\logresolve.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -261,16 +291,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name aprlib
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_status"=".\os\win32\mod_status.dsp" - Package Owner=<4>
+Project: "mod_auth_anon"=".\os\win32\mod_auth_anon.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -288,7 +315,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_usertrack"=".\os\win32\mod_usertrack.dsp" - Package Owner=<4>
+Project: "mod_auth_dbm"=".\os\win32\mod_auth_dbm.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -296,17 +323,20 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name ApacheCoreDll
+    End Project Dependency
     Begin Project Dependency
     Project_Dep_Name aprlibdll
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name sdbmlib
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "InstallBin"=".\InstallBin.dsp" - Package Owner=<4>
+Project: "mod_auth_digest"=".\os\win32\mod_auth_digest.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -318,73 +348,13 @@ Package=<4>
     Project_Dep_Name aprlibdll
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCore
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name Apache
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_auth_anon
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_auth_dbm
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_auth_digest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_cern_meta
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_expires
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_file_cache
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_headers
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_rewrite
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_speling
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_status
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_usertrack
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name htpasswd
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name rotatelogs
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name htdigest
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name logresolve
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ab
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name ApacheCoreDll
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pcreposix
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name xmlparse
-    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "ab"=".\support\ab.dsp" - Package Owner=<4>
+Project: "mod_cern_meta"=".\os\win32\mod_cern_meta.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -393,16 +363,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name aprlibdll
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCore
+    Project_Dep_Name ApacheCoreDll
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "aprlib"=".\lib\apr\aprlib.dsp" - Package Owner=<4>
+Project: "mod_dav"=".\os\win32\mod_dav.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -410,11 +380,17 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name ApacheCoreDll
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name aprlibdll
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "aprlibdll"=".\lib\apr\aprlibdll.dsp" - Package Owner=<4>
+Project: "mod_dav_fs"=".\os\win32\mod_dav_fs.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -423,13 +399,25 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name xmlparse
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name ApacheCoreDll
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name aprlibdll
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name sdbmlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_dav
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "dftables"=".\lib\pcre\dftables.dsp" - Package Owner=<4>
+Project: "mod_expires"=".\os\win32\mod_expires.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -437,11 +425,17 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name aprlibdll
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name ApacheCoreDll
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "gen_test_char"=".\main\gen_test_char.dsp" - Package Owner=<4>
+Project: "mod_file_cache"=".\os\win32\mod_file_cache.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -449,11 +443,17 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name aprlibdll
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name ApacheCoreDll
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "gen_uri_delims"=".\main\gen_uri_delims.dsp" - Package Owner=<4>
+Project: "mod_headers"=".\os\win32\mod_headers.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -461,11 +461,17 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name aprlibdll
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name ApacheCoreDll
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "htdigest"=".\support\htdigest.dsp" - Package Owner=<4>
+Project: "mod_info"=".\os\win32\mod_info.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -474,13 +480,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name aprlibdll
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name ApacheCoreDll
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "htpasswd"=".\support\htpasswd.dsp" - Package Owner=<4>
+Project: "mod_proxy"=".\os\win32\mod_proxy.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -489,16 +498,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name aprlibdll
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name ApacheCore
+    Project_Dep_Name ApacheCoreDll
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "install"=".\os\win32\installer\installdll\install.dsp" - Package Owner=<4>
+Project: "mod_rewrite"=".\os\win32\mod_rewrite.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -507,13 +516,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name aprlibdll
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name ApacheCoreDll
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "logresolve"=".\support\logresolve.dsp" - Package Owner=<4>
+Project: "mod_speling"=".\os\win32\mod_speling.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -522,13 +534,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name aprlib
+    Project_Dep_Name aprlibdll
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name ApacheCoreDll
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_dav"=".\os\win32\mod_dav.dsp" - Package Owner=<4>
+Project: "mod_status"=".\os\win32\mod_status.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -537,16 +552,16 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
+    Project_Dep_Name aprlibdll
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name aprlibdll
+    Project_Dep_Name ApacheCoreDll
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "mod_dav_fs"=".\os\win32\mod_dav_fs.dsp" - Package Owner=<4>
+Project: "mod_usertrack"=".\os\win32\mod_usertrack.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -554,20 +569,11 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name xmlparse
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ApacheCoreDll
-    End Project Dependency
     Begin Project Dependency
     Project_Dep_Name aprlibdll
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name sdbmlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_dav
+    Project_Dep_Name ApacheCoreDll
     End Project Dependency
 }}}
 

diff --git a/Makefile.win b/Makefile.win
index eb4dbd2343cf4a3d0f414f04f152ab315b84e05e..5c0c71076b929cf00e29e26f0e8f206e002837bd 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -94,6 +94,8 @@ _build:
          $(MAKE) $(MAKEOPT) -f mod_auth_dbm.mak CFG="mod_auth_dbm - 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_cern_meta.mak CFG="mod_cern_meta - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_dav.mak CFG="mod_dav - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_dav_fs.mak CFG="mod_dav_fs - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_expires.mak CFG="mod_expires - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_file_cache.mak CFG="mod_file_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_headers.mak CFG="mod_headers - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -127,6 +129,8 @@ _install:
        copy os\win32\mod_auth_dbm$(SHORT)\mod_auth_dbm.dll $(INSTDIR)\modules
        copy os\win32\mod_auth_digest$(SHORT)\mod_auth_digest.dll $(INSTDIR)\modules
        copy os\win32\mod_cern_meta$(SHORT)\mod_cern_meta.dll $(INSTDIR)\modules
+        copy os\win32\mod_dav$(SHORT)\mod_dav.dll $(INSTDIR)\modules
+        copy os\win32\mod_dav_fs$(SHORT)\mod_dav_fs.dll $(INSTDIR)\modules
        copy os\win32\mod_expires$(SHORT)\mod_expires.dll $(INSTDIR)\modules
        copy os\win32\mod_file_cache$(SHORT)\mod_file_cache.dll $(INSTDIR)\modules
        copy os\win32\mod_headers$(SHORT)\mod_headers.dll $(INSTDIR)\modules
@@ -134,7 +138,7 @@ _install:
         copy os\win32\mod_rewrite$(SHORT)\mod_rewrite.dll $(INSTDIR)\modules
        copy os\win32\mod_speling$(SHORT)\mod_speling.dll $(INSTDIR)\modules
         copy os\win32\mod_status$(SHORT)\mod_status.dll $(INSTDIR)\modules
-       copy os\win32\mod_user_track$(SHORT)\mod_user_track.dll $(INSTDIR)\modules
+       copy os\win32\mod_usertrack$(SHORT)\mod_usertrack.dll $(INSTDIR)\modules
 #       copy os\win32\mod_proxy$(SHORT)\mod_proxy.dll $(INSTDIR)\modules
         copy support\$(LONG)\ab.exe $(INSTDIR)\bin
         copy support\$(LONG)\htpasswd.exe $(INSTDIR)\bin