Moving libraries and executables in the windows build to prepare for landing of mac/linux binaries in parallel locations

Review URL: http://codereview.chromium.org/5629

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2943 0039d316-1c4b-4281-b951-d872f2087c98

60 files changed, 2 insertions, 2 deletions

diff --git a/third_party/lighttpd/php5/php.ini b/third_party/lighttpd/php5/php.ini
deleted file mode 100644
index b3ac652..0000000
--- a/third_party/lighttpd/php5/php.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-include_path = "../third_party/lighttpd/php5/;../../third_party/lighttpd/php5/;../../../third_party/lighttpd/php5/;../../../../third_party/lighttpd/php5/;../../../../../third_party/lighttpd/php5/;../../../../../../third_party/lighttpd/php5/;../../../../../../../third_party/lighttpd/php5/;../../../../../../../../third_party/lighttpd/php5/;../../../../../../../../../third_party/lighttpd/php5/;"
-auto_prepend_file = "compat-shim.php"
diff --git a/third_party/lighttpd/CygBZ2-1.dll b/third_party/lighttpd/win/CygBZ2-1.dll
index bbfec9e..bbfec9e 100644
--- a/third_party/lighttpd/CygBZ2-1.dll
+++ b/third_party/lighttpd/win/CygBZ2-1.dll
diff --git a/third_party/lighttpd/CygCrypt-0.dll b/third_party/lighttpd/win/CygCrypt-0.dll
index 6d11e42..6d11e42 100644
--- a/third_party/lighttpd/CygCrypt-0.dll
+++ b/third_party/lighttpd/win/CygCrypt-0.dll
diff --git a/third_party/lighttpd/CygCrypto-0.9.8.dll b/third_party/lighttpd/win/CygCrypto-0.9.8.dll
index f93660b..f93660b 100644
--- a/third_party/lighttpd/CygCrypto-0.9.8.dll
+++ b/third_party/lighttpd/win/CygCrypto-0.9.8.dll
diff --git a/third_party/lighttpd/CygLBER-2-3-0.dll b/third_party/lighttpd/win/CygLBER-2-3-0.dll
index 9f1a86c..9f1a86c 100644
--- a/third_party/lighttpd/CygLBER-2-3-0.dll
+++ b/third_party/lighttpd/win/CygLBER-2-3-0.dll
diff --git a/third_party/lighttpd/CygLDAP-2-3-0.dll b/third_party/lighttpd/win/CygLDAP-2-3-0.dll
index ec6c72b..ec6c72b 100644
--- a/third_party/lighttpd/CygLDAP-2-3-0.dll
+++ b/third_party/lighttpd/win/CygLDAP-2-3-0.dll
diff --git a/third_party/lighttpd/CygLightCOMP.dll b/third_party/lighttpd/win/CygLightCOMP.dll
index 334f312..334f312 100644
--- a/third_party/lighttpd/CygLightCOMP.dll
+++ b/third_party/lighttpd/win/CygLightCOMP.dll
diff --git a/third_party/lighttpd/CygMinires.dll b/third_party/lighttpd/win/CygMinires.dll
index 7148c3a..7148c3a 100644
--- a/third_party/lighttpd/CygMinires.dll
+++ b/third_party/lighttpd/win/CygMinires.dll
diff --git a/third_party/lighttpd/CygPCRE-0.dll b/third_party/lighttpd/win/CygPCRE-0.dll
index c8fa94d..c8fa94d 100644
--- a/third_party/lighttpd/CygPCRE-0.dll
+++ b/third_party/lighttpd/win/CygPCRE-0.dll
diff --git a/third_party/lighttpd/CygSASL2-2.dll b/third_party/lighttpd/win/CygSASL2-2.dll
index 06ee422..06ee422 100644
--- a/third_party/lighttpd/CygSASL2-2.dll
+++ b/third_party/lighttpd/win/CygSASL2-2.dll
diff --git a/third_party/lighttpd/CygSSL-0.9.8.dll b/third_party/lighttpd/win/CygSSL-0.9.8.dll
index e182c32..e182c32 100644
--- a/third_party/lighttpd/CygSSL-0.9.8.dll
+++ b/third_party/lighttpd/win/CygSSL-0.9.8.dll
diff --git a/third_party/lighttpd/CygZ.dll b/third_party/lighttpd/win/CygZ.dll
index c94d66c..c94d66c 100644
--- a/third_party/lighttpd/CygZ.dll
+++ b/third_party/lighttpd/win/CygZ.dll
diff --git a/third_party/lighttpd/LightTPD-Angel.exe b/third_party/lighttpd/win/LightTPD-Angel.exe
index 2d7bf0a..2d7bf0a 100644
--- a/third_party/lighttpd/LightTPD-Angel.exe
+++ b/third_party/lighttpd/win/LightTPD-Angel.exe
diff --git a/third_party/lighttpd/LightTPD.exe b/third_party/lighttpd/win/LightTPD.exe
index 88e894b..88e894b 100644
--- a/third_party/lighttpd/LightTPD.exe
+++ b/third_party/lighttpd/win/LightTPD.exe
diff --git a/third_party/lighttpd/OpenSSL.cnf b/third_party/lighttpd/win/OpenSSL.cnf
index 9e59020..9e59020 100644
--- a/third_party/lighttpd/OpenSSL.cnf
+++ b/third_party/lighttpd/win/OpenSSL.cnf
diff --git a/third_party/lighttpd/OpenSSL.exe b/third_party/lighttpd/win/OpenSSL.exe
index ed86d65..ed86d65 100644
--- a/third_party/lighttpd/OpenSSL.exe
+++ b/third_party/lighttpd/win/OpenSSL.exe
diff --git a/third_party/lighttpd/SSL-Gen.bat b/third_party/lighttpd/win/SSL-Gen.bat
index 1586beb..1586beb 100644
--- a/third_party/lighttpd/SSL-Gen.bat
+++ b/third_party/lighttpd/win/SSL-Gen.bat
diff --git a/third_party/lighttpd/Spawn-FCGI.exe b/third_party/lighttpd/win/Spawn-FCGI.exe
index fb03295..fb03295 100644
--- a/third_party/lighttpd/Spawn-FCGI.exe
+++ b/third_party/lighttpd/win/Spawn-FCGI.exe
diff --git a/third_party/lighttpd/TestMode.bat b/third_party/lighttpd/win/TestMode.bat
index e4102af..e4102af 100644
--- a/third_party/lighttpd/TestMode.bat
+++ b/third_party/lighttpd/win/TestMode.bat
diff --git a/third_party/lighttpd/bin/INSTSRV.EXE b/third_party/lighttpd/win/bin/INSTSRV.EXE
index 4ebad9b..4ebad9b 100644
--- a/third_party/lighttpd/bin/INSTSRV.EXE
+++ b/third_party/lighttpd/win/bin/INSTSRV.EXE
diff --git a/third_party/lighttpd/bin/LIGHTSRC.EXE b/third_party/lighttpd/win/bin/LIGHTSRC.EXE
index 531f87b..531f87b 100644
--- a/third_party/lighttpd/bin/LIGHTSRC.EXE
+++ b/third_party/lighttpd/win/bin/LIGHTSRC.EXE
diff --git a/third_party/lighttpd/bin/PROCESS.EXE b/third_party/lighttpd/win/bin/PROCESS.EXE
index 78e4712..78e4712 100644
--- a/third_party/lighttpd/bin/PROCESS.EXE
+++ b/third_party/lighttpd/win/bin/PROCESS.EXE
diff --git a/third_party/lighttpd/bin/Service-Install.exe b/third_party/lighttpd/win/bin/Service-Install.exe
index bb3cad1..bb3cad1 100644
--- a/third_party/lighttpd/bin/Service-Install.exe
+++ b/third_party/lighttpd/win/bin/Service-Install.exe
diff --git a/third_party/lighttpd/bin/Service-Remove.exe b/third_party/lighttpd/win/bin/Service-Remove.exe
index 412495f..412495f 100644
--- a/third_party/lighttpd/bin/Service-Remove.exe
+++ b/third_party/lighttpd/win/bin/Service-Remove.exe
diff --git a/third_party/lighttpd/lib/mod_access.dll b/third_party/lighttpd/win/lib/mod_access.dll
index 4dd016d..4dd016d 100644
--- a/third_party/lighttpd/lib/mod_access.dll
+++ b/third_party/lighttpd/win/lib/mod_access.dll
diff --git a/third_party/lighttpd/lib/mod_accesslog.dll b/third_party/lighttpd/win/lib/mod_accesslog.dll
index 5ce89ba..5ce89ba 100644
--- a/third_party/lighttpd/lib/mod_accesslog.dll
+++ b/third_party/lighttpd/win/lib/mod_accesslog.dll
diff --git a/third_party/lighttpd/lib/mod_alias.dll b/third_party/lighttpd/win/lib/mod_alias.dll
index 0d5f2a3..0d5f2a3 100644
--- a/third_party/lighttpd/lib/mod_alias.dll
+++ b/third_party/lighttpd/win/lib/mod_alias.dll
diff --git a/third_party/lighttpd/lib/mod_auth.dll b/third_party/lighttpd/win/lib/mod_auth.dll
index 0208479..0208479 100644
--- a/third_party/lighttpd/lib/mod_auth.dll
+++ b/third_party/lighttpd/win/lib/mod_auth.dll
diff --git a/third_party/lighttpd/lib/mod_cgi.dll b/third_party/lighttpd/win/lib/mod_cgi.dll
index bfd66bc..bfd66bc 100644
--- a/third_party/lighttpd/lib/mod_cgi.dll
+++ b/third_party/lighttpd/win/lib/mod_cgi.dll
diff --git a/third_party/lighttpd/lib/mod_cml.dll b/third_party/lighttpd/win/lib/mod_cml.dll
index ee2ff63..ee2ff63 100644
--- a/third_party/lighttpd/lib/mod_cml.dll
+++ b/third_party/lighttpd/win/lib/mod_cml.dll
diff --git a/third_party/lighttpd/lib/mod_compress.dll b/third_party/lighttpd/win/lib/mod_compress.dll
index 17e199d..17e199d 100644
--- a/third_party/lighttpd/lib/mod_compress.dll
+++ b/third_party/lighttpd/win/lib/mod_compress.dll
diff --git a/third_party/lighttpd/lib/mod_dirlisting.dll b/third_party/lighttpd/win/lib/mod_dirlisting.dll
index 73c2590..73c2590 100644
--- a/third_party/lighttpd/lib/mod_dirlisting.dll
+++ b/third_party/lighttpd/win/lib/mod_dirlisting.dll
diff --git a/third_party/lighttpd/lib/mod_evasive.dll b/third_party/lighttpd/win/lib/mod_evasive.dll
index f5e21f4..f5e21f4 100644
--- a/third_party/lighttpd/lib/mod_evasive.dll
+++ b/third_party/lighttpd/win/lib/mod_evasive.dll
diff --git a/third_party/lighttpd/lib/mod_evhost.dll b/third_party/lighttpd/win/lib/mod_evhost.dll
index 94ef501..94ef501 100644
--- a/third_party/lighttpd/lib/mod_evhost.dll
+++ b/third_party/lighttpd/win/lib/mod_evhost.dll
diff --git a/third_party/lighttpd/lib/mod_expire.dll b/third_party/lighttpd/win/lib/mod_expire.dll
index 2cce873..2cce873 100644
--- a/third_party/lighttpd/lib/mod_expire.dll
+++ b/third_party/lighttpd/win/lib/mod_expire.dll
diff --git a/third_party/lighttpd/lib/mod_extforward.dll b/third_party/lighttpd/win/lib/mod_extforward.dll
index 0ac6506..0ac6506 100644
--- a/third_party/lighttpd/lib/mod_extforward.dll
+++ b/third_party/lighttpd/win/lib/mod_extforward.dll
diff --git a/third_party/lighttpd/lib/mod_fastcgi.dll b/third_party/lighttpd/win/lib/mod_fastcgi.dll
index 26db65f..26db65f 100644
--- a/third_party/lighttpd/lib/mod_fastcgi.dll
+++ b/third_party/lighttpd/win/lib/mod_fastcgi.dll
diff --git a/third_party/lighttpd/lib/mod_flv_streaming.dll b/third_party/lighttpd/win/lib/mod_flv_streaming.dll
index d974712..d974712 100644
--- a/third_party/lighttpd/lib/mod_flv_streaming.dll
+++ b/third_party/lighttpd/win/lib/mod_flv_streaming.dll
diff --git a/third_party/lighttpd/lib/mod_indexfile.dll b/third_party/lighttpd/win/lib/mod_indexfile.dll
index 2792859..2792859 100644
--- a/third_party/lighttpd/lib/mod_indexfile.dll
+++ b/third_party/lighttpd/win/lib/mod_indexfile.dll
diff --git a/third_party/lighttpd/lib/mod_magnet.dll b/third_party/lighttpd/win/lib/mod_magnet.dll
index c51de16..c51de16 100644
--- a/third_party/lighttpd/lib/mod_magnet.dll
+++ b/third_party/lighttpd/win/lib/mod_magnet.dll
diff --git a/third_party/lighttpd/lib/mod_mysql_vhost.dll b/third_party/lighttpd/win/lib/mod_mysql_vhost.dll
index 455bd41..455bd41 100644
--- a/third_party/lighttpd/lib/mod_mysql_vhost.dll
+++ b/third_party/lighttpd/win/lib/mod_mysql_vhost.dll
diff --git a/third_party/lighttpd/lib/mod_proxy.dll b/third_party/lighttpd/win/lib/mod_proxy.dll
index 9aea112..9aea112 100644
--- a/third_party/lighttpd/lib/mod_proxy.dll
+++ b/third_party/lighttpd/win/lib/mod_proxy.dll
diff --git a/third_party/lighttpd/lib/mod_redirect.dll b/third_party/lighttpd/win/lib/mod_redirect.dll
index a32b5c0..a32b5c0 100644
--- a/third_party/lighttpd/lib/mod_redirect.dll
+++ b/third_party/lighttpd/win/lib/mod_redirect.dll
diff --git a/third_party/lighttpd/lib/mod_rewrite.dll b/third_party/lighttpd/win/lib/mod_rewrite.dll
index 73ed7b5..73ed7b5 100644
--- a/third_party/lighttpd/lib/mod_rewrite.dll
+++ b/third_party/lighttpd/win/lib/mod_rewrite.dll
diff --git a/third_party/lighttpd/lib/mod_rrdtool.dll b/third_party/lighttpd/win/lib/mod_rrdtool.dll
index 5911517..5911517 100644
--- a/third_party/lighttpd/lib/mod_rrdtool.dll
+++ b/third_party/lighttpd/win/lib/mod_rrdtool.dll
diff --git a/third_party/lighttpd/lib/mod_scgi.dll b/third_party/lighttpd/win/lib/mod_scgi.dll
index 225a44b..225a44b 100644
--- a/third_party/lighttpd/lib/mod_scgi.dll
+++ b/third_party/lighttpd/win/lib/mod_scgi.dll
diff --git a/third_party/lighttpd/lib/mod_secdownload.dll b/third_party/lighttpd/win/lib/mod_secdownload.dll
index a59e817..a59e817 100644
--- a/third_party/lighttpd/lib/mod_secdownload.dll
+++ b/third_party/lighttpd/win/lib/mod_secdownload.dll
diff --git a/third_party/lighttpd/lib/mod_setenv.dll b/third_party/lighttpd/win/lib/mod_setenv.dll
index 09d3c43..09d3c43 100644
--- a/third_party/lighttpd/lib/mod_setenv.dll
+++ b/third_party/lighttpd/win/lib/mod_setenv.dll
diff --git a/third_party/lighttpd/lib/mod_simple_vhost.dll b/third_party/lighttpd/win/lib/mod_simple_vhost.dll
index 663722c..663722c 100644
--- a/third_party/lighttpd/lib/mod_simple_vhost.dll
+++ b/third_party/lighttpd/win/lib/mod_simple_vhost.dll
diff --git a/third_party/lighttpd/lib/mod_ssi.dll b/third_party/lighttpd/win/lib/mod_ssi.dll
index 3af604d..3af604d 100644
--- a/third_party/lighttpd/lib/mod_ssi.dll
+++ b/third_party/lighttpd/win/lib/mod_ssi.dll
diff --git a/third_party/lighttpd/lib/mod_staticfile.dll b/third_party/lighttpd/win/lib/mod_staticfile.dll
index 45afe0e..45afe0e 100644
--- a/third_party/lighttpd/lib/mod_staticfile.dll
+++ b/third_party/lighttpd/win/lib/mod_staticfile.dll
diff --git a/third_party/lighttpd/lib/mod_status.dll b/third_party/lighttpd/win/lib/mod_status.dll
index 9d15c36..9d15c36 100644
--- a/third_party/lighttpd/lib/mod_status.dll
+++ b/third_party/lighttpd/win/lib/mod_status.dll
diff --git a/third_party/lighttpd/lib/mod_trigger_b4_dl.dll b/third_party/lighttpd/win/lib/mod_trigger_b4_dl.dll
index fff48a8..fff48a8 100644
--- a/third_party/lighttpd/lib/mod_trigger_b4_dl.dll
+++ b/third_party/lighttpd/win/lib/mod_trigger_b4_dl.dll
diff --git a/third_party/lighttpd/lib/mod_userdir.dll b/third_party/lighttpd/win/lib/mod_userdir.dll
index 6f8fb0a..6f8fb0a 100644
--- a/third_party/lighttpd/lib/mod_userdir.dll
+++ b/third_party/lighttpd/win/lib/mod_userdir.dll
diff --git a/third_party/lighttpd/lib/mod_usertrack.dll b/third_party/lighttpd/win/lib/mod_usertrack.dll
index 1c10e5b..1c10e5b 100644
--- a/third_party/lighttpd/lib/mod_usertrack.dll
+++ b/third_party/lighttpd/win/lib/mod_usertrack.dll
diff --git a/third_party/lighttpd/lib/mod_webdav.dll b/third_party/lighttpd/win/lib/mod_webdav.dll
index 45d34b9..45d34b9 100644
--- a/third_party/lighttpd/lib/mod_webdav.dll
+++ b/third_party/lighttpd/win/lib/mod_webdav.dll
diff --git a/third_party/lighttpd/php5/compat-shim.php b/third_party/lighttpd/win/php5/compat-shim.php
index 95be9b4..95be9b4 100644
--- a/third_party/lighttpd/php5/compat-shim.php
+++ b/third_party/lighttpd/win/php5/compat-shim.php
diff --git a/third_party/lighttpd/php5/php-cgi.exe b/third_party/lighttpd/win/php5/php-cgi.exe
index 3665a53..3665a53 100644
--- a/third_party/lighttpd/php5/php-cgi.exe
+++ b/third_party/lighttpd/win/php5/php-cgi.exe
diff --git a/third_party/lighttpd/win/php5/php.ini b/third_party/lighttpd/win/php5/php.ini
new file mode 100644
index 0000000..55d4f39
--- /dev/null
+++ b/third_party/lighttpd/win/php5/php.ini
@@ -0,0 +1,2 @@
+include_path = "../third_party/lighttpd/win/php5/;../../third_party/lighttpd/win/php5/;../../../third_party/lighttpd/win/php5/;../../../../third_party/lighttpd/win/php5/;../../../../../third_party/lighttpd/win/php5/;../../../../../../third_party/lighttpd/win/php5/;../../../../../../../third_party/lighttpd/win/php5/;../../../../../../../../third_party/lighttpd/win/php5/;../../../../../../../../../third_party/lighttpd/win/php5/;"
+auto_prepend_file = "compat-shim.php"
diff --git a/third_party/lighttpd/php5/php5ts.dll b/third_party/lighttpd/win/php5/php5ts.dll
index 899a34c..899a34c 100644
--- a/third_party/lighttpd/php5/php5ts.dll
+++ b/third_party/lighttpd/win/php5/php5ts.dll