--------------------- PatchSet 8621 Date: 2006/09/09 12:57:08 Author: serassio Branch: nt Tag: (none) Log: Added Windows threads support to aufs, dropped awin store Members: port/win32/Makefile.am:1.1.14.7->1.1.14.8 port/win32/squid.dsw:1.1.38.7->1.1.38.8 port/win32/libaufs/.cvsignore:1.1->1.1.2.1 port/win32/libaufs/libaufs.dsp:1.1->1.1.2.1 port/win32/libawin32/.cvsignore:1.1.34.1->1.1.34.2(DEAD) port/win32/libawin32/libawin32.dsp:1.1.38.1->1.1.38.2(DEAD) Index: squid/port/win32/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/Makefile.am,v retrieving revision 1.1.14.7 retrieving revision 1.1.14.8 diff -u -r1.1.14.7 -r1.1.14.8 --- squid/port/win32/Makefile.am 3 Sep 2006 12:59:39 -0000 1.1.14.7 +++ squid/port/win32/Makefile.am 9 Sep 2006 12:57:08 -0000 1.1.14.8 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in # -# $Id: Makefile.am,v 1.1.14.7 2006/09/03 12:59:39 serassio Exp $ +# $Id: Makefile.am,v 1.1.14.8 2006/09/09 12:57:08 serassio Exp $ # EXTRA_DIST = \ @@ -35,7 +35,7 @@ ip_user_check/ip_user_check.dsp \ LDAP_auth/LDAP_auth.dsp \ LDAP_group/LDAP_group.dsp \ - libawin32/libawin32.dsp \ + libaufs/libaufs.dsp \ libbasic/libbasic.dsp \ libdigest/libdigest.dsp \ libgnuregex/libgnuregex.dsp \ @@ -49,7 +49,6 @@ libsnmp/libsnmp.dsp \ libsspwin32/libsspwin32.dsp \ libufs/libufs.dsp \ -# logfiled/logfiled.dsp \ NCSA_auth/NCSA_auth.dsp \ negotiate_auth/negotiate_auth.dsp \ nt_auth/nt_auth.dsp \ Index: squid/port/win32/squid.dsw =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/squid.dsw,v retrieving revision 1.1.38.7 retrieving revision 1.1.38.8 diff -u -r1.1.38.7 -r1.1.38.8 --- squid/port/win32/squid.dsw 2 Sep 2006 20:40:13 -0000 1.1.38.7 +++ squid/port/win32/squid.dsw 9 Sep 2006 12:57:08 -0000 1.1.38.8 @@ -291,7 +291,7 @@ ############################################################################### -Project: "libawin32"=".\libawin32\libawin32.dsp" - Package Owner=<4> +Project: "libaufs"=".\libaufs\libaufs.dsp" - Package Owner=<4> Package=<5> {{{ @@ -627,9 +627,6 @@ Project_Dep_Name libufs End Project Dependency Begin Project Dependency - Project_Dep_Name libawin32 - End Project Dependency - Begin Project Dependency Project_Dep_Name libheap End Project Dependency Begin Project Dependency @@ -641,6 +638,9 @@ Begin Project Dependency Project_Dep_Name libnegotiate End Project Dependency + Begin Project Dependency + Project_Dep_Name libaufs + End Project Dependency }}} ############################################################################### --- /dev/null Wed Feb 14 01:16:58 2007 +++ squid/port/win32/libaufs/.cvsignore Wed Feb 14 01:17:06 2007 @@ -0,0 +1,3 @@ +.cvsignore +Debug +Release --- /dev/null Wed Feb 14 01:16:58 2007 +++ squid/port/win32/libaufs/libaufs.dsp Wed Feb 14 01:17:06 2007 @@ -0,0 +1,112 @@ +# Microsoft Developer Studio Project File - Name="libaufs" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libaufs - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libaufs.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libaufs.mak" CFG="libaufs - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libaufs - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libaufs - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libaufs - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /D _FILE_OFFSET_BITS=64 /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "libaufs - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /D _FILE_OFFSET_BITS=64 /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "libaufs - Win32 Release" +# Name "libaufs - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\fs\aufs\aiops_win32.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\fs\aufs\async_io.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\fs\aufs\store_dir_aufs.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\fs\aufs\store_io_aufs.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\src\fs\aufs\store_asyncufs.h +# End Source File +# End Group +# End Target +# End Project --- squid/port/win32/libawin32/.cvsignore Wed Feb 14 01:17:06 2007 +++ /dev/null Wed Feb 14 01:16:58 2007 @@ -1,3 +0,0 @@ -.cvsignore -Debug -Release --- squid/port/win32/libawin32/libawin32.dsp Wed Feb 14 01:17:06 2007 +++ /dev/null Wed Feb 14 01:16:58 2007 @@ -1,112 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libawin32" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libawin32 - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libawin32.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libawin32.mak" CFG="libawin32 - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libawin32 - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libawin32 - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libawin32 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /D _FILE_OFFSET_BITS=64 /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "libawin32 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /D _FILE_OFFSET_BITS=64 /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "libawin32 - Win32 Release" -# Name "libawin32 - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\src\fs\awin32\aiops.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\fs\awin32\async_io.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\fs\awin32\store_dir_aufs.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\fs\awin32\store_io_aufs.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\..\src\fs\awin32\store_asyncufs.h -# End Source File -# End Group -# End Target -# End Project