--------------------- PatchSet 3726 Date: 2006/09/11 16:55:14 Author: serassio Branch: nt Tag: (none) Log: Updated Visual Studio project with AIO and DiskThreads support Members: port/win32/Makefile.am:1.2.18.18->1.2.18.19 port/win32/squid.sln:1.1.2.7->1.1.2.8 port/win32/libAIO/.cvsignore:1.1->1.1.2.1 port/win32/libAIO/libAIO.vcproj:1.1->1.1.2.1 port/win32/libDiskThreads/.cvsignore:1.1->1.1.2.1 port/win32/libDiskThreads/libDiskThreads.vcproj:1.1->1.1.2.1 port/win32/libWinAIO/.cvsignore:1.1.2.2->1.1.2.3(DEAD) port/win32/libWinAIO/libWinAIO.vcproj:1.1.2.2->1.1.2.3(DEAD) port/win32/libWinDiskThreads/.cvsignore:1.1.2.2->1.1.2.3(DEAD) port/win32/libWinDiskThreads/libWinDiskThreads.vcproj:1.1.2.1->1.1.2.2(DEAD) port/win32/squid/squid.vcproj:1.1.2.12->1.1.2.13 Index: squid3/port/win32/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/Makefile.am,v retrieving revision 1.2.18.18 retrieving revision 1.2.18.19 diff -u -r1.2.18.18 -r1.2.18.19 --- squid3/port/win32/Makefile.am 25 Apr 2006 14:14:12 -0000 1.2.18.18 +++ squid3/port/win32/Makefile.am 11 Sep 2006 16:55:14 -0000 1.2.18.19 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in # -# $Id: Makefile.am,v 1.2.18.18 2006/04/25 14:14:12 serassio Exp $ +# $Id: Makefile.am,v 1.2.18.19 2006/09/11 16:55:14 serassio Exp $ # EXTRA_DIST = \ @@ -32,7 +32,9 @@ LDAP_auth/LDAP_auth.vcproj \ LDAP_group/LDAP_group.vcproj \ libbasic/libbasic.vcproj \ + libAIO/libAIO.vcproj \ libBlocking/libBlocking.vcproj \ + libDiskThreads/libDiskThreads.vcproj \ libc/libc.vcproj \ libcc/libcc.vcproj \ libcoss/libcoss.vcproj \ @@ -50,8 +52,6 @@ libsspwin32/libsspwin32.vcproj \ libtrie/libtrie.vcproj \ libufs/libufs.vcproj \ - libWinAIO/libWinAIO.vcproj \ - libWinDiskThreads/libWinDiskThreads.vcproj \ mswin_auth/mswin_auth.vcproj \ mswin_check_lm_group/mswin_check_lm_group.vcproj \ mswin_negotiate_auth/mswin_negotiate_auth.vcproj \ Index: squid3/port/win32/squid.sln =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/squid.sln,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- squid3/port/win32/squid.sln 25 Apr 2006 14:14:12 -0000 1.1.2.7 +++ squid3/port/win32/squid.sln 11 Sep 2006 16:55:14 -0000 1.1.2.8 @@ -3,11 +3,8 @@ # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Build", "Build.vcproj", "{C50A62CE-A509-4D92-BB2D-B6AC10F29679}" ProjectSection(ProjectDependencies) = postProject - {86E28700-5F2A-4181-A6F7-13B739E434B7} = {86E28700-5F2A-4181-A6F7-13B739E434B7} - {5A3E6817-5A3C-4F59-BC8B-5365A50D2780} = {5A3E6817-5A3C-4F59-BC8B-5365A50D2780} - {A42166DB-7B36-4757-9987-20630AF9A15A} = {A42166DB-7B36-4757-9987-20630AF9A15A} - {DCC74F1A-6DB9-44CC-8935-2CFA54ACAB38} = {DCC74F1A-6DB9-44CC-8935-2CFA54ACAB38} {E9AE84F6-5932-40EA-9EFF-B9553993258E} = {E9AE84F6-5932-40EA-9EFF-B9553993258E} + {A42166DB-7B36-4757-9987-20630AF9A15A} = {A42166DB-7B36-4757-9987-20630AF9A15A} {FEBC1AD4-8805-490F-86C4-EED32F9D364C} = {FEBC1AD4-8805-490F-86C4-EED32F9D364C} {436115CB-6D55-48CA-9625-484F9DAE7F7E} = {436115CB-6D55-48CA-9625-484F9DAE7F7E} {869AB5B9-DC77-4E83-BA14-1FFC4D03A343} = {869AB5B9-DC77-4E83-BA14-1FFC4D03A343} @@ -18,9 +15,12 @@ {0A05ED5C-CAA9-4753-B70D-7A443099572F} = {0A05ED5C-CAA9-4753-B70D-7A443099572F} {41039656-D5A4-412B-A60D-75F912F5FC1E} = {41039656-D5A4-412B-A60D-75F912F5FC1E} {C8237A1B-3BA9-412F-8D48-5F7BA8A93E32} = {C8237A1B-3BA9-412F-8D48-5F7BA8A93E32} + {DCC74F1A-6DB9-44CC-8935-2CFA54ACAB38} = {DCC74F1A-6DB9-44CC-8935-2CFA54ACAB38} {B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18} = {B11B1C1A-29FA-4E3C-A2A8-FACCD0FD4F18} {236A1219-0E12-4A5D-AB03-C1680A665F05} = {236A1219-0E12-4A5D-AB03-C1680A665F05} {68527517-5E82-4A59-861F-F8342237DE18} = {68527517-5E82-4A59-861F-F8342237DE18} + {5A3E6817-5A3C-4F59-BC8B-5365A50D2780} = {5A3E6817-5A3C-4F59-BC8B-5365A50D2780} + {86E28700-5F2A-4181-A6F7-13B739E434B7} = {86E28700-5F2A-4181-A6F7-13B739E434B7} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LDAP_auth", "LDAP_auth\LDAP_auth.vcproj", "{FEBC1AD4-8805-490F-86C4-EED32F9D364C}" @@ -153,14 +153,16 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "squid", "squid\squid.vcproj", "{C3ACE9B0-9E43-4CCB-8642-8F66F55DAEDD}" ProjectSection(ProjectDependencies) = postProject + {8C9E4410-64C5-471D-A4E2-11CDD1E56527} = {8C9E4410-64C5-471D-A4E2-11CDD1E56527} + {5FAC2F21-D34C-46F3-8356-5D28C1136D4C} = {5FAC2F21-D34C-46F3-8356-5D28C1136D4C} + {303568DA-FD43-4B0B-8D7E-090BC9350A64} = {303568DA-FD43-4B0B-8D7E-090BC9350A64} + {E73379FA-E241-43B2-B83F-2378EBBDD24F} = {E73379FA-E241-43B2-B83F-2378EBBDD24F} {FF99A1FE-532A-4A23-AD40-AEEE8E9BB05F} = {FF99A1FE-532A-4A23-AD40-AEEE8E9BB05F} {BE74C2FC-B559-43E3-BE83-F1700D5E267D} = {BE74C2FC-B559-43E3-BE83-F1700D5E267D} - {E73379FA-E241-43B2-B83F-2378EBBDD24F} = {E73379FA-E241-43B2-B83F-2378EBBDD24F} {CD900DFA-11EE-42C3-BAD9-72BEA224B43B} = {CD900DFA-11EE-42C3-BAD9-72BEA224B43B} {03EB9AF9-0C12-41C6-B7C6-B18011A5FAEE} = {03EB9AF9-0C12-41C6-B7C6-B18011A5FAEE} {5F90BFED-718E-47CE-A4CF-ED8B3109AC6C} = {5F90BFED-718E-47CE-A4CF-ED8B3109AC6C} {DB51CEDA-D745-45BB-941F-40740526AA36} = {DB51CEDA-D745-45BB-941F-40740526AA36} - {303568DA-FD43-4B0B-8D7E-090BC9350A64} = {303568DA-FD43-4B0B-8D7E-090BC9350A64} {AB5858D1-01C2-43A6-9665-2ACC4CB37052} = {AB5858D1-01C2-43A6-9665-2ACC4CB37052} {89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243} {93345CCC-5234-4178-916D-A8034D05E0EF} = {93345CCC-5234-4178-916D-A8034D05E0EF} @@ -174,8 +176,6 @@ {E798C636-AF93-446E-846C-5B6E01B5899E} = {E798C636-AF93-446E-846C-5B6E01B5899E} {AEF9372C-F983-4104-9EC3-345C9693E66B} = {AEF9372C-F983-4104-9EC3-345C9693E66B} {D699E422-95DC-448E-8338-9AF3E0DD5BFB} = {D699E422-95DC-448E-8338-9AF3E0DD5BFB} - {5FAC2F21-D34C-46F3-8356-5D28C1136D4C} = {5FAC2F21-D34C-46F3-8356-5D28C1136D4C} - {8C9E4410-64C5-471D-A4E2-11CDD1E56527} = {8C9E4410-64C5-471D-A4E2-11CDD1E56527} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "squid_conf_default", "squid_conf_default.vcproj", "{DB51CEDA-D745-45BB-941F-40740526AA36}" @@ -195,10 +195,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBlocking", "libBlocking\libBlocking.vcproj", "{FF99A1FE-532A-4A23-AD40-AEEE8E9BB05F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libWinAIO", "libWinAIO\libWinAIO.vcproj", "{E73379FA-E241-43B2-B83F-2378EBBDD24F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libWinDiskThreads", "libWinDiskThreads\libWinDiskThreads.vcproj", "{303568DA-FD43-4B0B-8D7E-090BC9350A64}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "digest_pw_auth", "digest_pw_auth\digest_pw_auth.vcproj", "{A42166DB-7B36-4757-9987-20630AF9A15A}" ProjectSection(ProjectDependencies) = postProject {89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243} @@ -242,6 +238,10 @@ {89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAIO", "libAIO\libAIO.vcproj", "{E73379FA-E241-43B2-B83F-2378EBBDD24F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libDiskThreads", "libDiskThreads\libDiskThreads.vcproj", "{303568DA-FD43-4B0B-8D7E-090BC9350A64}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -392,14 +392,6 @@ {FF99A1FE-532A-4A23-AD40-AEEE8E9BB05F}.Debug|Win32.Build.0 = Debug|Win32 {FF99A1FE-532A-4A23-AD40-AEEE8E9BB05F}.Release|Win32.ActiveCfg = Release|Win32 {FF99A1FE-532A-4A23-AD40-AEEE8E9BB05F}.Release|Win32.Build.0 = Release|Win32 - {E73379FA-E241-43B2-B83F-2378EBBDD24F}.Debug|Win32.ActiveCfg = Debug|Win32 - {E73379FA-E241-43B2-B83F-2378EBBDD24F}.Debug|Win32.Build.0 = Debug|Win32 - {E73379FA-E241-43B2-B83F-2378EBBDD24F}.Release|Win32.ActiveCfg = Release|Win32 - {E73379FA-E241-43B2-B83F-2378EBBDD24F}.Release|Win32.Build.0 = Release|Win32 - {303568DA-FD43-4B0B-8D7E-090BC9350A64}.Debug|Win32.ActiveCfg = Debug|Win32 - {303568DA-FD43-4B0B-8D7E-090BC9350A64}.Debug|Win32.Build.0 = Debug|Win32 - {303568DA-FD43-4B0B-8D7E-090BC9350A64}.Release|Win32.ActiveCfg = Release|Win32 - {303568DA-FD43-4B0B-8D7E-090BC9350A64}.Release|Win32.Build.0 = Release|Win32 {A42166DB-7B36-4757-9987-20630AF9A15A}.Debug|Win32.ActiveCfg = Debug|Win32 {A42166DB-7B36-4757-9987-20630AF9A15A}.Debug|Win32.Build.0 = Debug|Win32 {A42166DB-7B36-4757-9987-20630AF9A15A}.Release|Win32.ActiveCfg = Release|Win32 @@ -436,6 +428,14 @@ {DCC74F1A-6DB9-44CC-8935-2CFA54ACAB38}.Debug|Win32.Build.0 = Debug|Win32 {DCC74F1A-6DB9-44CC-8935-2CFA54ACAB38}.Release|Win32.ActiveCfg = Release|Win32 {DCC74F1A-6DB9-44CC-8935-2CFA54ACAB38}.Release|Win32.Build.0 = Release|Win32 + {E73379FA-E241-43B2-B83F-2378EBBDD24F}.Debug|Win32.ActiveCfg = Debug|Win32 + {E73379FA-E241-43B2-B83F-2378EBBDD24F}.Debug|Win32.Build.0 = Debug|Win32 + {E73379FA-E241-43B2-B83F-2378EBBDD24F}.Release|Win32.ActiveCfg = Release|Win32 + {E73379FA-E241-43B2-B83F-2378EBBDD24F}.Release|Win32.Build.0 = Release|Win32 + {303568DA-FD43-4B0B-8D7E-090BC9350A64}.Debug|Win32.ActiveCfg = Debug|Win32 + {303568DA-FD43-4B0B-8D7E-090BC9350A64}.Debug|Win32.Build.0 = Debug|Win32 + {303568DA-FD43-4B0B-8D7E-090BC9350A64}.Release|Win32.ActiveCfg = Release|Win32 + {303568DA-FD43-4B0B-8D7E-090BC9350A64}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE --- /dev/null Wed Feb 14 13:37:19 2007 +++ squid3/port/win32/libAIO/.cvsignore Wed Feb 14 13:37:53 2007 @@ -0,0 +1,3 @@ +*.user +Debug +Release --- /dev/null Wed Feb 14 13:37:19 2007 +++ squid3/port/win32/libAIO/libAIO.vcproj Wed Feb 14 13:37:53 2007 @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- /dev/null Wed Feb 14 13:37:19 2007 +++ squid3/port/win32/libDiskThreads/.cvsignore Wed Feb 14 13:37:53 2007 @@ -0,0 +1,3 @@ +*.user +Debug +Release --- /dev/null Wed Feb 14 13:37:19 2007 +++ squid3/port/win32/libDiskThreads/libDiskThreads.vcproj Wed Feb 14 13:37:53 2007 @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- squid3/port/win32/libWinAIO/.cvsignore Wed Feb 14 13:37:53 2007 +++ /dev/null Wed Feb 14 13:37:19 2007 @@ -1,3 +0,0 @@ -*.user -Debug -Release --- squid3/port/win32/libWinAIO/libWinAIO.vcproj Wed Feb 14 13:37:53 2007 +++ /dev/null Wed Feb 14 13:37:19 2007 @@ -1,199 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --- squid3/port/win32/libWinDiskThreads/.cvsignore Wed Feb 14 13:37:53 2007 +++ /dev/null Wed Feb 14 13:37:19 2007 @@ -1,3 +0,0 @@ -*.user -Debug -Release --- squid3/port/win32/libWinDiskThreads/libWinDiskThreads.vcproj Wed Feb 14 13:37:53 2007 +++ /dev/null Wed Feb 14 13:37:19 2007 @@ -1,195 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: squid3/port/win32/squid/squid.vcproj =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/squid/Attic/squid.vcproj,v retrieving revision 1.1.2.12 retrieving revision 1.1.2.13 diff -u -r1.1.2.12 -r1.1.2.13 --- squid3/port/win32/squid/squid.vcproj 3 Sep 2006 18:21:59 -0000 1.1.2.12 +++ squid3/port/win32/squid/squid.vcproj 11 Sep 2006 16:55:14 -0000 1.1.2.13 @@ -1011,7 +1011,7 @@ Name="FS Modules" >