Merged revisions 69494 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69494 | hirokazu.yamamoto | 2009-02-10 22:31:28 +0900 | 1 line

  Fixed svn:eol-style.
........

3 files changed, 218 insertions, 218 deletions

diff --git a/PC/VC6/_multiprocessing.dsp b/PC/VC6/_multiprocessing.dsp
index 0c5754a..2d3d637 100644
--- a/PC/VC6/_multiprocessing.dsp
+++ b/PC/VC6/_multiprocessing.dsp
@@ -1,115 +1,115 @@
-# Microsoft Developer Studio Project File - Name="_multiprocessing" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=_multiprocessing - 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 "_multiprocessing.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 "_multiprocessing.mak" CFG="_multiprocessing - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "_multiprocessing - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "_multiprocessing - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "_multiprocessing"
-# PROP Scc_LocalPath ".."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "_multiprocessing - 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 "."
-# PROP Intermediate_Dir "x86-temp-release\_multiprocessing"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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 /subsystem:windows /dll /machine:I386
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /base:"0x1e1D0000" /subsystem:windows /dll /debug /machine:I386 /out:"./_multiprocessing.pyd"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "_multiprocessing - 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 "."
-# PROP Intermediate_Dir "x86-temp-debug\_multiprocessing"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /base:"0x1e1d0000" /subsystem:windows /dll /debug /machine:I386 /out:"./_multiprocessing_d.pyd" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "_multiprocessing - Win32 Release"
-# Name "_multiprocessing - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\..\Modules\_multiprocessing\multiprocessing.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Modules\_multiprocessing\pipe_connection.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Modules\_multiprocessing\semaphore.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Modules\_multiprocessing\socket_connection.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Modules\_multiprocessing\win32_functions.c
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="_multiprocessing" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=_multiprocessing - 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 "_multiprocessing.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 "_multiprocessing.mak" CFG="_multiprocessing - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "_multiprocessing - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "_multiprocessing - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName "_multiprocessing"

+# PROP Scc_LocalPath ".."

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "_multiprocessing - 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 "."

+# PROP Intermediate_Dir "x86-temp-release\_multiprocessing"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+F90=df.exe

+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+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 /subsystem:windows /dll /machine:I386

+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /base:"0x1e1D0000" /subsystem:windows /dll /debug /machine:I386 /out:"./_multiprocessing.pyd"

+# SUBTRACT LINK32 /pdb:none

+

+!ELSEIF  "$(CFG)" == "_multiprocessing - 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 "."

+# PROP Intermediate_Dir "x86-temp-debug\_multiprocessing"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+F90=df.exe

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /base:"0x1e1d0000" /subsystem:windows /dll /debug /machine:I386 /out:"./_multiprocessing_d.pyd" /pdbtype:sept

+# SUBTRACT LINK32 /pdb:none

+

+!ENDIF 

+

+# Begin Target

+

+# Name "_multiprocessing - Win32 Release"

+# Name "_multiprocessing - Win32 Debug"

+# Begin Source File

+

+SOURCE=..\..\Modules\_multiprocessing\multiprocessing.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\Modules\_multiprocessing\pipe_connection.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\Modules\_multiprocessing\semaphore.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\Modules\_multiprocessing\socket_connection.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\Modules\_multiprocessing\win32_functions.c

+# End Source File

+# End Target

+# End Project

diff --git a/PC/VC6/build_tkinter.py b/PC/VC6/build_tkinter.py
index f2e3c41..e5ca92c 100644
--- a/PC/VC6/build_tkinter.py
+++ b/PC/VC6/build_tkinter.py
@@ -1,81 +1,81 @@
-import os

-import sys

-import subprocess

-

-TCL_MAJOR = 8

-TCL_MINOR = 5

-TCL_PATCH = 2

-

-TIX_MAJOR = 8

-TIX_MINOR = 4

-TIX_PATCH = 3

-

-def abspath(name):

-    par = os.path.pardir

-    return os.path.abspath(os.path.join(__file__, par, par, par, par, name))

-

-TCL_DIR = abspath("tcl%d.%d.%d" % (TCL_MAJOR, TCL_MINOR, TCL_PATCH))

-TK_DIR  = abspath("tk%d.%d.%d"  % (TCL_MAJOR, TCL_MINOR, TCL_PATCH))

-TIX_DIR = abspath("tix%d.%d.%d" % (TIX_MAJOR, TIX_MINOR, TIX_PATCH))

-OUT_DIR = abspath("tcltk")

-

-def have_args(*a):

-    return any(s in sys.argv[1:] for s in a)

-

-def enter(dir):

-    os.chdir(os.path.join(dir, "win"))

-

-def main():

-    debug = have_args("-d", "--debug")

-    clean = have_args("clean")

-    install = have_args("install")

-    tcl = have_args("tcl")

-    tk = have_args("tk")

-    tix = have_args("tix")

-    if not(tcl) and not(tk) and not(tix):

-        tcl = tk = tix = True

-

-    def nmake(makefile, *a):

-        args = ["nmake", "/nologo", "/f", makefile, "DEBUG=%d" % debug]

-        args.extend(a)

-        subprocess.check_call(args)

-

-    if tcl:

-        enter(TCL_DIR)

-        def nmake_tcl(*a):

-            nmake("makefile.vc", *a)

-        if clean:

-            nmake_tcl("clean")

-        elif install:

-            nmake_tcl("install", "INSTALLDIR=" + OUT_DIR)

-        else:

-            nmake_tcl()

-

-    if tk:

-        enter(TK_DIR)

-        def nmake_tk(*a):

-            nmake("makefile.vc", "TCLDIR=" + TCL_DIR, *a)

-        if clean:

-            nmake_tk("clean")

-        elif install:

-            nmake_tk("install", "INSTALLDIR=" + OUT_DIR)

-        else:

-            nmake_tk()

-

-    if tix:

-        enter(TIX_DIR)

-        def nmake_tix(*a):

-            nmake("python.mak",

-                  "TCL_MAJOR=%d" % TCL_MAJOR,

-                  "TCL_MINOR=%d" % TCL_MINOR,

-                  "TCL_PATCH=%d" % TCL_PATCH,

-                  "MACHINE=IX86", *a)

-        if clean:

-            nmake_tix("clean")

-        elif install:

-            nmake_tix("install", "INSTALL_DIR=" + OUT_DIR)

-        else:

-            nmake_tix()

-

-if __name__ == '__main__':

-    main()

+import os
+import sys
+import subprocess
+
+TCL_MAJOR = 8
+TCL_MINOR = 5
+TCL_PATCH = 2
+
+TIX_MAJOR = 8
+TIX_MINOR = 4
+TIX_PATCH = 3
+
+def abspath(name):
+    par = os.path.pardir
+    return os.path.abspath(os.path.join(__file__, par, par, par, par, name))
+
+TCL_DIR = abspath("tcl%d.%d.%d" % (TCL_MAJOR, TCL_MINOR, TCL_PATCH))
+TK_DIR  = abspath("tk%d.%d.%d"  % (TCL_MAJOR, TCL_MINOR, TCL_PATCH))
+TIX_DIR = abspath("tix%d.%d.%d" % (TIX_MAJOR, TIX_MINOR, TIX_PATCH))
+OUT_DIR = abspath("tcltk")
+
+def have_args(*a):
+    return any(s in sys.argv[1:] for s in a)
+
+def enter(dir):
+    os.chdir(os.path.join(dir, "win"))
+
+def main():
+    debug = have_args("-d", "--debug")
+    clean = have_args("clean")
+    install = have_args("install")
+    tcl = have_args("tcl")
+    tk = have_args("tk")
+    tix = have_args("tix")
+    if not(tcl) and not(tk) and not(tix):
+        tcl = tk = tix = True
+
+    def nmake(makefile, *a):
+        args = ["nmake", "/nologo", "/f", makefile, "DEBUG=%d" % debug]
+        args.extend(a)
+        subprocess.check_call(args)
+
+    if tcl:
+        enter(TCL_DIR)
+        def nmake_tcl(*a):
+            nmake("makefile.vc", *a)
+        if clean:
+            nmake_tcl("clean")
+        elif install:
+            nmake_tcl("install", "INSTALLDIR=" + OUT_DIR)
+        else:
+            nmake_tcl()
+
+    if tk:
+        enter(TK_DIR)
+        def nmake_tk(*a):
+            nmake("makefile.vc", "TCLDIR=" + TCL_DIR, *a)
+        if clean:
+            nmake_tk("clean")
+        elif install:
+            nmake_tk("install", "INSTALLDIR=" + OUT_DIR)
+        else:
+            nmake_tk()
+
+    if tix:
+        enter(TIX_DIR)
+        def nmake_tix(*a):
+            nmake("python.mak",
+                  "TCL_MAJOR=%d" % TCL_MAJOR,
+                  "TCL_MINOR=%d" % TCL_MINOR,
+                  "TCL_PATCH=%d" % TCL_PATCH,
+                  "MACHINE=IX86", *a)
+        if clean:
+            nmake_tix("clean")
+        elif install:
+            nmake_tix("install", "INSTALL_DIR=" + OUT_DIR)
+        else:
+            nmake_tix()
+
+if __name__ == '__main__':
+    main()
diff --git a/PC/VC6/tcl852.patch b/PC/VC6/tcl852.patch
index b8071e4..0b6c466 100644
--- a/PC/VC6/tcl852.patch
+++ b/PC/VC6/tcl852.patch
@@ -1,22 +1,22 @@
---- tcl8.5.2\generic\tcl.h	Fri Jun 13 03:35:39 2008

-+++ tcl8.5.2\generic\tcl.h	Sun Jan  4 16:52:30 2009

-@@ -367,7 +367,7 @@

- typedef struct stati64 Tcl_StatBuf;

- #         define TCL_LL_MODIFIER	"L"

- #      else /* __BORLANDC__ */

--#         if _MSC_VER < 1400 && !defined(_M_IX86)

-+#         if _MSC_VER < 1400 /*&& !defined(_M_IX86)*/

- typedef struct _stati64	Tcl_StatBuf;

- #         else

- typedef struct _stat64	Tcl_StatBuf;

---- tcl8.5.2\generic\tcl.h	Fri Jun 13 03:35:39 2008

-+++ tcl8.5.2\generic\tcl.h	Sun Jan  4 16:52:30 2009

-@@ -367,7 +367,7 @@

- typedef struct stati64 Tcl_StatBuf;

- #         define TCL_LL_MODIFIER	"L"

- #      else /* __BORLANDC__ */

--#         if _MSC_VER < 1400 && !defined(_M_IX86)

-+#         if _MSC_VER < 1400 /*&& !defined(_M_IX86)*/

- typedef struct _stati64	Tcl_StatBuf;

- #         else

- typedef struct _stat64	Tcl_StatBuf;

+--- tcl8.5.2\generic\tcl.h	Fri Jun 13 03:35:39 2008
++++ tcl8.5.2\generic\tcl.h	Sun Jan  4 16:52:30 2009
+@@ -367,7 +367,7 @@
+ typedef struct stati64 Tcl_StatBuf;
+ #         define TCL_LL_MODIFIER	"L"
+ #      else /* __BORLANDC__ */
+-#         if _MSC_VER < 1400 && !defined(_M_IX86)
++#         if _MSC_VER < 1400 /*&& !defined(_M_IX86)*/
+ typedef struct _stati64	Tcl_StatBuf;
+ #         else
+ typedef struct _stat64	Tcl_StatBuf;
+--- tcl8.5.2\generic\tcl.h	Fri Jun 13 03:35:39 2008
++++ tcl8.5.2\generic\tcl.h	Sun Jan  4 16:52:30 2009
+@@ -367,7 +367,7 @@
+ typedef struct stati64 Tcl_StatBuf;
+ #         define TCL_LL_MODIFIER	"L"
+ #      else /* __BORLANDC__ */
+-#         if _MSC_VER < 1400 && !defined(_M_IX86)
++#         if _MSC_VER < 1400 /*&& !defined(_M_IX86)*/
+ typedef struct _stati64	Tcl_StatBuf;
+ #         else
+ typedef struct _stat64	Tcl_StatBuf;