--------------------- PatchSet 2571 Date: 2001/06/30 18:47:21 Author: serassio Branch: nt-2_3 Tag: (none) Log: Updated WIN32 Project files and some litte WIN32 bug fixes Members: auth_modules/LDAP/LDAP_auth.dsp:1.1.2.1->1.1.2.2 auth_modules/LDAP/LDAP_auth.mak:1.1.2.1->1.1.2.2 auth_modules/NCSA/NCSA_auth.dsp:1.1.2.1->1.1.2.2 auth_modules/NCSA/NCSA_auth.mak:1.1.2.1->1.1.2.2 win/update.bat:1.1->1.1.2.1 Index: squid/auth_modules/LDAP/LDAP_auth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/auth_modules/LDAP/Attic/LDAP_auth.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/auth_modules/LDAP/LDAP_auth.dsp 6 Jan 2001 12:48:44 -0000 1.1.2.1 +++ squid/auth_modules/LDAP/LDAP_auth.dsp 30 Jun 2001 18:49:42 -0000 1.1.2.2 @@ -54,10 +54,6 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib wldap32.lib /nologo /dll /machine:I386 -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy d:\work\squidnt23\auth_modules\ldap\release\ldap_auth.dll c:\squid23\ldap_auth.dll -# End Special Build Tool !ELSEIF "$(CFG)" == "LDAP_auth - Win32 Debug" Index: squid/auth_modules/LDAP/LDAP_auth.mak =================================================================== RCS file: /cvsroot/squid-sf//squid/auth_modules/LDAP/Attic/LDAP_auth.mak,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/auth_modules/LDAP/LDAP_auth.mak 6 Jan 2001 12:48:44 -0000 1.1.2.1 +++ squid/auth_modules/LDAP/LDAP_auth.mak 30 Jun 2001 18:49:42 -0000 1.1.2.2 @@ -80,19 +80,6 @@ $(LINK32_FLAGS) $(LINK32_OBJS) << -SOURCE="$(InputPath)" -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -ALL : $(DS_POSTBUILD_DEP) - -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -$(DS_POSTBUILD_DEP) : "miscutil - Win32 Release" "$(OUTDIR)\LDAP_auth.dll" - copy d:\work\squidnt23\auth_modules\ldap\release\ldap_auth.dll c:\squid23\ldap_auth.dll - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - !ELSEIF "$(CFG)" == "LDAP_auth - Win32 Debug" OUTDIR=.\Debug @@ -204,25 +191,25 @@ !IF "$(CFG)" == "LDAP_auth - Win32 Release" "miscutil - Win32 Release" : - cd "\work\squidnt23\win\miscutil" - $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Release" + cd "\work\nt-2.3\win\miscutil" + $(MAKE) /$(MAKEFLAGS) /F ".\miscutil.mak" CFG="miscutil - Win32 Release" cd "..\..\auth_modules\LDAP" "miscutil - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\win\miscutil" - $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Release" RECURSE=1 CLEAN + cd "\work\nt-2.3\win\miscutil" + $(MAKE) /$(MAKEFLAGS) /F ".\miscutil.mak" CFG="miscutil - Win32 Release" RECURSE=1 CLEAN cd "..\..\auth_modules\LDAP" !ELSEIF "$(CFG)" == "LDAP_auth - Win32 Debug" "miscutil - Win32 Debug" : - cd "\work\squidnt23\win\miscutil" - $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Debug" + cd "\work\nt-2.3\win\miscutil" + $(MAKE) /$(MAKEFLAGS) /F ".\miscutil.mak" CFG="miscutil - Win32 Debug" cd "..\..\auth_modules\LDAP" "miscutil - Win32 DebugCLEAN" : - cd "\work\squidnt23\win\miscutil" - $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Debug" RECURSE=1 CLEAN + cd "\work\nt-2.3\win\miscutil" + $(MAKE) /$(MAKEFLAGS) /F ".\miscutil.mak" CFG="miscutil - Win32 Debug" RECURSE=1 CLEAN cd "..\..\auth_modules\LDAP" !ENDIF Index: squid/auth_modules/NCSA/NCSA_auth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/auth_modules/NCSA/Attic/NCSA_auth.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/auth_modules/NCSA/NCSA_auth.dsp 6 Jan 2001 12:48:44 -0000 1.1.2.1 +++ squid/auth_modules/NCSA/NCSA_auth.dsp 30 Jun 2001 18:49:42 -0000 1.1.2.2 @@ -55,10 +55,6 @@ # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 # ADD LINK32 kernel32.lib user32.lib advapi32.lib /nologo /dll /machine:I386 # SUBTRACT LINK32 /pdb:none -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy d:\work\squidnt23\auth_modules\NCSA\release\ncsa_auth.dll c:\squid23\ncsa_auth.dll -# End Special Build Tool !ELSEIF "$(CFG)" == "NCSA_auth - Win32 Debug" Index: squid/auth_modules/NCSA/NCSA_auth.mak =================================================================== RCS file: /cvsroot/squid-sf//squid/auth_modules/NCSA/Attic/NCSA_auth.mak,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/auth_modules/NCSA/NCSA_auth.mak 6 Jan 2001 12:48:44 -0000 1.1.2.1 +++ squid/auth_modules/NCSA/NCSA_auth.mak 30 Jun 2001 18:49:42 -0000 1.1.2.2 @@ -82,19 +82,6 @@ $(LINK32_FLAGS) $(LINK32_OBJS) << -SOURCE="$(InputPath)" -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -ALL : $(DS_POSTBUILD_DEP) - -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - -$(DS_POSTBUILD_DEP) : "htpasswd - Win32 Release" "chpasswd - Win32 Release" "miscutil - Win32 Release" "$(OUTDIR)\NCSA_auth.dll" - copy d:\work\squidnt23\auth_modules\NCSA\release\ncsa_auth.dll c:\squid23\ncsa_auth.dll - echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)" - !ELSEIF "$(CFG)" == "NCSA_auth - Win32 Debug" OUTDIR=.\Debug @@ -247,25 +234,25 @@ !IF "$(CFG)" == "NCSA_auth - Win32 Release" "miscutil - Win32 Release" : - cd "\work\squidnt23\win\miscutil" - $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Release" + cd "\work\nt-2.3\win\miscutil" + $(MAKE) /$(MAKEFLAGS) /F ".\miscutil.mak" CFG="miscutil - Win32 Release" cd "..\..\auth_modules\NCSA" "miscutil - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\win\miscutil" - $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Release" RECURSE=1 CLEAN + cd "\work\nt-2.3\win\miscutil" + $(MAKE) /$(MAKEFLAGS) /F ".\miscutil.mak" CFG="miscutil - Win32 Release" RECURSE=1 CLEAN cd "..\..\auth_modules\NCSA" !ELSEIF "$(CFG)" == "NCSA_auth - Win32 Debug" "miscutil - Win32 Debug" : - cd "\work\squidnt23\win\miscutil" - $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Debug" + cd "\work\nt-2.3\win\miscutil" + $(MAKE) /$(MAKEFLAGS) /F ".\miscutil.mak" CFG="miscutil - Win32 Debug" cd "..\..\auth_modules\NCSA" "miscutil - Win32 DebugCLEAN" : - cd "\work\squidnt23\win\miscutil" - $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Debug" RECURSE=1 CLEAN + cd "\work\nt-2.3\win\miscutil" + $(MAKE) /$(MAKEFLAGS) /F ".\miscutil.mak" CFG="miscutil - Win32 Debug" RECURSE=1 CLEAN cd "..\..\auth_modules\NCSA" !ENDIF @@ -273,25 +260,25 @@ !IF "$(CFG)" == "NCSA_auth - Win32 Release" "chpasswd - Win32 Release" : - cd "\work\squidnt23\contrib\chpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\chpasswd.mak CFG="chpasswd - Win32 Release" + cd "\work\nt-2.3\contrib\chpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\chpasswd.mak" CFG="chpasswd - Win32 Release" cd "..\..\auth_modules\NCSA" "chpasswd - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\contrib\chpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\chpasswd.mak CFG="chpasswd - Win32 Release" RECURSE=1 CLEAN + cd "\work\nt-2.3\contrib\chpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\chpasswd.mak" CFG="chpasswd - Win32 Release" RECURSE=1 CLEAN cd "..\..\auth_modules\NCSA" !ELSEIF "$(CFG)" == "NCSA_auth - Win32 Debug" "chpasswd - Win32 Debug" : - cd "\work\squidnt23\contrib\chpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\chpasswd.mak CFG="chpasswd - Win32 Debug" + cd "\work\nt-2.3\contrib\chpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\chpasswd.mak" CFG="chpasswd - Win32 Debug" cd "..\..\auth_modules\NCSA" "chpasswd - Win32 DebugCLEAN" : - cd "\work\squidnt23\contrib\chpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\chpasswd.mak CFG="chpasswd - Win32 Debug" RECURSE=1 CLEAN + cd "\work\nt-2.3\contrib\chpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\chpasswd.mak" CFG="chpasswd - Win32 Debug" RECURSE=1 CLEAN cd "..\..\auth_modules\NCSA" !ENDIF @@ -299,25 +286,25 @@ !IF "$(CFG)" == "NCSA_auth - Win32 Release" "htpasswd - Win32 Release" : - cd "\work\squidnt23\contrib\htpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\htpasswd.mak CFG="htpasswd - Win32 Release" + cd "\work\nt-2.3\contrib\htpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\htpasswd.mak" CFG="htpasswd - Win32 Release" cd "..\..\auth_modules\NCSA" "htpasswd - Win32 ReleaseCLEAN" : - cd "\work\squidnt23\contrib\htpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\htpasswd.mak CFG="htpasswd - Win32 Release" RECURSE=1 CLEAN + cd "\work\nt-2.3\contrib\htpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\htpasswd.mak" CFG="htpasswd - Win32 Release" RECURSE=1 CLEAN cd "..\..\auth_modules\NCSA" !ELSEIF "$(CFG)" == "NCSA_auth - Win32 Debug" "htpasswd - Win32 Debug" : - cd "\work\squidnt23\contrib\htpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\htpasswd.mak CFG="htpasswd - Win32 Debug" + cd "\work\nt-2.3\contrib\htpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\htpasswd.mak" CFG="htpasswd - Win32 Debug" cd "..\..\auth_modules\NCSA" "htpasswd - Win32 DebugCLEAN" : - cd "\work\squidnt23\contrib\htpasswd" - $(MAKE) /$(MAKEFLAGS) /F .\htpasswd.mak CFG="htpasswd - Win32 Debug" RECURSE=1 CLEAN + cd "\work\nt-2.3\contrib\htpasswd" + $(MAKE) /$(MAKEFLAGS) /F ".\htpasswd.mak" CFG="htpasswd - Win32 Debug" RECURSE=1 CLEAN cd "..\..\auth_modules\NCSA" !ENDIF --- /dev/null Wed Feb 14 00:52:54 2007 +++ squid/win/update.bat Wed Feb 14 00:53:46 2007 @@ -0,0 +1,11 @@ +@echo off +if %1==release net stop "SquidNT2.3" +copy %0\..\squidnt\%1\squid.exe %2\squid.exe +copy %0\..\dnsserver\%1\dnsserver.dll %2\dnsserver.dll +copy %0\..\..\auth_modules\NT\%1\nt_auth.dll %2\nt_auth.dll +copy %0\..\..\auth_modules\NCSA\%1\ncsa_auth.dll %2\ncsa_auth.dll +copy %0\..\..\auth_modules\ldap\%1\ldap_auth.dll %2\ldap_auth.dll +copy %0\..\..\contrib\htpasswd\%1\htpasswd.exe %2\htpasswd.exe +copy %0\..\cachemgr\%1\cachemgr.exe %2\cgi-bin\cachemgr.cgi +copy %0\..\..\contrib\chpasswd\%1\chpasswd.exe %2\cgi-bin\chpasswd.cgi +if %1==release net start "SquidNT2.3"