-@@echo off\r
-setlocal\r
-\r
-set SVNROOT=http://svn.python.org/projects\r
-if "%PYTHON%" EQU "" set PYTHON=..\pcbuild\python\r
-if "%HTMLHELP%" EQU "" set HTMLHELP=%ProgramFiles%\HTML Help Workshop\hhc.exe\r
-if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/sphinxext/patchlevel.py`) do set DISTVERSION=%%v\r
-\r
-if "%1" EQU "" goto help\r
-if "%1" EQU "html" goto build\r
-if "%1" EQU "htmlhelp" goto build\r
-if "%1" EQU "latex" goto build\r
-if "%1" EQU "text" goto build\r
-if "%1" EQU "suspicious" goto build\r
-if "%1" EQU "linkcheck" goto build\r
-if "%1" EQU "changes" goto build\r
-if "%1" EQU "checkout" goto checkout\r
-if "%1" EQU "update" goto update\r
-\r
-:help\r
-set this=%~n0\r
-echo HELP\r
-echo.\r
-echo %this% checkout\r
-echo %this% update\r
-echo %this% html\r
-echo %this% htmlhelp\r
-echo %this% latex\r
-echo %this% text\r
-echo %this% suspicious\r
-echo %this% linkcheck\r
-echo %this% changes\r
-echo.\r
-goto end\r
-\r
-:checkout\r
-svn co %SVNROOT%/external/Sphinx-1.0.7/sphinx tools/sphinx\r
-svn co %SVNROOT%/external/docutils-0.6/docutils tools/docutils\r
-svn co %SVNROOT%/external/Jinja-2.3.1/jinja2 tools/jinja2\r
-svn co %SVNROOT%/external/Pygments-1.3.1/pygments tools/pygments\r
-goto end\r
-\r
-:update\r
-svn update tools/sphinx\r
-svn update tools/docutils\r
-svn update tools/jinja2\r
-svn update tools/pygments\r
-goto end\r
-\r
-:build\r
-if not exist build mkdir build\r
-if not exist build\%1 mkdir build\%1\r
-if not exist build\doctrees mkdir build\doctrees\r
-cmd /C %PYTHON% --version\r
-cmd /C %PYTHON% tools\sphinx-build.py -b%1 -dbuild\doctrees . build\%*\r
-if "%1" EQU "htmlhelp" "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp\r
-goto end\r
-\r
-:end\r
+@@echo off
+setlocal
+
+set SVNROOT=http://svn.python.org/projects
+if "%PYTHON%" EQU "" set PYTHON=..\pcbuild\python
+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 "%1" EQU "" goto help
+if "%1" EQU "html" goto build
+if "%1" EQU "htmlhelp" goto build
+if "%1" EQU "latex" goto build
+if "%1" EQU "text" goto build
+if "%1" EQU "suspicious" goto build
+if "%1" EQU "linkcheck" goto build
+if "%1" EQU "changes" goto build
+if "%1" EQU "checkout" goto checkout
+if "%1" EQU "update" goto update
+
+:help
+set this=%~n0
+echo HELP
+echo.
+echo %this% checkout
+echo %this% update
+echo %this% html
+echo %this% htmlhelp
+echo %this% latex
+echo %this% text
+echo %this% suspicious
+echo %this% linkcheck
+echo %this% changes
+echo.
+goto end
+
+:checkout
+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/Jinja-2.3.1/jinja2 tools/jinja2
+svn co %SVNROOT%/external/Pygments-1.3.1/pygments tools/pygments
+goto end
+
+:update
+svn update tools/sphinx
+svn update tools/docutils
+svn update tools/jinja2
+svn update tools/pygments
+goto end
+
+:build
+if not exist build mkdir build
+if not exist build\%1 mkdir build\%1
+if not exist build\doctrees mkdir build\doctrees
+cmd /C %PYTHON% --version
+cmd /C %PYTHON% tools\sphinx-build.py -b%1 -dbuild\doctrees . build\%*
+if "%1" EQU "htmlhelp" "%HTMLHELP%" build\htmlhelp\python%DISTVERSION:.=%.hhp
+goto end
+
+:end
-if "%1" == "ReleaseAMD64" call "%MSSdk%\SetEnv" /XP64 /RETAIL\r
-\r
-@echo off\r
-if not defined HOST_PYTHON (\r
- if %1 EQU Debug (\r
- set HOST_PYTHON=python_d.exe\r
- ) ELSE (\r
- set HOST_PYTHON=python.exe\r
- )\r
-)\r
-%HOST_PYTHON% build_ssl.py %1 %2\r
-\r
+if "%1" == "ReleaseAMD64" call "%MSSdk%\SetEnv" /XP64 /RETAIL
+
+@echo off
+if not defined HOST_PYTHON (
+ if %1 EQU Debug (
+ set HOST_PYTHON=python_d.exe
+ ) ELSE (
+ set HOST_PYTHON=python.exe
+ )
+)
+%HOST_PYTHON% build_ssl.py %1 %2
+
-@echo off\r
-rem A batch program to build or rebuild a particular configuration.\r
-rem just for convenience.\r
-\r
-setlocal\r
-set platf=Win32\r
-set conf=Release\r
-set build=/build\r
-\r
-:CheckOpts\r
-if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts\r
-if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts\r
-if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts\r
-\r
-set cmd=devenv pcbuild.sln %build% "%conf%|%platf%"\r
-echo %cmd%\r
-%cmd%\r
+@echo off
+rem A batch program to build or rebuild a particular configuration.
+rem just for convenience.
+
+setlocal
+set platf=Win32
+set conf=Release
+set build=/build
+
+:CheckOpts
+if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts
+if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
+if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts
+
+set cmd=devenv pcbuild.sln %build% "%conf%|%platf%"
+echo %cmd%
+%cmd%
-@%comspec% /k env.bat %*\r
+@%comspec% /k env.bat %*
-@echo off\r
-rem A batch program to build PGO (Profile guided optimization) by first\r
-rem building instrumented binaries, then running the testsuite, and\r
-rem finally building the optimized code.\r
-rem Note, after the first instrumented run, one can just keep on\r
-rem building the PGUpdate configuration while developing.\r
-\r
-setlocal\r
-set platf=Win32\r
-\r
-rem use the performance testsuite. This is quick and simple\r
-set job1=..\..\tools\pybench\pybench.py -n 1 -C 1 --with-gc\r
-set path1=..\..\tools\pybench\r
-\r
-rem or the whole testsuite for more thorough testing\r
-set job2=..\..\lib\test\regrtest.py\r
-set path2=..\..\lib\r
-\r
-set job=%job1%\r
-set clrpath=%path1%\r
-\r
-:CheckOpts\r
-if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts\r
-if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts\r
-\r
-set PGI=%platf%-pgi\r
-set PGO=%platf%-pgo\r
-\r
-@echo on\r
-rem build the instrumented version\r
-call build -p %platf% -c PGInstrument\r
-\r
-rem remove .pyc files, .pgc files and execute the job\r
-%PGI%\python.exe rmpyc.py %clrpath%\r
-del %PGI%\*.pgc\r
-%PGI%\python.exe %job%\r
-\r
-rem finally build the optimized version\r
-if exist %PGO% del /s /q %PGO%\r
-call build -p %platf% -c PGUpdate\r
-\r
+@echo off
+rem A batch program to build PGO (Profile guided optimization) by first
+rem building instrumented binaries, then running the testsuite, and
+rem finally building the optimized code.
+rem Note, after the first instrumented run, one can just keep on
+rem building the PGUpdate configuration while developing.
+
+setlocal
+set platf=Win32
+
+rem use the performance testsuite. This is quick and simple
+set job1=..\..\tools\pybench\pybench.py -n 1 -C 1 --with-gc
+set path1=..\..\tools\pybench
+
+rem or the whole testsuite for more thorough testing
+set job2=..\..\lib\test\regrtest.py
+set path2=..\..\lib
+
+set job=%job1%
+set clrpath=%path1%
+
+:CheckOpts
+if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
+if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts
+
+set PGI=%platf%-pgi
+set PGO=%platf%-pgo
+
+@echo on
+rem build the instrumented version
+call build -p %platf% -c PGInstrument
+
+rem remove .pyc files, .pgc files and execute the job
+%PGI%\python.exe rmpyc.py %clrpath%
+del %PGI%\*.pgc
+%PGI%\python.exe %job%
+
+rem finally build the optimized version
+if exist %PGO% del /s /q %PGO%
+call build -p %platf% -c PGUpdate
+
-@echo off\r
-if not defined HOST_PYTHON (\r
- if %1 EQU Debug (\r
- set HOST_PYTHON=python_d.exe\r
- if not exist python33_d.dll exit 1\r
- ) ELSE (\r
- set HOST_PYTHON=python.exe\r
- if not exist python33.dll exit 1\r
- )\r
-)\r
-%HOST_PYTHON% build_ssl.py %1 %2 %3\r
-\r
+@echo off
+if not defined HOST_PYTHON (
+ if %1 EQU Debug (
+ set HOST_PYTHON=python_d.exe
+ if not exist python33_d.dll exit 1
+ ) ELSE (
+ set HOST_PYTHON=python.exe
+ if not exist python33.dll exit 1
+ )
+)
+%HOST_PYTHON% build_ssl.py %1 %2 %3
+
-@echo off\r
-set VS8=%ProgramFiles%\Microsoft Visual Studio 8\r
-echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64\r
-echo.\r
-call "%VS8%\VC\vcvarsall.bat" %1\r
+@echo off
+set VS8=%ProgramFiles%\Microsoft Visual Studio 8
+echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64
+echo.
+call "%VS8%\VC\vcvarsall.bat" %1
-@echo off\r
-rem start idle\r
-rem Usage: idle [-d]\r
-rem -d Run Debug build (python_d.exe). Else release build.\r
-\r
-setlocal\r
-set exe=python\r
-PATH %PATH%;..\..\..\tcltk\bin\r
-\r
-if "%1"=="-d" (set exe=python_d) & shift\r
-\r
-set cmd=%exe% ../../Lib/idlelib/idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9\r
-\r
-echo on\r
-%cmd%\r
+@echo off
+rem start idle
+rem Usage: idle [-d]
+rem -d Run Debug build (python_d.exe). Else release build.
+
+setlocal
+set exe=python
+PATH %PATH%;..\..\..\tcltk\bin
+
+if "%1"=="-d" (set exe=python_d) & shift
+
+set cmd=%exe% ../../Lib/idlelib/idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+echo on
+%cmd%
-@echo off\r
-rem Run Tests. Run the regression test suite.\r
-rem Usage: rt [-d] [-O] [-q] regrtest_args\r
-rem -d Run Debug build (python_d.exe). Else release build.\r
-rem -O Run python.exe or python_d.exe (see -d) with -O.\r
-rem -q "quick" -- normally the tests are run twice, the first time\r
-rem after deleting all the .py[co] files reachable from Lib/.\r
-rem -q runs the tests just once, and without deleting .py[co] files.\r
-rem All leading instances of these switches are shifted off, and\r
-rem whatever remains is passed to regrtest.py. For example,\r
-rem rt -O -d -x test_thread\r
-rem runs\r
-rem python_d -O ../lib/test/regrtest.py -x test_thread\r
-rem twice, and\r
-rem rt -q -g test_binascii\r
-rem runs\r
-rem python_d ../lib/test/regrtest.py -g test_binascii\r
-rem to generate the expected-output file for binascii quickly.\r
-rem\r
-rem Confusing: if you want to pass a comma-separated list, like\r
-rem -u network,largefile\r
-rem then you have to quote it on the rt line, like\r
-rem rt -u "network,largefile"\r
-\r
-setlocal\r
-\r
-set exe=python\r
-set qmode=\r
-set dashO=\r
-PATH %PATH%;%~dp0..\..\..\tcltk\bin\r
-\r
-:CheckOpts\r
-if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts\r
-if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts\r
-if "%1"=="-d" (set exe=python_d) & shift & goto CheckOpts\r
-\r
-set cmd=%exe% %dashO% -E ../../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9\r
-if defined qmode goto Qmode\r
-\r
-echo Deleting .pyc/.pyo files ...\r
-%exe% rmpyc.py\r
-\r
-echo on\r
-%cmd%\r
-@echo off\r
-\r
-echo About to run again without deleting .pyc/.pyo first:\r
-pause\r
-\r
-:Qmode\r
-echo on\r
-%cmd%\r
+@echo off
+rem Run Tests. Run the regression test suite.
+rem Usage: rt [-d] [-O] [-q] regrtest_args
+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 -q "quick" -- normally the tests are run twice, the first time
+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 All leading instances of these switches are shifted off, and
+rem whatever remains is passed to regrtest.py. For example,
+rem rt -O -d -x test_thread
+rem runs
+rem python_d -O ../lib/test/regrtest.py -x test_thread
+rem twice, and
+rem rt -q -g test_binascii
+rem runs
+rem python_d ../lib/test/regrtest.py -g test_binascii
+rem to generate the expected-output file for binascii quickly.
+rem
+rem Confusing: if you want to pass a comma-separated list, like
+rem -u network,largefile
+rem then you have to quote it on the rt line, like
+rem rt -u "network,largefile"
+
+setlocal
+
+set exe=python
+set qmode=
+set dashO=
+PATH %PATH%;%~dp0..\..\..\tcltk\bin
+
+:CheckOpts
+if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts
+if "%1"=="-q" (set qmode=yes) & 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
+if defined qmode goto Qmode
+
+echo Deleting .pyc/.pyo files ...
+%exe% rmpyc.py
+
+echo on
+%cmd%
+@echo off
+
+echo About to run again without deleting .pyc/.pyo first:
+pause
+
+:Qmode
+echo on
+%cmd%
-# Microsoft Developer Studio Project File - Name="wininst" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=wininst - 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 "wininst.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 "wininst.mak" CFG="wininst - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "wininst - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "wininst - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "wininst - 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 "..\..\lib\distutils\command"
-# PROP Intermediate_Dir "temp-release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# 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 BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /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 /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"
-
-!ELSEIF "$(CFG)" == "wininst - 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 "temp-debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# 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 BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /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 /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"
-
-!ENDIF
-
-# Begin Target
-
-# Name "wininst - Win32 Release"
-# Name "wininst - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\extract.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\install.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\install.rc
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\archive.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\PythonPowered.bmp
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="wininst" - Package Owner=<4>\r
+# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
+# ** DO NOT EDIT **\r
+\r
+# TARGTYPE "Win32 (x86) Application" 0x0101\r
+\r
+CFG=wininst - Win32 Debug\r
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
+!MESSAGE use the Export Makefile command and run\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "wininst.mak".\r
+!MESSAGE \r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "wininst.mak" CFG="wininst - Win32 Debug"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "wininst - Win32 Release" (based on "Win32 (x86) Application")\r
+!MESSAGE "wininst - Win32 Debug" (based on "Win32 (x86) Application")\r
+!MESSAGE \r
+\r
+# Begin Project\r
+# PROP AllowPerConfigDependencies 0\r
+# PROP Scc_ProjName ""\r
+# PROP Scc_LocalPath ""\r
+CPP=cl.exe\r
+MTL=midl.exe\r
+RSC=rc.exe\r
+\r
+!IF "$(CFG)" == "wininst - Win32 Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "Release"\r
+# PROP BASE Intermediate_Dir "Release"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "..\..\lib\distutils\command"\r
+# PROP Intermediate_Dir "temp-release"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /O1 /I "..\..\Include" /I "..\..\..\zlib-1.2.3" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c\r
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x407 /d "NDEBUG"\r
+# ADD RSC /l 0x407 /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# 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\r
+# 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"\r
+\r
+!ELSEIF "$(CFG)" == "wininst - Win32 Debug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "Debug"\r
+# PROP BASE Intermediate_Dir "Debug"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "."\r
+# PROP Intermediate_Dir "temp-debug"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c\r
+# 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\r
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x407 /d "_DEBUG"\r
+# ADD RSC /l 0x407 /d "_DEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# 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\r
+# 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"\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "wininst - Win32 Release"\r
+# Name "wininst - Win32 Debug"\r
+# Begin Group "Source Files"\r
+\r
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+# Begin Source File\r
+\r
+SOURCE=.\extract.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\install.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\install.rc\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files"\r
+\r
+# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
+# Begin Source File\r
+\r
+SOURCE=.\archive.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "Resource Files"\r
+\r
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
+# Begin Source File\r
+\r
+SOURCE=.\PythonPowered.bmp\r
+# End Source File\r
+# End Group\r
+# End Target\r
+# End Project\r
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "wininst"=.\wininst.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00\r
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\r
+\r
+###############################################################################\r
+\r
+Project: "wininst"=.\wininst.dsp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Global:\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<3>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
-@rem Used by the buildbot "compile" step.\r
-cmd /c Tools\buildbot\external-amd64.bat\r
-call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64\r
-cmd /c Tools\buildbot\clean-amd64.bat\r
-vcbuild /useenv PCbuild\kill_python.vcproj "Debug|x64" && PCbuild\amd64\kill_python_d.exe\r
-vcbuild PCbuild\pcbuild.sln "Debug|x64"\r
+@rem Used by the buildbot "compile" step.
+cmd /c Tools\buildbot\external-amd64.bat
+call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
+cmd /c Tools\buildbot\clean-amd64.bat
+vcbuild /useenv PCbuild\kill_python.vcproj "Debug|x64" && PCbuild\amd64\kill_python_d.exe
+vcbuild PCbuild\pcbuild.sln "Debug|x64"
-@rem Used by the buildbot "compile" step.\r
-cmd /c Tools\buildbot\external.bat\r
-call "%VS90COMNTOOLS%vsvars32.bat"\r
-cmd /c Tools\buildbot\clean.bat\r
-vcbuild /useenv PCbuild\kill_python.vcproj "Debug|Win32" && PCbuild\kill_python_d.exe\r
-vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32"\r
-\r
+@rem Used by the buildbot "compile" step.
+cmd /c Tools\buildbot\external.bat
+call "%VS90COMNTOOLS%vsvars32.bat"
+cmd /c Tools\buildbot\clean.bat
+vcbuild /useenv PCbuild\kill_python.vcproj "Debug|Win32" && PCbuild\kill_python_d.exe
+vcbuild /useenv PCbuild\pcbuild.sln "Debug|Win32"
+
-@rem Used by the buildbot "buildmsi" step.\r
-\r
-cmd /c Tools\buildbot\external.bat\r
-@rem build release versions of things\r
-call "%VS90COMNTOOLS%vsvars32.bat"\r
-\r
-@rem build Python\r
-vcbuild /useenv PCbuild\pcbuild.sln "Release|Win32"\r
-\r
-@rem build the documentation\r
-bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'\r
-"%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\python26a3.hhp\r
-\r
-@rem build the MSI file\r
-cd PC\r
-nmake /f icons.mak\r
-cd ..\Tools\msi\r
-del *.msi\r
-nmake /f msisupport.mak\r
-%HOST_PYTHON% msi.py\r
-\r
+@rem Used by the buildbot "buildmsi" step.
+
+cmd /c Tools\buildbot\external.bat
+@rem build release versions of things
+call "%VS90COMNTOOLS%vsvars32.bat"
+
+@rem build Python
+vcbuild /useenv PCbuild\pcbuild.sln "Release|Win32"
+
+@rem build the documentation
+bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'
+"%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\python26a3.hhp
+
+@rem build the MSI file
+cd PC
+nmake /f icons.mak
+cd ..\Tools\msi
+del *.msi
+nmake /f msisupport.mak
+%HOST_PYTHON% msi.py
+
-@rem Used by the buildbot "clean" step.\r
-call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64\r
-cd PCbuild\r
-@echo Deleting .pyc/.pyo files ...\r
-del /s Lib\*.pyc Lib\*.pyo\r
-vcbuild /clean pcbuild.sln "Release|x64"\r
-vcbuild /clean pcbuild.sln "Debug|x64"\r
+@rem Used by the buildbot "clean" step.
+call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
+cd PCbuild
+@echo Deleting .pyc/.pyo files ...
+del /s Lib\*.pyc Lib\*.pyo
+vcbuild /clean pcbuild.sln "Release|x64"
+vcbuild /clean pcbuild.sln "Debug|x64"
-@rem Used by the buildbot "clean" step.\r
-call "%VS90COMNTOOLS%vsvars32.bat"\r
-@echo Deleting .pyc/.pyo files ...\r
-del /s Lib\*.pyc Lib\*.pyo\r
-cd PCbuild\r
-vcbuild /clean pcbuild.sln "Release|Win32"\r
-vcbuild /clean pcbuild.sln "Debug|Win32"\r
+@rem Used by the buildbot "clean" step.
+call "%VS90COMNTOOLS%vsvars32.bat"
+@echo Deleting .pyc/.pyo files ...
+del /s Lib\*.pyc Lib\*.pyo
+cd PCbuild
+vcbuild /clean pcbuild.sln "Release|Win32"
+vcbuild /clean pcbuild.sln "Debug|Win32"
-@rem Fetches (and builds if necessary) external dependencies\r
-\r
-@rem Assume we start inside the Python source directory\r
-call "Tools\buildbot\external-common.bat"\r
-call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64\r
-\r
-if not exist tcltk64\bin\tcl85g.dll (\r
- cd tcl-8.5.9.0\win\r
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all\r
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install\r
- cd ..\..\r
-)\r
-\r
-if not exist tcltk64\bin\tk85g.dll (\r
- cd tk-8.5.9.0\win \r
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 clean\r
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 all\r
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 install\r
- cd ..\..\r
-)\r
-\r
+@rem Fetches (and builds if necessary) external dependencies
+
+@rem Assume we start inside the Python source directory
+call "Tools\buildbot\external-common.bat"
+call "%VS90COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
+
+if not exist tcltk64\bin\tcl85g.dll (
+ 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 install
+ cd ..\..
+)
+
+if not exist tcltk64\bin\tk85g.dll (
+ 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 all
+ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.5.9.0 install
+ cd ..\..
+)
+
-@rem Common file shared between external.bat and external-amd64.bat. Responsible for\r
-@rem fetching external components into the root\.. buildbot directories.\r
-\r
-cd ..\r
-@rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment\r
-@rem the following, check it in, then check it out, comment it out, then check it back in.\r
-@rem if exist bzip2-1.0.5 rd /s/q bzip2-1.0.5\r
-@rem if exist tcltk rd /s/q tcltk\r
-@rem if exist tcltk64 rd /s/q tcltk64\r
-@rem if exist tcl8.4.12 rd /s/q tcl8.4.12\r
-@rem if exist tcl8.4.16 rd /s/q tcl8.4.16\r
-@rem if exist tcl-8.4.18.1 rd /s/q tcl-8.4.18.1\r
-@rem if exist tk8.4.12 rd /s/q tk8.4.12\r
-@rem if exist tk8.4.16 rd /s/q tk8.4.16\r
-@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1\r
-@rem if exist db-4.4.20 rd /s/q db-4.4.20\r
-@rem if exist openssl-1.0.0a rd /s/q openssl-1.0.0a\r
-@rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4 \r
-\r
-@rem bzip\r
-if not exist bzip2-1.0.5 (\r
- rd /s/q bzip2-1.0.3\r
- svn export http://svn.python.org/projects/external/bzip2-1.0.5\r
-)\r
-\r
-@rem Sleepycat db\r
-if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20-vs9 db-4.4.20\r
-\r
-@rem OpenSSL\r
-if not exist openssl-1.0.0a svn export http://svn.python.org/projects/external/openssl-1.0.0a\r
-\r
-@rem tcl/tk\r
-if not exist tcl-8.5.9.0 (\r
- rd /s/q tcltk tcltk64\r
- svn export http://svn.python.org/projects/external/tcl-8.5.9.0\r
-)\r
-if not exist tk-8.5.9.0 svn export http://svn.python.org/projects/external/tk-8.5.9.0\r
-\r
-@rem sqlite3\r
-if not exist sqlite-3.7.4 (\r
- rd /s/q sqlite-source-3.6.21\r
- svn export http://svn.python.org/projects/external/sqlite-3.7.4\r
-)\r
+@rem Common file shared between external.bat and external-amd64.bat. Responsible for
+@rem fetching external components into the root\.. buildbot directories.
+
+cd ..
+@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 if exist bzip2-1.0.5 rd /s/q bzip2-1.0.5
+@rem if exist tcltk rd /s/q tcltk
+@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.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 tk8.4.12 rd /s/q tk8.4.12
+@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 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 sqlite-3.7.4 rd /s/q sqlite-3.7.4
+
+@rem bzip
+if not exist bzip2-1.0.5 (
+ rd /s/q bzip2-1.0.3
+ svn export http://svn.python.org/projects/external/bzip2-1.0.5
+)
+
+@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
+
+@rem OpenSSL
+if not exist openssl-1.0.0a svn export http://svn.python.org/projects/external/openssl-1.0.0a
+
+@rem tcl/tk
+if not exist tcl-8.5.9.0 (
+ rd /s/q tcltk tcltk64
+ 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
+
+@rem sqlite3
+if not exist sqlite-3.7.4 (
+ rd /s/q sqlite-source-3.6.21
+ svn export http://svn.python.org/projects/external/sqlite-3.7.4
+)
-@rem Fetches (and builds if necessary) external dependencies\r
-\r
-@rem Assume we start inside the Python source directory\r
-call "Tools\buildbot\external-common.bat"\r
-call "%VS90COMNTOOLS%\vsvars32.bat"\r
-\r
-if not exist tcltk\bin\tcl85g.dll (\r
- @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install\r
- cd tcl-8.5.9.0\win\r
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all \r
- nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install\r
- cd ..\..\r
-)\r
-\r
-if not exist tcltk\bin\tk85g.dll (\r
- cd tk-8.5.9.0\win \r
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 clean\r
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 all\r
- nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 install\r
- cd ..\..\r
-)\r
+@rem Fetches (and builds if necessary) external dependencies
+
+@rem Assume we start inside the Python source directory
+call "Tools\buildbot\external-common.bat"
+call "%VS90COMNTOOLS%\vsvars32.bat"
+
+if not exist tcltk\bin\tcl85g.dll (
+ @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install
+ cd tcl-8.5.9.0\win
+ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 INSTALLDIR=..\..\tcltk clean all
+ nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install
+ cd ..\..
+)
+
+if not exist tcltk\bin\tk85g.dll (
+ 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 all
+ nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.5.9.0 install
+ cd ..\..
+)
-@rem Used by the buildbot "test" step.\r
-cd PCbuild\r
-call rt.bat -q -d -x64 -uall -rw\r
+@rem Used by the buildbot "test" step.
+cd PCbuild
+call rt.bat -q -d -x64 -uall -rw
-@rem Used by the buildbot "test" step.\r
-cd PCbuild\r
-call rt.bat -d -q -uall -rwW -n\r
-\r
+@rem Used by the buildbot "test" step.
+cd PCbuild
+call rt.bat -d -q -uall -rwW -n
+
-@rem Recreate some python charmap codecs from the Windows function\r
-@rem MultiByteToWideChar.\r
-\r
-@cd /d %~dp0\r
-@mkdir build\r
-@rem Arabic DOS code page\r
-c:\python30\python genwincodec.py 720 > build/cp720.py\r
+@rem Recreate some python charmap codecs from the Windows function
+@rem MultiByteToWideChar.
+
+@cd /d %~dp0
+@mkdir build
+@rem Arabic DOS code page
+c:\python30\python genwincodec.py 720 > build/cp720.py
projects / python / commitdiff