traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make svn:eol-style's more consistent

This commit is contained in:
Antoine Pitrou 2011-02-25 14:19:48 +00:00
parent 2ec8cbc75f
commit 7f1e174c7a
22 changed files with 513 additions and 513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
Doc/make.bat
View File

@ -1,59 +1,59 @@
@@echo off @@echo off
setlocal setlocal
set SVNROOT=http://svn.python.org/projects set SVNROOT=http://svn.python.org/projects
if "%PYTHON%" EQU "" set PYTHON=..\pcbuild\python if "%PYTHON%" EQU "" set PYTHON=..\pcbuild\python
if "%HTMLHELP%" EQU "" set HTMLHELP=%ProgramFiles%\HTML Help Workshop\hhc.exe if "%HTMLHELP%" EQU "" set HTMLHELP=%ProgramFiles%\HTML Help Workshop\hhc.exe
if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/sphinxext/patchlevel.py`) do set DISTVERSION=%%v if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/sphinxext/patchlevel.py`) do set DISTVERSION=%%v
if "%1" EQU "" goto help if "%1" EQU "" goto help
if "%1" EQU "html" goto build if "%1" EQU "html" goto build
if "%1" EQU "htmlhelp" goto build if "%1" EQU "htmlhelp" goto build
if "%1" EQU "latex" goto build if "%1" EQU "latex" goto build
if "%1" EQU "text" goto build if "%1" EQU "text" goto build
if "%1" EQU "suspicious" goto build if "%1" EQU "suspicious" goto build
if "%1" EQU "linkcheck" goto build if "%1" EQU "linkcheck" goto build
if "%1" EQU "changes" goto build if "%1" EQU "changes" goto build
if "%1" EQU "checkout" goto checkout if "%1" EQU "checkout" goto checkout
if "%1" EQU "update" goto update if "%1" EQU "update" goto update
:help :help
set this=%~n0 set this=%~n0
echo HELP echo HELP
echo. echo.
echo %this% checkout echo %this% checkout
echo %this% update echo %this% update
echo %this% html echo %this% html
echo %this% htmlhelp echo %this% htmlhelp
echo %this% latex echo %this% latex
echo %this% text echo %this% text
echo %this% suspicious echo %this% suspicious
echo %this% linkcheck echo %this% linkcheck
echo %this% changes echo %this% changes
echo. echo.
goto end goto end
:checkout :checkout
svn co %SVNROOT%/external/Sphinx-1.0.7/sphinx tools/sphinx svn co %SVNROOT%/external/Sphinx-1.0.7/sphinx tools/sphinx
svn co %SVNROOT%/external/docutils-0.6/docutils tools/docutils svn co %SVNROOT%/external/docutils-0.6/docutils tools/docutils
svn co %SVNROOT%/external/Jinja-2.3.1/jinja2 tools/jinja2 svn co %SVNROOT%/external/Jinja-2.3.1/jinja2 tools/jinja2
svn co %SVNROOT%/external/Pygments-1.3.1/pygments tools/pygments svn co %SVNROOT%/external/Pygments-1.3.1/pygments tools/pygments
goto end goto end
:update :update
svn update tools/sphinx svn update tools/sphinx
svn update tools/docutils svn update tools/docutils
svn update tools/jinja2 svn update tools/jinja2
svn update tools/pygments svn update tools/pygments
goto end goto end
:build :build
if not exist build mkdir build if not exist build mkdir build
if not exist build\%1 mkdir build\%1 if not exist build\%1 mkdir build\%1
if not exist build\doctrees mkdir build\doctrees if not exist build\doctrees mkdir build\doctrees
cmd /C %PYTHON% --version cmd /C %PYTHON% --version
cmd /C %PYTHON% tools\sphinx-build.py -b%1 -dbuild\doctrees . build\%* cmd /C %PYTHON% tools\sphinx-build.py -b%1 -dbuild\doctrees . build\%*
if "%1" EQU "htmlhelp" "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp if "%1" EQU "htmlhelp" "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp
goto end goto end
:end :end

24
PC/VS7.1/build_ssl.bat
View File

@ -1,12 +1,12 @@
if "%1" == "ReleaseAMD64" call "%MSSdk%\SetEnv" /XP64 /RETAIL if "%1" == "ReleaseAMD64" call "%MSSdk%\SetEnv" /XP64 /RETAIL
@echo off @echo off
if not defined HOST_PYTHON ( if not defined HOST_PYTHON (
if %1 EQU Debug ( if %1 EQU Debug (
set HOST_PYTHON=python_d.exe set HOST_PYTHON=python_d.exe
) ELSE ( ) ELSE (
set HOST_PYTHON=python.exe set HOST_PYTHON=python.exe
) )
) )
%HOST_PYTHON% build_ssl.py %1 %2 %HOST_PYTHON% build_ssl.py %1 %2

34
PC/VS8.0/build.bat
View File

@ -1,17 +1,17 @@
@echo off @echo off
rem A batch program to build or rebuild a particular configuration. rem A batch program to build or rebuild a particular configuration.
rem just for convenience. rem just for convenience.
setlocal setlocal
set platf=Win32 set platf=Win32
set conf=Release set conf=Release
set build=/build set build=/build
:CheckOpts :CheckOpts
if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts
if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts
set cmd=devenv pcbuild.sln %build% "%conf%|%platf%" set cmd=devenv pcbuild.sln %build% "%conf%|%platf%"
echo %cmd% echo %cmd%
%cmd% %cmd%

2
PC/VS8.0/build_env.bat
View File

@ -1 +1 @@
@%comspec% /k env.bat %* @%comspec% /k env.bat %*

82
PC/VS8.0/build_pgo.bat
View File

@ -1,41 +1,41 @@
@echo off @echo off
rem A batch program to build PGO (Profile guided optimization) by first rem A batch program to build PGO (Profile guided optimization) by first
rem building instrumented binaries, then running the testsuite, and rem building instrumented binaries, then running the testsuite, and
rem finally building the optimized code. rem finally building the optimized code.
rem Note, after the first instrumented run, one can just keep on rem Note, after the first instrumented run, one can just keep on
rem building the PGUpdate configuration while developing. rem building the PGUpdate configuration while developing.
setlocal setlocal
set platf=Win32 set platf=Win32
rem use the performance testsuite. This is quick and simple rem use the performance testsuite. This is quick and simple
set job1=..\..\tools\pybench\pybench.py -n 1 -C 1 --with-gc set job1=..\..\tools\pybench\pybench.py -n 1 -C 1 --with-gc
set path1=..\..\tools\pybench set path1=..\..\tools\pybench
rem or the whole testsuite for more thorough testing rem or the whole testsuite for more thorough testing
set job2=..\..\lib\test\regrtest.py set job2=..\..\lib\test\regrtest.py
set path2=..\..\lib set path2=..\..\lib
set job=%job1% set job=%job1%
set clrpath=%path1% set clrpath=%path1%
:CheckOpts :CheckOpts
if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts
set PGI=%platf%-pgi set PGI=%platf%-pgi
set PGO=%platf%-pgo set PGO=%platf%-pgo
@echo on @echo on
rem build the instrumented version rem build the instrumented version
call build -p %platf% -c PGInstrument call build -p %platf% -c PGInstrument
rem remove .pyc files, .pgc files and execute the job rem remove .pyc files, .pgc files and execute the job
%PGI%\python.exe rmpyc.py %clrpath% %PGI%\python.exe rmpyc.py %clrpath%
del %PGI%\*.pgc del %PGI%\*.pgc
%PGI%\python.exe %job% %PGI%\python.exe %job%
rem finally build the optimized version rem finally build the optimized version
if exist %PGO% del /s /q %PGO% if exist %PGO% del /s /q %PGO%
call build -p %platf% -c PGUpdate call build -p %platf% -c PGUpdate

24
PC/VS8.0/build_ssl.bat
View File

@ -1,12 +1,12 @@
@echo off @echo off
if not defined HOST_PYTHON ( if not defined HOST_PYTHON (
if %1 EQU Debug ( if %1 EQU Debug (
set HOST_PYTHON=python_d.exe set HOST_PYTHON=python_d.exe
if not exist python33_d.dll exit 1 if not exist python33_d.dll exit 1
) ELSE ( ) ELSE (
set HOST_PYTHON=python.exe set HOST_PYTHON=python.exe
if not exist python33.dll exit 1 if not exist python33.dll exit 1
) )
) )
%HOST_PYTHON% build_ssl.py %1 %2 %3 %HOST_PYTHON% build_ssl.py %1 %2 %3

10
PC/VS8.0/env.bat
View File

@ -1,5 +1,5 @@
@echo off @echo off
set VS8=%ProgramFiles%\Microsoft Visual Studio 8 set VS8=%ProgramFiles%\Microsoft Visual Studio 8
echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64 echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64
echo. echo.
call "%VS8%\VC\vcvarsall.bat" %1 call "%VS8%\VC\vcvarsall.bat" %1

30
PC/VS8.0/idle.bat
View File

@ -1,15 +1,15 @@
@echo off @echo off
rem start idle rem start idle
rem Usage: idle [-d] rem Usage: idle [-d]
rem -d Run Debug build (python_d.exe). Else release build. rem -d Run Debug build (python_d.exe). Else release build.
setlocal setlocal
set exe=python set exe=python
PATH %PATH%;..\..\..\tcltk\bin PATH %PATH%;..\..\..\tcltk\bin
if "%1"=="-d" (set exe=python_d) & shift if "%1"=="-d" (set exe=python_d) & shift
set cmd=%exe% ../../Lib/idlelib/idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9 set cmd=%exe% ../../Lib/idlelib/idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9
echo on echo on
%cmd% %cmd%

104
PC/VS8.0/rt.bat
View File

@ -1,52 +1,52 @@
@echo off @echo off
rem Run Tests. Run the regression test suite. rem Run Tests. Run the regression test suite.
rem Usage: rt [-d] [-O] [-q] regrtest_args rem Usage: rt [-d] [-O] [-q] regrtest_args
rem -d Run Debug build (python_d.exe). Else release build. rem -d Run Debug build (python_d.exe). Else release build.
rem -O Run python.exe or python_d.exe (see -d) with -O. rem -O Run python.exe or python_d.exe (see -d) with -O.
rem -q "quick" -- normally the tests are run twice, the first time rem -q "quick" -- normally the tests are run twice, the first time
rem after deleting all the .py[co] files reachable from Lib/. rem after deleting all the .py[co] files reachable from Lib/.
rem -q runs the tests just once, and without deleting .py[co] files. rem -q runs the tests just once, and without deleting .py[co] files.
rem All leading instances of these switches are shifted off, and rem All leading instances of these switches are shifted off, and
rem whatever remains is passed to regrtest.py. For example, rem whatever remains is passed to regrtest.py. For example,
rem rt -O -d -x test_thread rem rt -O -d -x test_thread
rem runs rem runs
rem python_d -O ../lib/test/regrtest.py -x test_thread rem python_d -O ../lib/test/regrtest.py -x test_thread
rem twice, and rem twice, and
rem rt -q -g test_binascii rem rt -q -g test_binascii
rem runs rem runs
rem python_d ../lib/test/regrtest.py -g test_binascii rem python_d ../lib/test/regrtest.py -g test_binascii
rem to generate the expected-output file for binascii quickly. rem to generate the expected-output file for binascii quickly.
rem rem
rem Confusing: if you want to pass a comma-separated list, like rem Confusing: if you want to pass a comma-separated list, like
rem -u network,largefile rem -u network,largefile
rem then you have to quote it on the rt line, like rem then you have to quote it on the rt line, like
rem rt -u "network,largefile" rem rt -u "network,largefile"
setlocal setlocal
set exe=python set exe=python
set qmode= set qmode=
set dashO= set dashO=
PATH %PATH%;%~dp0..\..\..\tcltk\bin PATH %PATH%;%~dp0..\..\..\tcltk\bin
:CheckOpts :CheckOpts
if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts
if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts
if "%1"=="-d" (set exe=python_d) & shift & goto CheckOpts if "%1"=="-d" (set exe=python_d) & shift & goto CheckOpts
set cmd=%exe% %dashO% -E ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 set cmd=%exe% %dashO% -E ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
if defined qmode goto Qmode if defined qmode goto Qmode
echo Deleting .pyc/.pyo files ... echo Deleting .pyc/.pyo files ...
%exe% rmpyc.py %exe% rmpyc.py
echo on echo on
%cmd% %cmd%
@echo off @echo off
echo About to run again without deleting .pyc/.pyo first: echo About to run again without deleting .pyc/.pyo first:
pause pause
:Qmode :Qmode
echo on echo on
%cmd% %cmd%

246
PC/bdist_wininst/wininst.dsp
View File

@ -1,123 +1,123 @@
# Microsoft Developer Studio Project File - Name="wininst" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="wininst" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101 # TARGTYPE "Win32 (x86) Application" 0x0101
CFG=wininst - Win32 Debug CFG=wininst - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "wininst.mak". !MESSAGE NMAKE /f "wininst.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "wininst.mak" CFG="wininst - Win32 Debug" !MESSAGE NMAKE /f "wininst.mak" CFG="wininst - Win32 Debug"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "wininst - Win32 Release" (based on "Win32 (x86) Application") !MESSAGE "wininst - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "wininst - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "wininst - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
# PROP AllowPerConfigDependencies 0 # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "" # PROP Scc_ProjName ""
# PROP Scc_LocalPath "" # PROP Scc_LocalPath ""
CPP=cl.exe CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "wininst - Win32 Release" !IF "$(CFG)" == "wininst - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release" # PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release" # PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\lib\distutils\command" # PROP Output_Dir "..\..\lib\distutils\command"
# PROP Intermediate_Dir "temp-release" # PROP Intermediate_Dir "temp-release"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /O1 /I "..\..\Include" /I "..\..\..\zlib-1.2.3" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MD /W3 /O1 /I "..\..\Include" /I "..\..\..\zlib-1.2.3" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 /machine:I386 # 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 /machine:I386
# ADD LINK32 ..\..\..\zlib-1.2.3\zlib.lib imagehlp.lib comdlg32.lib ole32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"LIBC" /out:"..\..\lib\distutils\command/wininst-6.0.exe" # ADD LINK32 ..\..\..\zlib-1.2.3\zlib.lib imagehlp.lib comdlg32.lib ole32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"LIBC" /out:"..\..\lib\distutils\command/wininst-6.0.exe"
!ELSEIF "$(CFG)" == "wininst - Win32 Debug" !ELSEIF "$(CFG)" == "wininst - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug" # PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug" # PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "." # PROP Output_Dir "."
# PROP Intermediate_Dir "temp-debug" # PROP Intermediate_Dir "temp-debug"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MD /W3 /Z7 /Od /I "..\..\Include" /I "..\..\..\zlib-1.2.1" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /c # ADD CPP /nologo /MD /W3 /Z7 /Od /I "..\..\Include" /I "..\..\..\zlib-1.2.1" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD BASE RSC /l 0x407 /d "_DEBUG"
# ADD RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 /debug /machine:I386 /pdbtype:sept # 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 /debug /machine:I386 /pdbtype:sept
# ADD LINK32 ..\..\..\zlib-1.2.3\zlib.lib imagehlp.lib comdlg32.lib ole32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /pdb:none /debug /machine:I386 /nodefaultlib:"LIBC" /out:"..\..\lib\distutils\command/wininst-6.0_d.exe" # ADD LINK32 ..\..\..\zlib-1.2.3\zlib.lib imagehlp.lib comdlg32.lib ole32.lib comctl32.lib kernel32.lib user32.lib gdi32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /pdb:none /debug /machine:I386 /nodefaultlib:"LIBC" /out:"..\..\lib\distutils\command/wininst-6.0_d.exe"
!ENDIF !ENDIF
# Begin Target # Begin Target
# Name "wininst - Win32 Release" # Name "wininst - Win32 Release"
# Name "wininst - Win32 Debug" # Name "wininst - Win32 Debug"
# Begin Group "Source Files" # Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File # Begin Source File
SOURCE=.\extract.c SOURCE=.\extract.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\install.c SOURCE=.\install.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\install.rc SOURCE=.\install.rc
# End Source File # End Source File
# End Group # End Group
# Begin Group "Header Files" # Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl" # PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File # Begin Source File
SOURCE=.\archive.h SOURCE=.\archive.h
# End Source File # End Source File
# End Group # End Group
# Begin Group "Resource Files" # Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# Begin Source File # Begin Source File
SOURCE=.\PythonPowered.bmp SOURCE=.\PythonPowered.bmp
# End Source File # End Source File
# End Group # End Group
# End Target # End Target
# End Project # End Project

58
PC/bdist_wininst/wininst.dsw
View File

@ -1,29 +1,29 @@
Microsoft Developer Studio Workspace File, Format Version 6.00 Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
############################################################################### ###############################################################################
Project: "wininst"=.\wininst.dsp - Package Owner=<4> Project: "wininst"=.\wininst.dsp - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
}}} }}}
Package=<4> Package=<4>
{{{ {{{
}}} }}}
############################################################################### ###############################################################################
Global: Global:
Package=<5> Package=<5>
{{{ {{{
}}} }}}
Package=<3> Package=<3>
{{{ {{{
}}} }}}
############################################################################### ###############################################################################

12
Tools/buildbot/build-amd64.bat
View File

@ -1,6 +1,6 @@
@rem Used by the buildbot "compile" step. @rem Used by the buildbot "compile" step.
cmd /c Tools\buildbot\external-amd64.bat cmd /c Tools\buildbot\external-amd64.bat
call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
cmd /c Tools\buildbot\clean-amd64.bat cmd /c Tools\buildbot\clean-amd64.bat
vcbuild /useenv PCbuild\kill_python.vcproj "Debug|x64" && PCbuild\amd64\kill_python_d.exe vcbuild /useenv PCbuild\kill_python.vcproj "Debug|x64" && PCbuild\amd64\kill_python_d.exe
vcbuild PCbuild\pcbuild.sln "Debug|x64" vcbuild PCbuild\pcbuild.sln "Debug|x64"

14
Tools/buildbot/build.bat
View File

@ -1,7 +1,7 @@
@rem Used by the buildbot "compile" step. @rem Used by the buildbot "compile" step.
cmd /c Tools\buildbot\external.bat cmd /c Tools\buildbot\external.bat
call "%VS90COMNTOOLS%vsvars32.bat" call "%VS90COMNTOOLS%vsvars32.bat"
cmd /c Tools\buildbot\clean.bat cmd /c Tools\buildbot\clean.bat
vcbuild /useenv PCbuild\kill_python.vcproj "Debug|Win32" && PCbuild\kill_python_d.exe vcbuild /useenv PCbuild\kill_python.vcproj "Debug|Win32" && PCbuild\kill_python_d.exe
vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32" vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32"

42
Tools/buildbot/buildmsi.bat
View File

@ -1,21 +1,21 @@
@rem Used by the buildbot "buildmsi" step. @rem Used by the buildbot "buildmsi" step.
cmd /c Tools\buildbot\external.bat cmd /c Tools\buildbot\external.bat
@rem build release versions of things @rem build release versions of things
call "%VS90COMNTOOLS%vsvars32.bat" call "%VS90COMNTOOLS%vsvars32.bat"
@rem build Python @rem build Python
vcbuild /useenv PCbuild\pcbuild.sln "Release|Win32" vcbuild /useenv PCbuild\pcbuild.sln "Release|Win32"
@rem build the documentation @rem build the documentation
bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp' bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'
"%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\python26a3.hhp "%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\python26a3.hhp
@rem build the MSI file @rem build the MSI file
cd PC cd PC
nmake /f icons.mak nmake /f icons.mak
cd ..\Tools\msi cd ..\Tools\msi
del *.msi del *.msi
nmake /f msisupport.mak nmake /f msisupport.mak
%HOST_PYTHON% msi.py %HOST_PYTHON% msi.py

14
Tools/buildbot/clean-amd64.bat
View File

@ -1,7 +1,7 @@
@rem Used by the buildbot "clean" step. @rem Used by the buildbot "clean" step.
call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
cd PCbuild cd PCbuild
@echo Deleting .pyc/.pyo files ... @echo Deleting .pyc/.pyo files ...
del /s Lib\*.pyc Lib\*.pyo del /s Lib\*.pyc Lib\*.pyo
vcbuild /clean pcbuild.sln "Release|x64" vcbuild /clean pcbuild.sln "Release|x64"
vcbuild /clean pcbuild.sln "Debug|x64" vcbuild /clean pcbuild.sln "Debug|x64"

14
Tools/buildbot/clean.bat
View File

@ -1,7 +1,7 @@
@rem Used by the buildbot "clean" step. @rem Used by the buildbot "clean" step.
call "%VS90COMNTOOLS%vsvars32.bat" call "%VS90COMNTOOLS%vsvars32.bat"
@echo Deleting .pyc/.pyo files ... @echo Deleting .pyc/.pyo files ...
del /s Lib\*.pyc Lib\*.pyo del /s Lib\*.pyc Lib\*.pyo
cd PCbuild cd PCbuild
vcbuild /clean pcbuild.sln "Release|Win32" vcbuild /clean pcbuild.sln "Release|Win32"
vcbuild /clean pcbuild.sln "Debug|Win32" vcbuild /clean pcbuild.sln "Debug|Win32"

42
Tools/buildbot/external-amd64.bat
View File

@ -1,21 +1,21 @@
@rem Fetches (and builds if necessary) external dependencies @rem Fetches (and builds if necessary) external dependencies
@rem Assume we start inside the Python source directory @rem Assume we start inside the Python source directory
call "Tools\buildbot\external-common.bat" call "Tools\buildbot\external-common.bat"
call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
if not exist tcltk64\bin\tcl85g.dll ( if not exist tcltk64\bin\tcl85g.dll (
cd tcl-8.5.9.0\win cd tcl-8.5.9.0\win
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install
cd ..\.. cd ..\..
) )
if not exist tcltk64\bin\tk85g.dll ( if not exist tcltk64\bin\tk85g.dll (
cd tk-8.5.9.0\win cd tk-8.5.9.0\win
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 clean nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 clean
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 all nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 all
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 install nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 install
cd ..\.. cd ..\..
) )

86
Tools/buildbot/external-common.bat
View File

@ -1,43 +1,43 @@
@rem Common file shared between external.bat and external-amd64.bat. Responsible for @rem Common file shared between external.bat and external-amd64.bat. Responsible for
@rem fetching external components into the root\.. buildbot directories. @rem fetching external components into the root\.. buildbot directories.
cd .. cd ..
@rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment @rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment
@rem the following, check it in, then check it out, comment it out, then check it back in. @rem the following, check it in, then check it out, comment it out, then check it back in.
@rem if exist bzip2-1.0.5 rd /s/q bzip2-1.0.5 @rem if exist bzip2-1.0.5 rd /s/q bzip2-1.0.5
@rem if exist tcltk rd /s/q tcltk @rem if exist tcltk rd /s/q tcltk
@rem if exist tcltk64 rd /s/q tcltk64 @rem if exist tcltk64 rd /s/q tcltk64
@rem if exist tcl8.4.12 rd /s/q tcl8.4.12 @rem if exist tcl8.4.12 rd /s/q tcl8.4.12
@rem if exist tcl8.4.16 rd /s/q tcl8.4.16 @rem if exist tcl8.4.16 rd /s/q tcl8.4.16
@rem if exist tcl-8.4.18.1 rd /s/q tcl-8.4.18.1 @rem if exist tcl-8.4.18.1 rd /s/q tcl-8.4.18.1
@rem if exist tk8.4.12 rd /s/q tk8.4.12 @rem if exist tk8.4.12 rd /s/q tk8.4.12
@rem if exist tk8.4.16 rd /s/q tk8.4.16 @rem if exist tk8.4.16 rd /s/q tk8.4.16
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
@rem if exist db-4.4.20 rd /s/q db-4.4.20 @rem if exist db-4.4.20 rd /s/q db-4.4.20
@rem if exist openssl-1.0.0a rd /s/q openssl-1.0.0a @rem if exist openssl-1.0.0a rd /s/q openssl-1.0.0a
@rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4 @rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4
@rem bzip @rem bzip
if not exist bzip2-1.0.5 ( if not exist bzip2-1.0.5 (
rd /s/q bzip2-1.0.3 rd /s/q bzip2-1.0.3
svn export http://svn.python.org/projects/external/bzip2-1.0.5 svn export http://svn.python.org/projects/external/bzip2-1.0.5
) )
@rem Sleepycat db @rem Sleepycat db
if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20-vs9 db-4.4.20 if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20-vs9 db-4.4.20
@rem OpenSSL @rem OpenSSL
if not exist openssl-1.0.0a svn export http://svn.python.org/projects/external/openssl-1.0.0a if not exist openssl-1.0.0a svn export http://svn.python.org/projects/external/openssl-1.0.0a
@rem tcl/tk @rem tcl/tk
if not exist tcl-8.5.9.0 ( if not exist tcl-8.5.9.0 (
rd /s/q tcltk tcltk64 rd /s/q tcltk tcltk64
svn export http://svn.python.org/projects/external/tcl-8.5.9.0 svn export http://svn.python.org/projects/external/tcl-8.5.9.0
) )
if not exist tk-8.5.9.0 svn export http://svn.python.org/projects/external/tk-8.5.9.0 if not exist tk-8.5.9.0 svn export http://svn.python.org/projects/external/tk-8.5.9.0
@rem sqlite3 @rem sqlite3
if not exist sqlite-3.7.4 ( if not exist sqlite-3.7.4 (
rd /s/q sqlite-source-3.6.21 rd /s/q sqlite-source-3.6.21
svn export http://svn.python.org/projects/external/sqlite-3.7.4 svn export http://svn.python.org/projects/external/sqlite-3.7.4
) )

42
Tools/buildbot/external.bat
View File

@ -1,21 +1,21 @@
@rem Fetches (and builds if necessary) external dependencies @rem Fetches (and builds if necessary) external dependencies
@rem Assume we start inside the Python source directory @rem Assume we start inside the Python source directory
call "Tools\buildbot\external-common.bat" call "Tools\buildbot\external-common.bat"
call "%VS90COMNTOOLS%\vsvars32.bat" call "%VS90COMNTOOLS%\vsvars32.bat"
if not exist tcltk\bin\tcl85g.dll ( if not exist tcltk\bin\tcl85g.dll (
@rem all and install need to be separate invocations, otherwise nmakehlp is not found on install @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install
cd tcl-8.5.9.0\win cd tcl-8.5.9.0\win
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all
nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install
cd ..\.. cd ..\..
) )
if not exist tcltk\bin\tk85g.dll ( if not exist tcltk\bin\tk85g.dll (
cd tk-8.5.9.0\win cd tk-8.5.9.0\win
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 clean nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 clean
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 all nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 all
nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 install nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 install
cd ..\.. cd ..\..
) )

6
Tools/buildbot/test-amd64.bat
View File

@ -1,3 +1,3 @@
@rem Used by the buildbot "test" step. @rem Used by the buildbot "test" step.
cd PCbuild cd PCbuild
call rt.bat -q -d -x64 -uall -rw call rt.bat -q -d -x64 -uall -rw

8
Tools/buildbot/test.bat
View File

@ -1,4 +1,4 @@
@rem Used by the buildbot "test" step. @rem Used by the buildbot "test" step.
cd PCbuild cd PCbuild
call rt.bat -d -q -uall -rwW -n call rt.bat -d -q -uall -rwW -n

14
Tools/unicode/genwincodecs.bat
View File

@ -1,7 +1,7 @@
@rem Recreate some python charmap codecs from the Windows function @rem Recreate some python charmap codecs from the Windows function
@rem MultiByteToWideChar. @rem MultiByteToWideChar.
@cd /d %~dp0 @cd /d %~dp0
@mkdir build @mkdir build
@rem Arabic DOS code page @rem Arabic DOS code page
c:\python30\python genwincodec.py 720 > build/cp720.py c:\python30\python genwincodec.py 720 > build/cp720.py