--------------------- PatchSet 1061 Date: 2004/09/04 15:55:36 Author: serassio Branch: nt Tag: (none) Log: Updated MS Visual Studio Project for latest HEAD changes Members: port/win32/auth_modules.cmd:1.2.18.1->1.2.18.2(DEAD) port/win32/modules.dsp:1.2.18.2->1.2.18.3 port/win32/squid_mswin.mak:1.2.18.1->1.2.18.2 port/win32/store_modules.cmd:1.2.18.2->1.2.18.3(DEAD) port/win32/libcc/libcc.dsp:1.1.2.2->1.1.2.3 port/win32/libmiscutil/libmiscutil.dsp:1.2.18.2->1.2.18.3 port/win32/squid/squid.dsp:1.2.18.8->1.2.18.9 --- squid3/port/win32/auth_modules.cmd Wed Feb 14 13:33:47 2007 +++ /dev/null Wed Feb 14 13:33:00 2007 @@ -1,17 +0,0 @@ -@echo off -if exist %temp%\auth_modules.txt del %temp%\auth_modules.txt -:loop -echo %1 >> %temp%\auth_modules.txt -shift /1 -if NOT "%1"=="" goto :loop -echo /* automatically generated by %0 %* -echo * do not edit -echo */ -echo #include "squid.h" -echo #include "authenticate.h" -for /F %%m in (%temp%\auth_modules.txt) do echo extern AUTHSSETUP authSchemeSetup_%%m; -echo void authSchemeSetup(void) -echo { -for /F %%m in (%temp%\auth_modules.txt) do echo authSchemeAdd("%%m", authSchemeSetup_%%m); -echo } -if exist %temp%\auth_modules.txt del %temp%\auth_modules.txt Index: squid3/port/win32/modules.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/modules.dsp,v retrieving revision 1.2.18.2 retrieving revision 1.2.18.3 diff -u -r1.2.18.2 -r1.2.18.3 --- squid3/port/win32/modules.dsp 3 Aug 2003 18:42:17 -0000 1.2.18.2 +++ squid3/port/win32/modules.dsp 4 Sep 2004 15:55:36 -0000 1.2.18.3 @@ -61,43 +61,6 @@ # Name "modules - Win32 Debug" # Begin Source File -SOURCE=.\auth_modules.cmd - -!IF "$(CFG)" == "modules - Win32 Release" - -# PROP Intermediate_Dir "." -# PROP Ignore_Default_Tool 1 -USERDEP__AUTH_="squid_mswin.mak" -# Begin Custom Build -OutDir=.\..\..\src -ProjDir=. -InputPath=.\auth_modules.cmd - -"$(OutDir)\auth_modules.cc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nmake /f $(ProjDir)\squid_mswin.mak auth_modules.cc - -# End Custom Build - -!ELSEIF "$(CFG)" == "modules - Win32 Debug" - -# PROP Intermediate_Dir "." -# PROP Ignore_Default_Tool 1 -USERDEP__AUTH_="squid_mswin.mak" -# Begin Custom Build -OutDir=.\..\..\src -ProjDir=. -InputPath=.\auth_modules.cmd - -"$(OutDir)\auth_modules.cc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nmake /f $(ProjDir)\squid_mswin.mak auth_modules.cc - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\default_config_file.cmd !IF "$(CFG)" == "modules - Win32 Release" Index: squid3/port/win32/squid_mswin.mak =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/squid_mswin.mak,v retrieving revision 1.2.18.1 retrieving revision 1.2.18.2 diff -u -r1.2.18.1 -r1.2.18.2 --- squid3/port/win32/squid_mswin.mak 25 Feb 2003 02:48:38 -0000 1.2.18.1 +++ squid3/port/win32/squid_mswin.mak 4 Sep 2004 15:55:36 -0000 1.2.18.2 @@ -42,9 +42,7 @@ DEFAULT_MIB_PATH = $(datadir)/mib.txt DEFAULT_HOSTS = none -AUTH_MODULES = basic ntlm digest REPL_POLICIES = lru heap -STORE_MODULES = ufs awin32 coss null cf_gen_defines.h: $(srcdir)\cf_gen_defines $(srcdir)\cf.data.pre gawk -f $(srcdir)\cf_gen_defines <$(srcdir)\cf.data.pre >$(srcdir)\cf_gen_defines.h @@ -68,15 +66,9 @@ s%@DEFAULT_HOSTS@%$(DEFAULT_HOSTS)%g;"\ < $(srcdir)\cf.data.pre >$(srcdir)\cf.data -auth_modules.cc: .\auth_modules.cmd .\$(THISMAKEFILE) - .\auth_modules.cmd $(AUTH_MODULES) >$(srcdir)\auth_modules.cc - repl_modules.cc: .\repl_modules.cmd .\$(THISMAKEFILE) .\repl_modules.cmd $(REPL_POLICIES) >$(srcdir)\repl_modules.cc -store_modules.cc: .\store_modules.cmd .\$(THISMAKEFILE) - .\store_modules.cmd $(STORE_MODULES) >$(srcdir)\store_modules.cc - default_config_file.h: .\$(THISMAKEFILE) .\default_config_file.cmd $(DEFAULT_CONFIG_FILE) $(DEFAULT_ERROR_DIR) >$(win32includedir)\default_config_file.h --- squid3/port/win32/store_modules.cmd Wed Feb 14 13:33:47 2007 +++ /dev/null Wed Feb 14 13:33:00 2007 @@ -1,17 +0,0 @@ -@echo off -if exist %temp%\store_modules.txt del %temp%\store_modules.txt -:loop -echo %1 >> %temp%\store_modules.txt -shift /1 -if NOT "%1"=="" goto :loop -echo /* automatically generated by %0 %* -echo * do not edit -echo */ -echo #include "squid.h" -echo #include "Store.h" -for /F %%m in (%temp%\store_modules.txt) do echo extern STSETUP storeFsSetup_%%m; -echo void storeFsSetup(void) -echo { -for /F %%m in (%temp%\store_modules.txt) do echo StoreEntry::FsAdd("%%m", storeFsSetup_%%m); -echo } -if exist %temp%\store_modules.txt del %temp%\store_modules.txt Index: squid3/port/win32/libcc/libcc.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/libcc/Attic/libcc.dsp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid3/port/win32/libcc/libcc.dsp 9 Aug 2003 07:34:17 -0000 1.1.2.2 +++ squid3/port/win32/libcc/libcc.dsp 4 Sep 2004 15:55:37 -0000 1.1.2.3 @@ -85,6 +85,10 @@ # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=..\..\..\lib\MemPool.cc +# End Source File +# Begin Source File + SOURCE=..\..\..\lib\Splay.cc # End Source File # Begin Source File Index: squid3/port/win32/libmiscutil/libmiscutil.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/libmiscutil/Attic/libmiscutil.dsp,v retrieving revision 1.2.18.2 retrieving revision 1.2.18.3 diff -u -r1.2.18.2 -r1.2.18.3 --- squid3/port/win32/libmiscutil/libmiscutil.dsp 1 May 2003 22:56:12 -0000 1.2.18.2 +++ squid3/port/win32/libmiscutil/libmiscutil.dsp 4 Sep 2004 15:55:37 -0000 1.2.18.3 @@ -121,10 +121,6 @@ # End Source File # Begin Source File -SOURCE=..\..\..\lib\MemPool.c -# End Source File -# Begin Source File - SOURCE=..\..\..\lib\Profiler.c # End Source File # Begin Source File Index: squid3/port/win32/squid/squid.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/squid/Attic/squid.dsp,v retrieving revision 1.2.18.8 retrieving revision 1.2.18.9 diff -u -r1.2.18.8 -r1.2.18.9 --- squid3/port/win32/squid/squid.dsp 28 Aug 2003 17:33:12 -0000 1.2.18.8 +++ squid3/port/win32/squid/squid.dsp 4 Sep 2004 15:55:37 -0000 1.2.18.9 @@ -339,6 +339,22 @@ SOURCE=..\..\..\src\fs\ufs\StoreFSufs.cc # End Source File # End Group +# Begin Group "AUTH Modules" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\src\auth\basic\auth_basic.cc +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\auth\digest\auth_digest.cc +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\auth\ntlm\auth_ntlm.cc +# End Source File +# End Group # Begin Source File SOURCE=..\..\..\src\access_log.cc @@ -357,7 +373,7 @@ # End Source File # Begin Source File -SOURCE=..\..\..\src\auth_modules.cc +SOURCE=..\..\..\src\AuthConfig.cc # End Source File # Begin Source File @@ -365,6 +381,22 @@ # End Source File # Begin Source File +SOURCE=..\..\..\src\AuthScheme.cc +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\AuthUser.cc +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\AuthUserRequest.cc +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\auth\basic\basicScheme.cc +# End Source File +# Begin Source File + SOURCE=..\..\..\src\cache_cf.cc # End Source File # Begin Source File @@ -417,6 +449,10 @@ # End Source File # Begin Source File +SOURCE=..\..\..\src\auth\digest\digestScheme.cc +# End Source File +# Begin Source File + SOURCE=..\..\..\src\disk.cc # End Source File # Begin Source File @@ -621,6 +657,10 @@ # End Source File # Begin Source File +SOURCE=..\..\..\src\auth\ntlm\ntlmScheme.cc +# End Source File +# Begin Source File + SOURCE=..\..\..\src\Packer.cc # End Source File # Begin Source File