diff --git a/.hgeol b/.hgeol
--- a/.hgeol
+++ b/.hgeol
@@ -40,6 +40,7 @@
# The Windows readme is likely to be read in Notepad, so make it readable
PCbuild/readme.txt = CRLF
+PC/VS9.0/readme.txt = CRLF
# All other files (which presumably are human-editable) are "native".
# This must be the last rule!
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -17,6 +17,7 @@
platform$
pyconfig.h$
python$
+python.bat$
python.exe$
reflog.txt$
tags$
@@ -44,21 +45,38 @@
*.pyd
*.cover
*~
+Lib/distutils/command/*.pdb
Lib/lib2to3/*.pickle
Lib/test/data/*
Misc/*.wpu
PC/python_nt*.h
PC/pythonnt_rc*.h
-PC/*.obj
+PC/*/*.exe
+PC/*/*.exp
+PC/*/*.lib
+PC/*/*.bsc
+PC/*/*.dll
+PC/*/*.pdb
+PC/*/*.user
+PC/*/*.ncb
+PC/*/*.suo
+PC/*/Win32-temp-*
+PC/*/x64-temp-*
+PC/*/amd64
+PCbuild/*.user
+PCbuild/*.suo
+PCbuild/*.*sdf
+PCbuild/*-pgi
+PCbuild/*-pgo
+PCbuild/.vs
+PCbuild/*.dll
+PCbuild/*.exp
PCbuild/*.exe
-PCbuild/*.dll
+PCbuild/*.ilk
+PCbuild/*.lib
PCbuild/*.pdb
-PCbuild/*.lib
-PCbuild/*.exp
-PCbuild/*.o
-PCbuild/*.ncb
-PCbuild/*.bsc
-PCbuild/Win32-temp-*
+PCbuild/amd64
+PCbuild/obj
.coverage
coverage/
externals/
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -199,10 +199,12 @@
else:
# win-amd64 or win-ia64
suffix = self.plat_name[4:]
- new_lib = os.path.join(sys.exec_prefix, 'PCbuild')
- if suffix:
- new_lib = os.path.join(new_lib, suffix)
- self.library_dirs.append(new_lib)
+ # We could have been built in one of two places; add both
+ for d in ('PCbuild',), ('PC', 'VS9.0'):
+ new_lib = os.path.join(sys.exec_prefix, *d)
+ if suffix:
+ new_lib = os.path.join(new_lib, suffix)
+ self.library_dirs.append(new_lib)
elif MSVC_VERSION == 8:
self.library_dirs.append(os.path.join(sys.exec_prefix,
diff --git a/Lib/lib-tk/FixTk.py b/Lib/lib-tk/FixTk.py
--- a/Lib/lib-tk/FixTk.py
+++ b/Lib/lib-tk/FixTk.py
@@ -49,7 +49,10 @@
prefix = os.path.join(sys.prefix,"tcl")
if not os.path.exists(prefix):
# devdir/externals/tcltk/lib
- prefix = os.path.join(sys.prefix, "externals", "tcltk", "lib")
+ tcltk = 'tcltk'
+ if sys.maxsize > 2**31 - 1:
+ tcltk = 'tcltk64'
+ prefix = os.path.join(sys.prefix, "externals", tcltk, "lib")
prefix = os.path.abspath(prefix)
# if this does not exist, no further search is needed
if os.path.exists(prefix):
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -203,6 +203,15 @@
newsoft = min(hard, max(soft, 1024*2048))
resource.setrlimit(resource.RLIMIT_STACK, (newsoft, hard))
+# Windows, Tkinter, and resetting the environment after each test don't
+# mix well. To alleviate test failures due to Tcl/Tk not being able to
+# find its library, get the necessary environment massage done once early.
+if sys.platform == 'win32':
+ try:
+ import FixTk
+ except Exception:
+ pass
+
# Test result constants.
PASSED = 1
FAILED = 0
diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -8,9 +8,7 @@
# Skip this test if the _tkinter module wasn't built.
_tkinter = test_support.import_module('_tkinter')
-# Make sure tkinter._fix runs to set up the environment
-tkinter = test_support.import_fresh_module('Tkinter')
-
+import Tkinter as tkinter
from Tkinter import Tcl
from _tkinter import TclError
diff --git a/PCbuild/_bsddb.vcproj b/PC/VS9.0/_bsddb.vcproj
rename from PCbuild/_bsddb.vcproj
rename to PC/VS9.0/_bsddb.vcproj
--- a/PCbuild/_bsddb.vcproj
+++ b/PC/VS9.0/_bsddb.vcproj
@@ -537,7 +537,7 @@
Name="Header Files"
>
@@ -545,7 +545,7 @@
Name="Source Files"
>
diff --git a/PCbuild/_ctypes.vcproj b/PC/VS9.0/_ctypes.vcproj
rename from PCbuild/_ctypes.vcproj
rename to PC/VS9.0/_ctypes.vcproj
--- a/PCbuild/_ctypes.vcproj
+++ b/PC/VS9.0/_ctypes.vcproj
@@ -42,7 +42,7 @@
/>
@@ -559,39 +559,39 @@
Name="Source Files"
>
@@ -511,7 +511,7 @@
Name="Source Files"
>
diff --git a/PCbuild/_elementtree.vcproj b/PC/VS9.0/_elementtree.vcproj
rename from PCbuild/_elementtree.vcproj
rename to PC/VS9.0/_elementtree.vcproj
--- a/PCbuild/_elementtree.vcproj
+++ b/PC/VS9.0/_elementtree.vcproj
@@ -42,7 +42,7 @@
/>
@@ -591,19 +591,19 @@
Name="Source Files"
>
diff --git a/PCbuild/_hashlib.vcproj b/PC/VS9.0/_hashlib.vcproj
rename from PCbuild/_hashlib.vcproj
rename to PC/VS9.0/_hashlib.vcproj
--- a/PCbuild/_hashlib.vcproj
+++ b/PC/VS9.0/_hashlib.vcproj
@@ -535,7 +535,7 @@
Name="Source Files"
>
diff --git a/PCbuild/_msi.vcproj b/PC/VS9.0/_msi.vcproj
rename from PCbuild/_msi.vcproj
rename to PC/VS9.0/_msi.vcproj
--- a/PCbuild/_msi.vcproj
+++ b/PC/VS9.0/_msi.vcproj
@@ -519,7 +519,7 @@
Name="Source Files"
>
diff --git a/PCbuild/_multiprocessing.vcproj b/PC/VS9.0/_multiprocessing.vcproj
rename from PCbuild/_multiprocessing.vcproj
rename to PC/VS9.0/_multiprocessing.vcproj
--- a/PCbuild/_multiprocessing.vcproj
+++ b/PC/VS9.0/_multiprocessing.vcproj
@@ -519,11 +519,11 @@
Name="Header Files"
>
@@ -531,23 +531,23 @@
Name="Source Files"
>
diff --git a/PCbuild/_socket.vcproj b/PC/VS9.0/_socket.vcproj
rename from PCbuild/_socket.vcproj
rename to PC/VS9.0/_socket.vcproj
--- a/PCbuild/_socket.vcproj
+++ b/PC/VS9.0/_socket.vcproj
@@ -519,7 +519,7 @@
Name="Header Files"
>
@@ -527,7 +527,7 @@
Name="Source Files"
>
diff --git a/PCbuild/_sqlite3.vcproj b/PC/VS9.0/_sqlite3.vcproj
rename from PCbuild/_sqlite3.vcproj
rename to PC/VS9.0/_sqlite3.vcproj
--- a/PCbuild/_sqlite3.vcproj
+++ b/PC/VS9.0/_sqlite3.vcproj
@@ -527,43 +527,43 @@
Name="Header Files"
>
@@ -571,39 +571,39 @@
Name="Source Files"
>
diff --git a/PCbuild/_ssl.vcproj b/PC/VS9.0/_ssl.vcproj
rename from PCbuild/_ssl.vcproj
rename to PC/VS9.0/_ssl.vcproj
--- a/PCbuild/_ssl.vcproj
+++ b/PC/VS9.0/_ssl.vcproj
@@ -535,7 +535,7 @@
Name="Source Files"
>
diff --git a/PCbuild/_testcapi.vcproj b/PC/VS9.0/_testcapi.vcproj
rename from PCbuild/_testcapi.vcproj
rename to PC/VS9.0/_testcapi.vcproj
--- a/PCbuild/_testcapi.vcproj
+++ b/PC/VS9.0/_testcapi.vcproj
@@ -511,7 +511,7 @@
Name="Source Files"
>
diff --git a/PCbuild/_tkinter.vcproj b/PC/VS9.0/_tkinter.vcproj
rename from PCbuild/_tkinter.vcproj
rename to PC/VS9.0/_tkinter.vcproj
--- a/PCbuild/_tkinter.vcproj
+++ b/PC/VS9.0/_tkinter.vcproj
@@ -527,11 +527,11 @@
Name="Source Files"
>
diff --git a/PCbuild/bdist_wininst.vcproj b/PC/VS9.0/bdist_wininst.vcproj
rename from PCbuild/bdist_wininst.vcproj
rename to PC/VS9.0/bdist_wininst.vcproj
--- a/PCbuild/bdist_wininst.vcproj
+++ b/PC/VS9.0/bdist_wininst.vcproj
@@ -20,7 +20,7 @@
@@ -247,7 +247,7 @@
Filter="h;hpp;hxx;hm;inl"
>
@@ -256,11 +256,11 @@
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
diff --git a/PCbuild/build.bat b/PC/VS9.0/build.bat
copy from PCbuild/build.bat
copy to PC/VS9.0/build.bat
--- a/PCbuild/build.bat
+++ b/PC/VS9.0/build.bat
@@ -31,7 +31,7 @@
echo.Unknown target: %2 & goto :eof
)
if '%1'=='-d' (set conf=Debug) & shift & goto CheckOpts
-if '%1'=='-e' call "%dir%get_externals.bat" & (set build_tkinter=true) & shift & goto CheckOpts
+if '%1'=='-e' call "%dir%..\..\PCbuild\get_externals.bat" & (set build_tkinter=true) & shift & goto CheckOpts
if '%1'=='-k' (set kill=true) & shift & goto CheckOpts
if '%conf%'=='Debug' (set dbg_ext=_d) else (set dbg_ext=)
@@ -54,7 +54,7 @@
vcbuild "%dir%kill_python.vcproj" "%conf%|%platf%" && "%builddir%kill_python%dbg_ext%.exe"
)
-set externals_dir=%dir%..\externals
+set externals_dir=%dir%..\..\externals
if '%build_tkinter%'=='true' (
if '%platf%'=='x64' (
set tcltkdir=%externals_dir%\tcltk64
diff --git a/PCbuild/build_env.bat b/PC/VS9.0/build_env.bat
copy from PCbuild/build_env.bat
copy to PC/VS9.0/build_env.bat
diff --git a/PCbuild/build_pgo.bat b/PC/VS9.0/build_pgo.bat
copy from PCbuild/build_pgo.bat
copy to PC/VS9.0/build_pgo.bat
--- a/PCbuild/build_pgo.bat
+++ b/PC/VS9.0/build_pgo.bat
@@ -9,12 +9,12 @@
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
+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 job2=..\..\lib\test\regrtest.py
+set path2=..\..\lib
set job=%job1%
set clrpath=%path1%
diff --git a/PCbuild/build_ssl.bat b/PC/VS9.0/build_ssl.bat
rename from PCbuild/build_ssl.bat
rename to PC/VS9.0/build_ssl.bat
diff --git a/PCbuild/build_ssl.py b/PC/VS9.0/build_ssl.py
rename from PCbuild/build_ssl.py
rename to PC/VS9.0/build_ssl.py
--- a/PCbuild/build_ssl.py
+++ b/PC/VS9.0/build_ssl.py
@@ -69,7 +69,7 @@
propfile = (os.path.join(os.path.dirname(__file__), 'pyproject.vsprops'))
with open(propfile) as f:
m = re.search('openssl-([^"]+)"', f.read())
- return "..\externals\openssl-"+m.group(1)
+ return "..\..\externals\openssl-"+m.group(1)
def create_makefile64(makefile, m32):
diff --git a/PCbuild/build_tkinter.py b/PC/VS9.0/build_tkinter.py
rename from PCbuild/build_tkinter.py
rename to PC/VS9.0/build_tkinter.py
diff --git a/PCbuild/bz2.vcproj b/PC/VS9.0/bz2.vcproj
rename from PCbuild/bz2.vcproj
rename to PC/VS9.0/bz2.vcproj
--- a/PCbuild/bz2.vcproj
+++ b/PC/VS9.0/bz2.vcproj
@@ -527,7 +527,7 @@
Name="Source Files"
>
diff --git a/PCbuild/debug.vsprops b/PC/VS9.0/debug.vsprops
rename from PCbuild/debug.vsprops
rename to PC/VS9.0/debug.vsprops
diff --git a/PCbuild/env.bat b/PC/VS9.0/env.bat
copy from PCbuild/env.bat
copy to PC/VS9.0/env.bat
diff --git a/PCbuild/field3.py b/PC/VS9.0/field3.py
copy from PCbuild/field3.py
copy to PC/VS9.0/field3.py
diff --git a/PCbuild/idle.bat b/PC/VS9.0/idle.bat
copy from PCbuild/idle.bat
copy to PC/VS9.0/idle.bat
diff --git a/PCbuild/installer.bmp b/PC/VS9.0/installer.bmp
copy from PCbuild/installer.bmp
copy to PC/VS9.0/installer.bmp
diff --git a/PCbuild/kill_python.c b/PC/VS9.0/kill_python.c
rename from PCbuild/kill_python.c
rename to PC/VS9.0/kill_python.c
diff --git a/PCbuild/kill_python.vcproj b/PC/VS9.0/kill_python.vcproj
rename from PCbuild/kill_python.vcproj
rename to PC/VS9.0/kill_python.vcproj
diff --git a/PCbuild/make_buildinfo.c b/PC/VS9.0/make_buildinfo.c
rename from PCbuild/make_buildinfo.c
rename to PC/VS9.0/make_buildinfo.c
--- a/PCbuild/make_buildinfo.c
+++ b/PC/VS9.0/make_buildinfo.c
@@ -46,7 +46,7 @@
if (_stat(command+1, &st) < 0)
/* subwcrev.exe not part of the release */
return 0;
- strcat_s(command, CMD_SIZE, "\" .. ..\\Modules\\getbuildinfo.c getbuildinfo2.c");
+ strcat_s(command, CMD_SIZE, "\" .. ..\\..\\Modules\\getbuildinfo.c getbuildinfo2.c");
puts(command); fflush(stdout);
if (system(command) < 0)
return 0;
@@ -82,8 +82,8 @@
if ((do_unlink = make_buildinfo2()))
strcat_s(command, CMD_SIZE, "getbuildinfo2.c -DSUBWCREV ");
else
- strcat_s(command, CMD_SIZE, "..\\Modules\\getbuildinfo.c");
- strcat_s(command, CMD_SIZE, " -Fogetbuildinfo.o -I..\\Include -I..\\PC");
+ strcat_s(command, CMD_SIZE, "..\\..\\Modules\\getbuildinfo.c");
+ strcat_s(command, CMD_SIZE, " -Fogetbuildinfo.o -I..\\..\\Include -I..\\..\\PC");
puts(command); fflush(stdout);
result = system(command);
if (do_unlink)
diff --git a/PCbuild/make_buildinfo.vcproj b/PC/VS9.0/make_buildinfo.vcproj
rename from PCbuild/make_buildinfo.vcproj
rename to PC/VS9.0/make_buildinfo.vcproj
diff --git a/PCbuild/make_versioninfo.vcproj b/PC/VS9.0/make_versioninfo.vcproj
rename from PCbuild/make_versioninfo.vcproj
rename to PC/VS9.0/make_versioninfo.vcproj
--- a/PCbuild/make_versioninfo.vcproj
+++ b/PC/VS9.0/make_versioninfo.vcproj
@@ -32,8 +32,8 @@
@@ -314,7 +314,7 @@
Name="Source Files"
>
diff --git a/PCbuild/pcbuild.sln b/PC/VS9.0/pcbuild.sln
copy from PCbuild/pcbuild.sln
copy to PC/VS9.0/pcbuild.sln
diff --git a/PCbuild/pginstrument.vsprops b/PC/VS9.0/pginstrument.vsprops
rename from PCbuild/pginstrument.vsprops
rename to PC/VS9.0/pginstrument.vsprops
diff --git a/PCbuild/pgupdate.vsprops b/PC/VS9.0/pgupdate.vsprops
rename from PCbuild/pgupdate.vsprops
rename to PC/VS9.0/pgupdate.vsprops
diff --git a/PCbuild/pyd.vsprops b/PC/VS9.0/pyd.vsprops
rename from PCbuild/pyd.vsprops
rename to PC/VS9.0/pyd.vsprops
diff --git a/PCbuild/pyd_d.vsprops b/PC/VS9.0/pyd_d.vsprops
rename from PCbuild/pyd_d.vsprops
rename to PC/VS9.0/pyd_d.vsprops
diff --git a/PCbuild/pyexpat.vcproj b/PC/VS9.0/pyexpat.vcproj
rename from PCbuild/pyexpat.vcproj
rename to PC/VS9.0/pyexpat.vcproj
--- a/PCbuild/pyexpat.vcproj
+++ b/PC/VS9.0/pyexpat.vcproj
@@ -42,7 +42,7 @@
/>
@@ -531,19 +531,19 @@
Name="Source Files"
>
diff --git a/PCbuild/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
rename from PCbuild/pyproject.vsprops
rename to PC/VS9.0/pyproject.vsprops
--- a/PCbuild/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@ -11,7 +11,7 @@
Optimization="2"
InlineFunctionExpansion="1"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\Include; ..\PC"
+ AdditionalIncludeDirectories="..\..\Include; ..\..\PC"
PreprocessorDefinitions="_WIN32"
StringPooling="true"
ExceptionHandling="0"
@@ -34,7 +34,7 @@
/>
@@ -627,7 +627,7 @@
Name="Source Files"
>
diff --git a/PCbuild/pythoncore.vcproj b/PC/VS9.0/pythoncore.vcproj
rename from PCbuild/pythoncore.vcproj
rename to PC/VS9.0/pythoncore.vcproj
--- a/PCbuild/pythoncore.vcproj
+++ b/PC/VS9.0/pythoncore.vcproj
@@ -43,7 +43,7 @@
@@ -54,7 +54,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
@@ -129,7 +129,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
@@ -207,7 +207,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
@@ -285,7 +285,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
@@ -359,7 +359,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
@@ -434,7 +434,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
@@ -509,7 +509,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
@@ -584,7 +584,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\Include"
+ AdditionalIncludeDirectories="..\..\Include"
/>
@@ -991,310 +991,310 @@
Name="Modules"
>
@@ -1302,71 +1302,71 @@
Name="cjkcodecs"
>
@@ -1374,35 +1374,35 @@
Name="_io"
>
@@ -1411,183 +1411,183 @@
Name="Objects"
>
@@ -1595,59 +1595,59 @@
Name="Parser"
>
@@ -1655,39 +1655,39 @@
Name="PC"
>
@@ -1695,183 +1695,183 @@
Name="Python"
>
@@ -1879,7 +1879,7 @@
Name="Resource Files"
>
diff --git a/PCbuild/pythonw.vcproj b/PC/VS9.0/pythonw.vcproj
rename from PCbuild/pythonw.vcproj
rename to PC/VS9.0/pythonw.vcproj
--- a/PCbuild/pythonw.vcproj
+++ b/PC/VS9.0/pythonw.vcproj
@@ -600,7 +600,7 @@
Name="Resource Files"
>
@@ -608,7 +608,7 @@
Name="Source Files"
>
diff --git a/PCbuild/readme.txt b/PC/VS9.0/readme.txt
copy from PCbuild/readme.txt
copy to PC/VS9.0/readme.txt
diff --git a/PCbuild/release.vsprops b/PC/VS9.0/release.vsprops
rename from PCbuild/release.vsprops
rename to PC/VS9.0/release.vsprops
diff --git a/PCbuild/rmpyc.py b/PC/VS9.0/rmpyc.py
copy from PCbuild/rmpyc.py
copy to PC/VS9.0/rmpyc.py
diff --git a/PCbuild/rt.bat b/PC/VS9.0/rt.bat
copy from PCbuild/rt.bat
copy to PC/VS9.0/rt.bat
--- a/PCbuild/rt.bat
+++ b/PC/VS9.0/rt.bat
@@ -40,9 +40,9 @@
if "%1"=="-d" (set suffix=_d) & shift & goto CheckOpts
if "%1"=="-x64" (set prefix=%prefix%amd64) & (set tcltk=tcltk64) & shift & goto CheckOpts
-PATH %PATH%;%pcbuild%..\externals\%tcltk%\bin
+PATH %PATH%;%pcbuild%..\..\externals\%tcltk%\bin
set exe="%prefix%\python%suffix%"
-set cmd=%exe% %dashO% -Wd -3 -E -tt "%pcbuild%\..\Lib\test\regrtest.py" %1 %2 %3 %4 %5 %6 %7 %8 %9
+set cmd=%exe% %dashO% -Wd -3 -E -tt "%pcbuild%\..\..\Lib\test\regrtest.py" %1 %2 %3 %4 %5 %6 %7 %8 %9
if defined qmode goto Qmode
echo Deleting .pyc/.pyo files ...
diff --git a/PCbuild/select.vcproj b/PC/VS9.0/select.vcproj
rename from PCbuild/select.vcproj
rename to PC/VS9.0/select.vcproj
--- a/PCbuild/select.vcproj
+++ b/PC/VS9.0/select.vcproj
@@ -527,7 +527,7 @@
Name="Source Files"
>
diff --git a/PCbuild/sqlite3.vcproj b/PC/VS9.0/sqlite3.vcproj
rename from PCbuild/sqlite3.vcproj
rename to PC/VS9.0/sqlite3.vcproj
diff --git a/PCbuild/sqlite3.vsprops b/PC/VS9.0/sqlite3.vsprops
rename from PCbuild/sqlite3.vsprops
rename to PC/VS9.0/sqlite3.vsprops
diff --git a/PCbuild/unicodedata.vcproj b/PC/VS9.0/unicodedata.vcproj
rename from PCbuild/unicodedata.vcproj
rename to PC/VS9.0/unicodedata.vcproj
--- a/PCbuild/unicodedata.vcproj
+++ b/PC/VS9.0/unicodedata.vcproj
@@ -511,11 +511,11 @@
Name="Header Files"
>
@@ -523,7 +523,7 @@
Name="Source Files"
>
diff --git a/PCbuild/vs9to8.py b/PC/VS9.0/vs9to8.py
rename from PCbuild/vs9to8.py
rename to PC/VS9.0/vs9to8.py
diff --git a/PCbuild/w9xpopen.vcproj b/PC/VS9.0/w9xpopen.vcproj
rename from PCbuild/w9xpopen.vcproj
rename to PC/VS9.0/w9xpopen.vcproj
--- a/PCbuild/w9xpopen.vcproj
+++ b/PC/VS9.0/w9xpopen.vcproj
@@ -566,7 +566,7 @@
Name="Source Files"
>
diff --git a/PCbuild/winsound.vcproj b/PC/VS9.0/winsound.vcproj
rename from PCbuild/winsound.vcproj
rename to PC/VS9.0/winsound.vcproj
--- a/PCbuild/winsound.vcproj
+++ b/PC/VS9.0/winsound.vcproj
@@ -513,7 +513,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
diff --git a/PCbuild/x64.vsprops b/PC/VS9.0/x64.vsprops
rename from PCbuild/x64.vsprops
rename to PC/VS9.0/x64.vsprops
diff --git a/PC/bdist_wininst/bdist_wininst.vcxproj b/PC/bdist_wininst/bdist_wininst.vcxproj
new file mode 100644
--- /dev/null
+++ b/PC/bdist_wininst/bdist_wininst.vcxproj
@@ -0,0 +1,103 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}
+ wininst
+ ClCompile
+ false
+
+
+
+
+ Application
+ false
+ NotSet
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(PySourcePath)lib\distutils\command\
+ false
+ wininst-$(VisualStudioVersion)
+ $(TargetName)-amd64
+ .exe
+
+
+
+ $(OutDir)wininst.tlb
+
+
+ MinSpace
+ $(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories)
+ _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
+
+
+ $(PySourcePath)PC\bdist_wininst;%(AdditionalIncludeDirectories)
+
+
+ comctl32.lib;imagehlp.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/PC/bdist_wininst/bdist_wininst.vcxproj.filters b/PC/bdist_wininst/bdist_wininst.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PC/bdist_wininst/bdist_wininst.vcxproj.filters
@@ -0,0 +1,61 @@
+
+
+
+
+ {293b1092-03ad-4b7c-acb9-c4ab62e52f55}
+ cpp;c;cxx;rc;def;r;odl;idl;hpj;bat
+
+
+ {0edc0406-282f-4dbc-b60e-a867c34a2a31}
+
+
+ {ea0c0f0e-3b73-474e-a999-e9689d032ccc}
+ h;hpp;hxx;hm;inl
+
+
+ {0c77c1cf-3f87-4f87-bd86-b425211c2181}
+ ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files\zlib
+
+
+ Source Files\zlib
+
+
+ Source Files\zlib
+
+
+ Source Files\zlib
+
+
+ Source Files\zlib
+
+
+ Source Files\zlib
+
+
+
+
+ Header Files
+
+
+
+
+ Resource Files
+
+
+
+
+ Resource Files
+
+
+
\ No newline at end of file
diff --git a/PCbuild/_bsddb.vcxproj b/PCbuild/_bsddb.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/_bsddb.vcxproj
@@ -0,0 +1,314 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {B4D38F3F-68FB-42EC-A45D-E00657BB3627}
+ _bsddb
+ Win32Proj
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ $(bsddbDir)\build_windows;$(bsddbDir);%(AdditionalIncludeDirectories)
+ _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+
+
+ ws2_32.lib;%(AdditionalDependencies)
+ 0x1e180000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+
+
+
+
diff --git a/PCbuild/_bsddb.vcxproj.filters b/PCbuild/_bsddb.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/_bsddb.vcxproj.filters
@@ -0,0 +1,702 @@
+
+
+
+
+ {82655853-5a03-4804-a421-44510138071e}
+
+
+ {c52be92f-9033-4a0f-bf55-1b65c7e7b015}
+
+
+ {49074366-917a-4969-88c7-0f6ec09c7021}
+
+
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+ Berkeley DB 4.7.25 Source Files
+
+
+
diff --git a/PCbuild/_ctypes.vcxproj b/PCbuild/_ctypes.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/_ctypes.vcxproj
@@ -0,0 +1,107 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {0E9791DB-593A-465F-98BC-681011311618}
+ _ctypes
+ Win32Proj
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.40219.1
+
+
+
+ ..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories)
+
+
+ 0x1D1A0000
+ /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+ true
+ ml64 /nologo /c /Zi /Fo "$(IntDir)win64.obj" "%(FullPath)"
+ $(IntDir)win64.obj;%(Outputs)
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+
+
+
+
+
+
diff --git a/PCbuild/_ctypes.vcxproj.filters b/PCbuild/_ctypes.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/_ctypes.vcxproj.filters
@@ -0,0 +1,65 @@
+
+
+
+
+ {806081ee-2af0-48d0-a83e-ee02a74baa0f}
+
+
+ {dbdea1f2-ad8b-44ca-b782-fcf65d91559b}
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/_ctypes_test.vcxproj b/PCbuild/_ctypes_test.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/_ctypes_test.vcxproj
@@ -0,0 +1,77 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {9EC7190A-249F-4180-A900-548FDCF3055F}
+ _ctypes_test
+ Win32Proj
+ false
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+
+
+
+
+
+
diff --git a/PCbuild/_ctypes_test.vcxproj.filters b/PCbuild/_ctypes_test.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/_ctypes_test.vcxproj.filters
@@ -0,0 +1,21 @@
+
+
+
+
+ {8fd70119-5481-4e5d-b187-d0b14eb27e38}
+
+
+ {38abc486-e143-49dc-8cf0-8aefab0e0d3d}
+
+
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/_elementtree.vcxproj
@@ -0,0 +1,103 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {17E1E049-C309-4D79-843F-AE483C264AEA}
+ _elementtree
+ Win32Proj
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ ..\Modules\expat;%(AdditionalIncludeDirectories)
+ XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)
+
+
+ 0x1D100000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+
+
+
+
diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/_elementtree.vcxproj.filters
@@ -0,0 +1,72 @@
+
+
+
+
+ {643d8607-d024-40fe-8583-1823c96430f0}
+
+
+ {7b5335ad-059f-486f-85e4-f4757e26a9bf}
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/_hashlib.vcxproj b/PCbuild/_hashlib.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/_hashlib.vcxproj
@@ -0,0 +1,90 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {447F05A8-F581-4CAC-A466-5AC7936E207E}
+ _hashlib
+ Win32Proj
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ $(opensslDir)include;%(AdditionalIncludeDirectories)
+
+
+ ws2_32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+ {10615b24-73bf-4efa-93aa-236916321317}
+ false
+
+
+ {e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0}
+ false
+
+
+
+
+
+
diff --git a/PCbuild/_hashlib.vcxproj.filters b/PCbuild/_hashlib.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/_hashlib.vcxproj.filters
@@ -0,0 +1,13 @@
+
+
+
+
+ {cc45963d-bd25-4eb8-bdba-a5507090bca4}
+
+
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/_msi.vcxproj b/PCbuild/_msi.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/_msi.vcxproj
@@ -0,0 +1,80 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {31FFC478-7B4A-43E8-9954-8D03E2187E9C}
+ _msi
+ Win32Proj
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)
+ 0x1D160000
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+
+
+
+
diff --git a/PCbuild/_msi.vcxproj.filters b/PCbuild/_msi.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/_msi.vcxproj.filters
@@ -0,0 +1,13 @@
+
+
+
+
+ {bdef7710-e433-4ac0-84e0-14f34454bd3e}
+
+
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/_multiprocessing.vcxproj b/PCbuild/_multiprocessing.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/_multiprocessing.vcxproj
@@ -0,0 +1,88 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {9E48B300-37D1-11DD-8C41-005056C00008}
+ _multiprocessing
+ Win32Proj
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ ws2_32.lib;%(AdditionalDependencies)
+ 0x1e1D0000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+
+
+
+
diff --git a/PCbuild/_multiprocessing.vcxproj.filters b/PCbuild/_multiprocessing.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/_multiprocessing.vcxproj.filters
@@ -0,0 +1,36 @@
+
+
+
+
+ {623c956c-1893-43d9-a7dc-96e4fef20f93}
+
+
+ {34615a62-f999-4659-83f5-19d17a644530}
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/_socket.vcxproj b/PCbuild/_socket.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/_socket.vcxproj
@@ -0,0 +1,83 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {86937F53-C189-40EF-8CE8-8759D8E7D480}
+ _socket
+ Win32Proj
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ ws2_32.lib;%(AdditionalDependencies)
+ 0x1e1D0000
+
+
+
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+
+
+
+
diff --git a/PCbuild/_socket.vcxproj.filters b/PCbuild/_socket.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/_socket.vcxproj.filters
@@ -0,0 +1,21 @@
+
+
+
+
+ {1452207f-707c-4e84-b532-307193a0fd85}
+
+
+ {1edfe0d0-7b9d-4dc8-a335-b21fef7cc77a}
+
+
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/_sqlite3.vcxproj
@@ -0,0 +1,107 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {13CECB97-4119-4316-9D42-8534019A5A44}
+ _sqlite3
+ Win32Proj
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ $(sqlite3Dir);%(AdditionalIncludeDirectories)
+ MODULE_NAME="sqlite3";%(PreprocessorDefinitions)
+
+
+ 0x1e180000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+ {a1a295e5-463c-437f-81ca-1f32367685da}
+ false
+
+
+
+
+
+
diff --git a/PCbuild/_sqlite3.vcxproj.filters b/PCbuild/_sqlite3.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/_sqlite3.vcxproj.filters
@@ -0,0 +1,72 @@
+
+
+
+
+ {dac8ab3b-ce16-4bef-bef9-76463a01f5c4}
+
+
+ {814b187d-44ad-4f2b-baa7-18ca8a8a6a77}
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/_ssl.vcxproj
@@ -0,0 +1,94 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {C6E20F84-3247-4AD6-B051-B073268F73BA}
+ _ssl
+ Win32Proj
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ $(opensslDir)include;%(AdditionalIncludeDirectories)
+
+
+ ws2_32.lib;crypt32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+ {e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0}
+ false
+
+
+ {10615b24-73bf-4efa-93aa-236916321317}
+ false
+
+
+ {86937f53-c189-40ef-8ce8-8759d8e7d480}
+ false
+
+
+
+
+
+
diff --git a/PCbuild/_ssl.vcxproj.filters b/PCbuild/_ssl.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/_ssl.vcxproj.filters
@@ -0,0 +1,13 @@
+
+
+
+
+ {695348f7-e9f6-4fe1-bc03-5f08ffc8095b}
+
+
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/_testcapi.vcxproj
@@ -0,0 +1,80 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {6901D91C-6E48-4BB7-9FEC-700C8131DF1D}
+ _testcapi
+ Win32Proj
+ false
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ 0x1e1F0000
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+
+
+
+
diff --git a/PCbuild/_testcapi.vcxproj.filters b/PCbuild/_testcapi.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/_testcapi.vcxproj.filters
@@ -0,0 +1,13 @@
+
+
+
+
+ {a76a90d8-8e8b-4c36-8f58-8bd46abe9f5e}
+
+
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/_tkinter.vcxproj
@@ -0,0 +1,90 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {4946ECAC-2E69-4BF8-A90A-F5136F5094DF}
+ _tkinter
+ Win32Proj
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ $(tcltkDir)include;%(AdditionalIncludeDirectories)
+ WITH_APPINIT;%(PreprocessorDefinitions)
+
+
+ $(tcltkLib);%(AdditionalDependencies)
+
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+ {b5fd6f1d-129e-4bff-9340-03606fac7283}
+
+
+ {7e85eccf-a72c-4da4-9e52-884508e80ba1}
+
+
+
+
+
+
diff --git a/PCbuild/_tkinter.vcxproj.filters b/PCbuild/_tkinter.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/_tkinter.vcxproj.filters
@@ -0,0 +1,16 @@
+
+
+
+
+ {b9ce64dd-cb95-472d-bbe8-5583b2cd375b}
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/build.bat b/PCbuild/build.bat
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -6,102 +6,47 @@
rem -c Set the configuration (default: Release)
rem -p Set the platform (x64 or Win32, default: Win32)
rem -r Target Rebuild instead of Build
-rem -t Set the target manually (Build, Rebuild, or Clean)
+rem -t Set the target manually (Build, Rebuild, Clean, or CleanAll)
rem -d Set the configuration to Debug
rem -e Pull in external libraries using get_externals.bat
-rem -k Attempt to kill any running Pythons before building
+rem -m Enable parallel build
+rem -M Disable parallel build (disabled by default)
+rem -v Increased output messages
+rem -k Attempt to kill any running Pythons before building (usually unnecessary)
setlocal
set platf=Win32
set vs_platf=x86
set conf=Release
-set target=
+set target=Build
set dir=%~dp0
+set parallel=
+set verbose=/nologo /v:m
set kill=
-set build_tkinter=
: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 target=/rebuild) & shift & goto CheckOpts
-if '%1'=='-t' (
- if '%2'=='Clean' (set target=/clean) & shift & shift & goto CheckOpts
- if '%2'=='Rebuild' (set target=/rebuild) & shift & shift & goto CheckOpts
- if '%2'=='Build' (set target=) & shift & shift & goto CheckOpts
- echo.Unknown target: %2 & goto :eof
-)
+if '%1'=='-r' (set target=Rebuild) & shift & goto CheckOpts
+if '%1'=='-t' (set target=%2) & shift & shift & goto CheckOpts
if '%1'=='-d' (set conf=Debug) & shift & goto CheckOpts
-if '%1'=='-e' call "%dir%get_externals.bat" & (set build_tkinter=true) & shift & goto CheckOpts
+if '%1'=='-e' call "%dir%get_externals.bat" & shift & goto CheckOpts
+if '%1'=='-m' (set parallel=/m) & shift & goto CheckOpts
+if '%1'=='-M' (set parallel=) & shift & goto CheckOpts
+if '%1'=='-v' (set verbose=/v:n) & shift & goto CheckOpts
if '%1'=='-k' (set kill=true) & shift & goto CheckOpts
-if '%conf%'=='Debug' (set dbg_ext=_d) else (set dbg_ext=)
-if '%platf%'=='x64' (
- set vs_platf=x86_amd64
- set builddir=%dir%amd64\
-) else (
- set builddir=%dir%
-)
-rem Can't use builddir until we're in a new command...
-if '%platf%'=='x64' (
- rem Needed for buliding OpenSSL
- set HOST_PYTHON=%builddir%python%dbg_ext%.exe
+if '%platf%'=='x64' (set vs_platf=x86_amd64)
+
+rem Setup the environment
+call "%dir%env.bat" %vs_platf% >nul
+
+if '%kill%'=='true' (
+ msbuild /v:m /nologo /target:KillPython "%dir%\pythoncore.vcxproj" /p:Configuration=%conf% /p:Platform=%platf% /p:KillPython=true
)
-rem Setup the environment
-call "%dir%env.bat" %vs_platf%
-
-if '%kill%'=='true' (
- vcbuild "%dir%kill_python.vcproj" "%conf%|%platf%" && "%builddir%kill_python%dbg_ext%.exe"
-)
-
-set externals_dir=%dir%..\externals
-if '%build_tkinter%'=='true' (
- if '%platf%'=='x64' (
- set tcltkdir=%externals_dir%\tcltk64
- set machine=AMD64
- ) else (
- set tcltkdir=%externals_dir%\tcltk
- set machine=IX86
- )
- if '%conf%'=='Debug' (
- set tcl_dbg_ext=g
- set debug_flag=1
- ) else (
- set tcl_dbg_ext=
- set debug_flag=0
- )
- set tcldir=%externals_dir%\tcl-8.5.15.0
- set tkdir=%externals_dir%\tk-8.5.15.0
- set tixdir=%externals_dir%\tix-8.4.3.5
-)
-if '%build_tkinter%'=='true' (
- if not exist "%tcltkdir%\bin\tcl85%tcl_dbg_ext%.dll" (
- @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install
- pushd "%tcldir%\win"
- nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" clean all
- nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" install
- popd
- )
-
- if not exist "%tcltkdir%\bin\tk85%tcl_dbg_ext%.dll" (
- pushd "%tkdir%\win"
- nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" TCLDIR="%tcldir%" clean
- nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" TCLDIR="%tcldir%" all
- nmake -f makefile.vc MACHINE=%machine% DEBUG=%debug_flag% INSTALLDIR="%tcltkdir%" TCLDIR="%tcldir%" install
- popd
- )
-
- if not exist "%tcltkdir%\lib\tix8.4.3\tix84%tcl_dbg_ext%.dll" (
- pushd "%tixdir%\win"
- nmake -f python.mak DEBUG=%debug_flag% MACHINE=%machine% TCL_DIR="%tcldir%" TK_DIR="%tkdir%" INSTALL_DIR="%tcltkdir%" clean
- nmake -f python.mak DEBUG=%debug_flag% MACHINE=%machine% TCL_DIR="%tcldir%" TK_DIR="%tkdir%" INSTALL_DIR="%tcltkdir%" all
- nmake -f python.mak DEBUG=%debug_flag% MACHINE=%machine% TCL_DIR="%tcldir%" TK_DIR="%tkdir%" INSTALL_DIR="%tcltkdir%" install
- popd
- )
-)
-
-rem Call on VCBuild to do the work, echo the command.
+rem Call on MSBuild to do the work, echo the command.
rem Passing %1-9 is not the preferred option, but argument parsing in
rem batch is, shall we say, "lackluster"
echo on
-vcbuild "%dir%pcbuild.sln" %target% "%conf%|%platf%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose% /p:Configuration=%conf% /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/PCbuild/build_pgo.bat b/PCbuild/build_pgo.bat
--- a/PCbuild/build_pgo.bat
+++ b/PCbuild/build_pgo.bat
@@ -7,14 +7,16 @@
setlocal
set platf=Win32
+set parallel=/m
+set dir=%~dp0
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
+set job1="%dir%..\tools\pybench\pybench.py" -n 1 -C 1 --with-gc
+set path1="%dir%..\tools\pybench"
rem or the whole testsuite for more thorough testing
-set job2=..\lib\test\regrtest.py
-set path2=..\lib
+set job2="%dir%..\lib\test\regrtest.py"
+set path2="%dir%..\lib"
set job=%job1%
set clrpath=%path1%
@@ -22,20 +24,25 @@
: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"=="-M" (set parallel=) & shift & goto CheckOpts
-set PGI=%platf%-pgi
-set PGO=%platf%-pgo
-@echo on
+rem We cannot cross compile PGO builds, as the optimization needs to be run natively
+set vs_platf=x86
+set PGO=%dir%win32-pgo
+
+if "%platf%"=="x64" (set vs_platf=amd64) & (set PGO=%dir%amd64-pgo)
+rem Setup the environment
+call "%dir%env.bat" %vs_platf%
+
+
rem build the instrumented version
-call build -p %platf% -c PGInstrument
+msbuild "%dir%pcbuild.proj" %parallel% /t:Build /p:Configuration=PGInstrument /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9
rem remove .pyc files, .pgc files and execute the job
-%PGI%\python.exe rmpyc.py %clrpath%
-del %PGI%\*.pgc
-%PGI%\python.exe %job%
+"%PGO%\python.exe" "%dir%rmpyc.py" %clrpath%
+del "%PGO%\*.pgc"
+"%PGO%\python.exe" %job%
-rem finally build the optimized version
-if exist %PGO% del /s /q %PGO%
-call build -p %platf% -c PGUpdate
-
+rem build optimized version
+msbuild "%dir%pcbuild.proj" %parallel% /t:Build /p:Configuration=PGUpdate /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/PCbuild/bz2.vcxproj b/PCbuild/bz2.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/bz2.vcxproj
@@ -0,0 +1,96 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {73FCD2BD-F133-46B7-8EC1-144CD82A59D5}
+ bz2
+ Win32Proj
+ bz2
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ $(bz2Dir);%(AdditionalIncludeDirectories)
+ WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)
+
+
+ 0x1D170000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+
+
+
+
diff --git a/PCbuild/bz2.vcxproj.filters b/PCbuild/bz2.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/bz2.vcxproj.filters
@@ -0,0 +1,48 @@
+
+
+
+
+ {f53a859d-dad2-4d5b-ae41-f28d8b571f5a}
+
+
+ {7e0bed05-ae33-43b7-8797-656455bbb7f3}
+
+
+ {ed574b89-6983-4cdf-9f98-fe7048d9e89c}
+
+
+
+
+ Source Files
+
+
+ bzip2 1.0.6 Source Files
+
+
+ bzip2 1.0.6 Source Files
+
+
+ bzip2 1.0.6 Source Files
+
+
+ bzip2 1.0.6 Source Files
+
+
+ bzip2 1.0.6 Source Files
+
+
+ bzip2 1.0.6 Source Files
+
+
+ bzip2 1.0.6 Source Files
+
+
+
+
+ bzip2 1.0.6 Header Files
+
+
+ bzip2 1.0.6 Header Files
+
+
+
diff --git a/PCbuild/clean.bat b/PCbuild/clean.bat
new file mode 100644
--- /dev/null
+++ b/PCbuild/clean.bat
@@ -0,0 +1,5 @@
+@echo off
+rem A batch program to clean a particular configuration,
+rem just for convenience.
+
+call %~dp0build.bat -t Clean %*
diff --git a/PCbuild/env.bat b/PCbuild/env.bat
--- a/PCbuild/env.bat
+++ b/PCbuild/env.bat
@@ -1,4 +1,17 @@
@echo off
-echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64
+rem This script adds the latest available tools to the path for the current
+rem command window. However, all builds of Python should ignore the version
+rem of the tools on PATH and use PlatformToolset instead, which should
+rem always be 'v90'.
+rem
+rem To build Python with a newer toolset, pass "/p:PlatformToolset=v100" (or
+rem 'v110', 'v120' or 'v140') to the build script. Note that no toolset
+rem other than 'v90' is supported!
+
+echo Build environments: x86, amd64, x86_amd64
echo.
-call "%VS90COMNTOOLS%..\..\VC\vcvarsall.bat" %*
+set VSTOOLS=%VS140COMNTOOLS%
+if "%VSTOOLS%"=="" set VSTOOLS=%VS120COMNTOOLS%
+if "%VSTOOLS%"=="" set VSTOOLS=%VS110COMNTOOLS%
+if "%VSTOOLS%"=="" set VSTOOLS=%VS100COMNTOOLS%
+call "%VSTOOLS%..\..\VC\vcvarsall.bat" %*
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -51,6 +51,9 @@
echo.Fetching external libraries...
+rem When updating these versions, remember to update the relevant property
+rem files in both this dir and PC\VS9.0
+
for %%e in (
bzip2-1.0.6
db-4.7.25.0
diff --git a/PCbuild/libeay.vcxproj b/PCbuild/libeay.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/libeay.vcxproj
@@ -0,0 +1,907 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}
+ libeay
+
+
+
+
+
+
+ StaticLibrary
+
+
+
+
+
+
+
+ <_DATEValue>#define DATE "$([System.DateTime]::Now.ToString(`ddd MMM dd HH':'mm':'ss yyyy`))"
+ <_CFLAGSValue>#define CFLAGS "cl /MD /Ox -W3 -Gs0 -Gy -nologo @(PreprocessorDefinitions->'-D%(Identity)',' ')"
+ <_PLATFORMValue Condition="$(Platform)=='Win32'">#define PLATFORM "VC-WIN32"
+ <_PLATFORMValue Condition="$(Platform)=='x64'">#define PLATFORM "VC-WIN64A"
+
+
+
+
+
+
+
+
+
+
+
+ $(IntDir);%(AdditionalIncludeDirectories)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
new file mode 100644
--- /dev/null
+++ b/PCbuild/openssl.props
@@ -0,0 +1,75 @@
+
+
+
+
+
+ StaticLibrary
+ $(opensslDir)tmp\$(ArchName)_$(Configuration)\$(ProjectName)\
+ $(opensslDir)tmp\$(ArchName)\$(ProjectName)\
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_PreprocessorDefinitionList>@(PreprocessorDefinitions)
+
+
+
+
+
+ 4244;4267
+ $(opensslDir);$(opensslDir)include;$(opensslDir)crypto;$(opensslDir)crypto\asn1;$(opensslDir)crypto\evp;$(opensslDir)crypto\modes
+ $(_PreprocessorDefinitionList);%(PreprocessorDefinitions)
+
+
+
+
+
+ nasm.exe -f win32
+ nasm.exe -f win64 -DNEAR -Ox -g
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj
new file mode 100644
--- /dev/null
+++ b/PCbuild/pcbuild.proj
@@ -0,0 +1,77 @@
+
+
+
+ {CC9B93A2-439D-4058-9D29-6DCF43774405}
+ Win32
+ Release
+ true
+ true
+ true
+
+
+
+
+ $(Platform)
+ $(Configuration)
+
+ Build
+ Clean
+ CleanAll
+ true
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
--- a/PCbuild/pcbuild.sln
+++ b/PCbuild/pcbuild.sln
@@ -1,136 +1,65 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} = {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo.vcproj", "{F0E0541E-F17D-430B-97C4-93ADF0DD284E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
- ProjectSection(ProjectDependencies) = postProject
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E} = {F0E0541E-F17D-430B-97C4-93ADF0DD284E}
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
- {C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"
- ProjectSection(ProjectDependencies) = postProject
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}"
-EndProject
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}"
ProjectSection(SolutionItems) = preProject
..\Modules\getbuildinfo.c = ..\Modules\getbuildinfo.c
- readme.txt = readme.txt
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcproj", "{28B5D777-DDF2-4B6B-B34F-31D938813856}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python.vcxproj", "{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
- ProjectSection(ProjectDependencies) = postProject
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcxproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test.vcproj", "{9EC7190A-249F-4180-A900-548FDCF3055F}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcxproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree.vcproj", "{17E1E049-C309-4D79-843F-AE483C264AEA}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcxproj", "{28B5D777-DDF2-4B6B-B34F-31D938813856}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_msi", "_msi.vcproj", "{31FFC478-7B4A-43E8-9954-8D03E2187E9C}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcxproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcproj", "{86937F53-C189-40EF-8CE8-8759D8E7D480}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcxproj", "{0E9791DB-593A-465F-98BC-681011311618}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test.vcxproj", "{9EC7190A-249F-4180-A900-548FDCF3055F}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"
- ProjectSection(ProjectDependencies) = postProject
- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
- {86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480}
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree.vcxproj", "{17E1E049-C309-4D79-843F-AE483C264AEA}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_msi", "_msi.vcxproj", "{31FFC478-7B4A-43E8-9954-8D03E2187E9C}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcxproj", "{86937F53-C189-40EF-8CE8-8759D8E7D480}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcxproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcxproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata.vcproj", "{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcxproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcproj", "{D06B6426-4762-44CC-8BAD-D79052507F2F}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcxproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcxproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
- ProjectSection(ProjectDependencies) = postProject
- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcxproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
- ProjectSection(ProjectDependencies) = postProject
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata.vcxproj", "{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj", "{D06B6426-4762-44CC-8BAD-D79052507F2F}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kill_python", "kill_python.vcproj", "{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "..\PC\bdist_wininst\bdist_wininst.vcxproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcxproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcxproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcl", "tcl.vcxproj", "{B5FD6F1D-129E-4BFF-9340-03606FAC7283}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tix", "tix.vcxproj", "{C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tk", "tk.vcxproj", "{7E85ECCF-A72C-4DA4-9E52-884508E80BA1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libeay", "libeay.vcxproj", "{E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssleay", "ssleay.vcxproj", "{10615B24-73BF-4EFA-93AA-236916321317}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -160,22 +89,6 @@
{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|Win32.Build.0 = Release|Win32
{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.ActiveCfg = Release|x64
{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg = Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.Build.0 = Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg = Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.Build.0 = Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|Win32
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64
@@ -196,14 +109,14 @@
{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|Win32.Build.0 = Debug|Win32
{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.ActiveCfg = Debug|x64
{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Debug|x64.Build.0 = Debug|x64
- {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
- {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
- {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
- {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|x64.Build.0 = PGInstrument|x64
- {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
- {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
- {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
- {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|x64.Build.0 = PGUpdate|x64
+ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|Win32.ActiveCfg = Release|Win32
+ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|Win32.Build.0 = Release|Win32
+ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|x64.ActiveCfg = Release|x64
+ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGInstrument|x64.Build.0 = Release|x64
+ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|Win32.ActiveCfg = Release|Win32
+ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|Win32.Build.0 = Release|Win32
+ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|x64.ActiveCfg = Release|x64
+ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}.PGUpdate|x64.Build.0 = Release|x64
{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.ActiveCfg = Release|Win32
{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|Win32.Build.0 = Release|Win32
{F4229CC3-873C-49AE-9729-DD308ED4CD4A}.Release|x64.ActiveCfg = Release|x64
@@ -292,14 +205,14 @@
{9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|Win32.Build.0 = Debug|Win32
{9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|x64.ActiveCfg = Debug|x64
{9EC7190A-249F-4180-A900-548FDCF3055F}.Debug|x64.Build.0 = Debug|x64
- {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
- {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
- {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
- {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|x64.Build.0 = PGInstrument|x64
- {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
- {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
- {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
- {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|x64.Build.0 = PGUpdate|x64
+ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|Win32.ActiveCfg = Release|Win32
+ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|Win32.Build.0 = Release|Win32
+ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|x64.ActiveCfg = Release|x64
+ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGInstrument|x64.Build.0 = Release|x64
+ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|Win32.ActiveCfg = Release|Win32
+ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|Win32.Build.0 = Release|Win32
+ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|x64.ActiveCfg = Release|x64
+ {9EC7190A-249F-4180-A900-548FDCF3055F}.PGUpdate|x64.Build.0 = Release|x64
{9EC7190A-249F-4180-A900-548FDCF3055F}.Release|Win32.ActiveCfg = Release|Win32
{9EC7190A-249F-4180-A900-548FDCF3055F}.Release|Win32.Build.0 = Release|Win32
{9EC7190A-249F-4180-A900-548FDCF3055F}.Release|x64.ActiveCfg = Release|x64
@@ -536,22 +449,86 @@
{9E48B300-37D1-11DD-8C41-005056C00008}.Release|Win32.Build.0 = Release|Win32
{9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.ActiveCfg = Release|x64
{9E48B300-37D1-11DD-8C41-005056C00008}.Release|x64.Build.0 = Release|x64
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.ActiveCfg = Debug|Win32
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|Win32.Build.0 = Debug|Win32
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|x64.ActiveCfg = Debug|x64
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Debug|x64.Build.0 = Debug|x64
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|Win32.ActiveCfg = Release|Win32
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|Win32.Build.0 = Release|Win32
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|x64.ActiveCfg = Release|x64
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGInstrument|x64.Build.0 = Release|x64
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|Win32.ActiveCfg = Release|Win32
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|Win32.Build.0 = Release|Win32
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|x64.ActiveCfg = Release|x64
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.PGUpdate|x64.Build.0 = Release|x64
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|Win32.ActiveCfg = Release|Win32
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|Win32.Build.0 = Release|Win32
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|x64.ActiveCfg = Release|x64
- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}.Release|x64.Build.0 = Release|x64
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.Debug|Win32.Build.0 = Debug|Win32
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.Debug|x64.ActiveCfg = Debug|x64
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.Debug|x64.Build.0 = Debug|x64
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.PGInstrument|Win32.ActiveCfg = Release|Win32
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.PGInstrument|Win32.Build.0 = Release|Win32
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.PGInstrument|x64.ActiveCfg = Release|x64
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.PGInstrument|x64.Build.0 = Release|x64
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.PGUpdate|Win32.ActiveCfg = Release|Win32
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.PGUpdate|Win32.Build.0 = Release|Win32
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.PGUpdate|x64.ActiveCfg = Release|x64
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.PGUpdate|x64.Build.0 = Release|x64
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.Release|Win32.ActiveCfg = Release|Win32
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.Release|Win32.Build.0 = Release|Win32
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.Release|x64.ActiveCfg = Release|x64
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}.Release|x64.Build.0 = Release|x64
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.Debug|Win32.Build.0 = Debug|Win32
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.Debug|x64.ActiveCfg = Debug|x64
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.Debug|x64.Build.0 = Debug|x64
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.PGInstrument|Win32.ActiveCfg = Release|Win32
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.PGInstrument|Win32.Build.0 = Release|Win32
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.PGInstrument|x64.ActiveCfg = Release|x64
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.PGInstrument|x64.Build.0 = Release|x64
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.PGUpdate|Win32.ActiveCfg = Release|Win32
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.PGUpdate|Win32.Build.0 = Release|Win32
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.PGUpdate|x64.ActiveCfg = Release|x64
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.PGUpdate|x64.Build.0 = Release|x64
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.Release|Win32.ActiveCfg = Release|Win32
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.Release|Win32.Build.0 = Release|Win32
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.Release|x64.ActiveCfg = Release|x64
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}.Release|x64.Build.0 = Release|x64
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.Debug|Win32.Build.0 = Debug|Win32
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.Debug|x64.ActiveCfg = Debug|x64
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.Debug|x64.Build.0 = Debug|x64
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.PGInstrument|Win32.ActiveCfg = Release|Win32
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.PGInstrument|Win32.Build.0 = Release|Win32
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.PGInstrument|x64.ActiveCfg = Release|x64
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.PGInstrument|x64.Build.0 = Release|x64
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.PGUpdate|Win32.ActiveCfg = Release|Win32
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.PGUpdate|Win32.Build.0 = Release|Win32
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.PGUpdate|x64.ActiveCfg = Release|x64
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.PGUpdate|x64.Build.0 = Release|x64
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.Release|Win32.ActiveCfg = Release|Win32
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.Release|Win32.Build.0 = Release|Win32
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.Release|x64.ActiveCfg = Release|x64
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}.Release|x64.Build.0 = Release|x64
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.Debug|Win32.Build.0 = Debug|Win32
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.Debug|x64.ActiveCfg = Debug|x64
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.Debug|x64.Build.0 = Debug|x64
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.PGInstrument|Win32.ActiveCfg = Release|Win32
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.PGInstrument|Win32.Build.0 = Release|Win32
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.PGInstrument|x64.ActiveCfg = Release|x64
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.PGInstrument|x64.Build.0 = Release|x64
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.PGUpdate|Win32.ActiveCfg = Release|Win32
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.PGUpdate|Win32.Build.0 = Release|Win32
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.PGUpdate|x64.ActiveCfg = Release|x64
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.PGUpdate|x64.Build.0 = Release|x64
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.Release|Win32.ActiveCfg = Release|Win32
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.Release|Win32.Build.0 = Release|Win32
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.Release|x64.ActiveCfg = Release|x64
+ {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}.Release|x64.Build.0 = Release|x64
+ {10615B24-73BF-4EFA-93AA-236916321317}.Debug|Win32.ActiveCfg = Debug|Win32
+ {10615B24-73BF-4EFA-93AA-236916321317}.Debug|Win32.Build.0 = Debug|Win32
+ {10615B24-73BF-4EFA-93AA-236916321317}.Debug|x64.ActiveCfg = Debug|x64
+ {10615B24-73BF-4EFA-93AA-236916321317}.Debug|x64.Build.0 = Debug|x64
+ {10615B24-73BF-4EFA-93AA-236916321317}.PGInstrument|Win32.ActiveCfg = Release|Win32
+ {10615B24-73BF-4EFA-93AA-236916321317}.PGInstrument|Win32.Build.0 = Release|Win32
+ {10615B24-73BF-4EFA-93AA-236916321317}.PGInstrument|x64.ActiveCfg = Release|x64
+ {10615B24-73BF-4EFA-93AA-236916321317}.PGInstrument|x64.Build.0 = Release|x64
+ {10615B24-73BF-4EFA-93AA-236916321317}.PGUpdate|Win32.ActiveCfg = Release|Win32
+ {10615B24-73BF-4EFA-93AA-236916321317}.PGUpdate|Win32.Build.0 = Release|Win32
+ {10615B24-73BF-4EFA-93AA-236916321317}.PGUpdate|x64.ActiveCfg = Release|x64
+ {10615B24-73BF-4EFA-93AA-236916321317}.PGUpdate|x64.Build.0 = Release|x64
+ {10615B24-73BF-4EFA-93AA-236916321317}.Release|Win32.ActiveCfg = Release|Win32
+ {10615B24-73BF-4EFA-93AA-236916321317}.Release|Win32.Build.0 = Release|Win32
+ {10615B24-73BF-4EFA-93AA-236916321317}.Release|x64.ActiveCfg = Release|x64
+ {10615B24-73BF-4EFA-93AA-236916321317}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/pyexpat.vcxproj
@@ -0,0 +1,84 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ {D06B6426-4762-44CC-8BAD-D79052507F2F}
+ pyexpat
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+
+ $(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories)
+ PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+
+
+
+
diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/pyexpat.vcxproj.filters
@@ -0,0 +1,33 @@
+
+
+
+
+ {ddae77a6-7ca0-4a1b-b71c-deea5f4025de}
+
+
+ {5af9d40c-fc46-4640-ad84-3d1dd34a71d7}
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
new file mode 100644
--- /dev/null
+++ b/PCbuild/pyproject.props
@@ -0,0 +1,159 @@
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ 10.0
+ $(BuildPath)
+ $(SolutionDir)obj\$(ArchName)_$(Configuration)\$(ProjectName)\
+ $(SolutionDir)obj\$(ArchName)\$(ProjectName)\
+ $(ProjectName)
+ $(TargetName)$(PyDebugExt)
+ false
+ false
+
+ true
+ true
+ true
+ true
+ false
+ false
+
+
+
+ <_DebugPreprocessorDefinition>NDEBUG;
+ <_DebugPreprocessorDefinition Condition="$(Configuration) == 'Debug'">_DEBUG;
+ <_PlatformPreprocessorDefinition>_WIN32;
+ <_PlatformPreprocessorDefinition Condition="$(Platform) == 'x64'">_WIN64;_M_X64;
+ <_PydPreprocessorDefinition Condition="$(TargetExt) == '.pyd'">Py_BUILD_CORE_MODULE;
+
+
+
+ $(PySourcePath)Include;$(PySourcePath)PC;%(AdditionalIncludeDirectories)
+ WIN32;$(_PlatformPreprocessorDefinition)$(_DebugPreprocessorDefinition)$(_PydPreprocessorDefinition)%(PreprocessorDefinitions)
+
+ MaxSpeed
+ true
+ true
+
+ MultiThreadedDLL
+ true
+ Level3
+ ProgramDatabase
+ Default
+ true
+ true
+
+
+ Disabled
+ false
+ MultiThreadedDebugDLL
+
+
+ $(OutDir);%(AdditionalLibraryDirectories)
+ true
+ $(OutDir)$(TargetName).pdb
+ Windows
+ true
+ true
+ true
+ LIBC;%(IgnoreSpecificDefaultLibraries)
+ MachineX86
+ MachineX64
+ $(OutDir)$(TargetName).pgd
+ UseLinkTimeCodeGeneration
+ PGInstrument
+ PGUpdate
+
+
+ true
+ true
+ true
+
+
+ $(PySourcePath)PC;$(PySourcePath)Include;%(AdditionalIncludeDirectories)
+ $(_DebugPreprocessorDefinition)%(PreprocessorDefinitions)
+ 0x0409
+
+
+ $(_DebugPreprocessorDefinition)%(PreprocessorDefinitions)
+ true
+ true
+ Win32
+ X64
+ $(OutDir)wininst.tlb
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot81)\bin\x86\signtool.exe
+ $(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot)\bin\x86\signtool.exe
+ $(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A@InstallationFolder)\Bin\signtool.exe
+ <_SignCommand Condition="Exists($(SignToolPath))">"$(SignToolPath)" sign /q /n "$(SigningCertificate)" /t http://timestamp.verisign.com/scripts/timestamp.dll /d "Python $(PythonVersion)"
+
+
+
+
+
+
+
diff --git a/PCbuild/python.props b/PCbuild/python.props
new file mode 100644
--- /dev/null
+++ b/PCbuild/python.props
@@ -0,0 +1,112 @@
+
+
+
+ Win32
+ Release
+
+ v90
+
+
+ amd64
+ win32
+ $(ArchName)-pgo
+
+
+ $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\))
+ $(PySourcePath)\
+
+
+ $(PySourcePath)PCBuild\
+ $(BuildPath)\$(ArchName)\
+ $(BuildPath)\
+
+
+ $([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`))
+ $(ExternalsDir)sqlite-3.6.21\
+ $(ExternalsDir)bzip2-1.0.6\
+ $(ExternalsDir)db-4.7.25.0
+ $(ExternalsDir)openssl-1.0.2a\
+ $(ExternalsDir)\nasm-2.11.06\
+
+
+ _d
+
+
+ $(BuildPath)python$(PyDebugExt).exe
+
+
+ <_PatchLevelContent>$([System.IO.File]::ReadAllText(`$(PySourcePath)Include\patchlevel.h`))
+ $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_MAJOR_VERSION\s+(\d+)`).Groups[1].Value)
+ $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_MINOR_VERSION\s+(\d+)`).Groups[1].Value)
+ $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_MICRO_VERSION\s+(\d+)`).Groups[1].Value)
+ <_ReleaseLevel>$([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_RELEASE_LEVEL\s+PY_RELEASE_LEVEL_(\w+)`).Groups[1].Value)
+ $([System.Text.RegularExpressions.Regex]::Match($(_PatchLevelContent), `define\s+PY_RELEASE_SERIAL\s+(\d+)`).Groups[1].Value)
+ 15
+ 10
+ 11
+ 12
+ a$(ReleaseSerial)
+ b$(ReleaseSerial)
+ rc$(ReleaseSerial)
+
+ $(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)
+ $(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)$(ReleaseLevelName)
+ $([msbuild]::BitwiseOr(
+ $([msbuild]::Multiply($(MajorVersionNumber), 16777216)),
+ $([msbuild]::BitwiseOr(
+ $([msbuild]::Multiply($(MinorVersionNumber), 65536)),
+ $([msbuild]::BitwiseOr(
+ $([msbuild]::Multiply($(MicroVersionNumber), 256)),
+ $([msbuild]::BitwiseOr(
+ $([msbuild]::Multiply($(ReleaseLevelNumber), 16)),
+ $(ReleaseSerial)
+ ))
+ ))
+ ))
+ ))
+ $([msbuild]::Add(
+ $(ReleaseSerial),
+ $([msbuild]::Add(
+ $([msbuild]::Multiply($(ReleaseLevelNumber), 10)),
+ $([msbuild]::Multiply($(MicroVersionNumber), 1000))
+ ))
+ ))
+
+
+ python$(MajorVersionNumber)$(MinorVersionNumber)$(PyDebugExt)
+
+
+ .cp$(MajorVersionNumber)$(MinorVersionNumber)-win32
+ .cp$(MajorVersionNumber)$(MinorVersionNumber)-win_amd64
+
+
+ $(MajorVersionNumber).$(MinorVersionNumber)
+ $(SysWinVer)-32
+
+
+
+
+
+
+
+
+
+
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/python.vcxproj
@@ -0,0 +1,106 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
+ ClCompile
+
+
+
+
+ Application
+ false
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ _CONSOLE;%(PreprocessorDefinitions)
+
+
+ Console
+ 2000000
+ 0x1d000000
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+ {e9e0a1f6-0009-4e8c-b8f8-1b8f5d49a058}
+ false
+
+
+
+
+
+
+
+ <_Content>@rem This script invokes the most recently built Python with all arguments
+@rem passed through to the interpreter. This file is generated by the
+@rem build process and any changes *will* be thrown away by the next
+@rem rebuild.
+@rem This is only meant as a convenience for developing CPython
+@rem and using it outside of that context is ill-advised.
+@echo Running $(Configuration)^|$(Platform) interpreter...
+@"$(OutDir)python$(PyDebugExt).exe" %*
+
+ <_ExistingContent Condition="Exists('$(PySourcePath)python.bat')">$([System.IO.File]::ReadAllText('$(PySourcePath)python.bat'))
+
+
+
+
diff --git a/PCbuild/python.vcxproj.filters b/PCbuild/python.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/python.vcxproj.filters
@@ -0,0 +1,26 @@
+
+
+
+
+ {2d690795-de83-4a33-8235-3c5dafe45efa}
+
+
+ {8b010a19-5b29-45f1-a8a0-f672e2bbb11a}
+
+
+
+
+ Resource Files
+
+
+
+
+ Resource Files
+
+
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/pythoncore.vcxproj
@@ -0,0 +1,408 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
+ pythoncore
+
+
+
+
+ DynamicLibrary
+ false
+
+
+
+
+
+ ClCompile
+ true
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(PyDllName)
+
+
+ Link
+
+
+
+ /Zm200 %(AdditionalOptions)
+ $(PySourcePath)Python;$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories)
+ _USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions)
+
+
+ ws2_32.lib;%(AdditionalDependencies)
+ 0x1e000000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $([System.IO.File]::ReadAllText('$(IntDir)hgbranch.txt').Trim())
+ $([System.IO.File]::ReadAllText('$(IntDir)hgversion.txt').Trim())
+ $([System.IO.File]::ReadAllText('$(IntDir)hgtag.txt').Trim())
+
+
+
+ HGVERSION="$(HgVersion)";HGTAG="$(HgTag)";HGBRANCH="$(HgBranch)";%(PreprocessorDefinitions)
+
+
+
+
+
+
+
diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -0,0 +1,953 @@
+
+
+
+
+ {086b0afb-270c-4603-a02a-63d46f0b2b92}
+
+
+ {8e81609f-13ca-4eae-9fdb-f8af20c710c7}
+
+
+ {8787c5bb-bab6-4586-a42e-4a27c7b3ffb6}
+
+
+ {5d6d2d6c-9e61-4a1d-b0b2-5cc2f446d69e}
+
+
+ {9f12c4b1-322e-431e-abf1-e02550f50032}
+
+
+ {ab29a558-143d-4fe7-a039-b431fb429856}
+
+
+ {97349fee-0abf-48b0-a8f5-771bf39b8aee}
+
+
+ {ea21fc98-de89-4746-a979-c5616964329a}
+
+
+ {f2696406-14bc-48bd-90c5-e93ab82a21ac}
+
+
+ {c3e03a5c-56c7-45fd-8543-e5d2326b907d}
+
+
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Include
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\cjkcodecs
+
+
+ Modules\cjkcodecs
+
+
+ Modules\cjkcodecs
+
+
+ Modules\cjkcodecs
+
+
+ Modules\cjkcodecs
+
+
+ Modules\cjkcodecs
+
+
+ Modules\cjkcodecs
+
+
+ Modules\cjkcodecs
+
+
+ Modules\cjkcodecs
+
+
+ Modules\cjkcodecs
+
+
+ Modules\_io
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Parser
+
+
+ Parser
+
+
+ PC
+
+
+ PC
+
+
+ Python
+
+
+ Python
+
+
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\zlib
+
+
+ Modules\cjkcodecs
+
+
+ Modules\cjkcodecs
+
+
+ Modules\cjkcodecs
+
+
+ Modules\cjkcodecs
+
+
+ Modules\cjkcodecs
+
+
+ Modules\cjkcodecs
+
+
+ Modules\cjkcodecs
+
+
+ Modules\_io
+
+
+ Modules\_io
+
+
+ Modules\_io
+
+
+ Modules\_io
+
+
+ Modules\_io
+
+
+ Modules\_io
+
+
+ Modules\_io
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Objects
+
+
+ Parser
+
+
+ Parser
+
+
+ Parser
+
+
+ Parser
+
+
+ Parser
+
+
+ Parser
+
+
+ Parser
+
+
+ Parser
+
+
+ Parser
+
+
+ Parser
+
+
+ Parser
+
+
+ Parser
+
+
+ PC
+
+
+ PC
+
+
+ PC
+
+
+ PC
+
+
+ PC
+
+
+ PC
+
+
+ PC
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+ Python
+
+
+
+
+ Resource Files
+
+
+
diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/pythonw.vcxproj
@@ -0,0 +1,80 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {F4229CC3-873C-49AE-9729-DD308ED4CD4A}
+ ClCompile
+ false
+
+
+
+
+ Application
+ false
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ 2000000
+ 0x1d000000
+
+
+
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+
+
+
+
diff --git a/PCbuild/pythonw.vcxproj.filters b/PCbuild/pythonw.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/pythonw.vcxproj.filters
@@ -0,0 +1,21 @@
+
+
+
+
+ {0434cf11-a311-4a92-8a6c-4164aa79a7f2}
+
+
+ {e1d8ea6b-c65d-42f4-9eed-6010846ed378}
+
+
+
+
+ Resource Files
+
+
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat
--- a/PCbuild/rt.bat
+++ b/PCbuild/rt.bat
@@ -32,21 +32,19 @@
set suffix=
set qmode=
set dashO=
-set tcltk=tcltk
:CheckOpts
if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts
if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts
if "%1"=="-d" (set suffix=_d) & shift & goto CheckOpts
-if "%1"=="-x64" (set prefix=%prefix%amd64) & (set tcltk=tcltk64) & shift & goto CheckOpts
+if "%1"=="-x64" (set prefix=%pcbuild%amd64\) & shift & goto CheckOpts
-PATH %PATH%;%pcbuild%..\externals\%tcltk%\bin
-set exe="%prefix%\python%suffix%"
-set cmd=%exe% %dashO% -Wd -3 -E -tt "%pcbuild%\..\Lib\test\regrtest.py" %1 %2 %3 %4 %5 %6 %7 %8 %9
+set exe=%prefix%\python%suffix%
+set cmd="%exe%" %dashO% -Wd -3 -E -tt "%pcbuild%..\Lib\test\regrtest.py" %1 %2 %3 %4 %5 %6 %7 %8 %9
if defined qmode goto Qmode
echo Deleting .pyc/.pyo files ...
-%exe% "%pcbuild%\rmpyc.py"
+"%exe%" "%pcbuild%rmpyc.py"
echo on
%cmd%
diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/select.vcxproj
@@ -0,0 +1,79 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {18CAE28C-B454-46C1-87A0-493D91D97F03}
+ select
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ ws2_32.lib;%(AdditionalDependencies)
+ 0x1D110000
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+
+
+
+
diff --git a/PCbuild/select.vcxproj.filters b/PCbuild/select.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/select.vcxproj.filters
@@ -0,0 +1,13 @@
+
+
+
+
+ {98346077-900c-4c7a-852f-a23470e37b40}
+
+
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/sqlite3.vcxproj
@@ -0,0 +1,77 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {A1A295E5-463C-437F-81CA-1F32367685DA}
+ sqlite3
+ .pyd
+ false
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ $(sqlite3Dir);%(AdditionalIncludeDirectories)
+ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions)
+ Level1
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PCbuild/sqlite3.vcxproj.filters b/PCbuild/sqlite3.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/sqlite3.vcxproj.filters
@@ -0,0 +1,24 @@
+
+
+
+
+ {ce5b649d-a6f7-4459-9425-c883795d79df}
+
+
+ {0e842fe2-176b-4e83-9d1f-0ad13a859efd}
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/ssleay.vcxproj b/PCbuild/ssleay.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/ssleay.vcxproj
@@ -0,0 +1,119 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {10615B24-73BF-4EFA-93AA-236916321317}
+ ssleay
+
+
+
+
+
+
+ StaticLibrary
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PCbuild/tcl.vcxproj b/PCbuild/tcl.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/tcl.vcxproj
@@ -0,0 +1,90 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {B5FD6F1D-129E-4BFF-9340-03606FAC7283}
+
+
+
+
+
+
+
+ Makefile
+ $(tcltkDir)
+ $(OutDir)bin\$(tclDLLName)
+
+
+
+
+
+
+
+
+
+ symbols
+ INSTALLDIR="$(OutDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"
+ DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"
+ setlocal
+@(ExpectedOutputs->'if not exist "%(FullPath)" goto build','
+')
+goto :eof
+:build
+set VCINSTALLDIR=$(VCInstallDir)
+cd /D "$(tclDir)win"
+nmake -f makefile.vc MACHINE=$(TclMachine) OPTS=$(TclOpts) $(TclDirs) $(DebugFlags) core shell dlls
+nmake -f makefile.vc MACHINE=$(TclMachine) OPTS=$(TclOpts) $(TclDirs) $(DebugFlags) install-binaries install-libraries
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props
new file mode 100644
--- /dev/null
+++ b/PCbuild/tcltk.props
@@ -0,0 +1,43 @@
+
+
+
+
+ 8
+ 5
+ 15
+ 0
+ $(TclMajorVersion)
+ $(TclMinorVersion)
+ $(TclPatchLevel)
+ $(TclRevision)
+ 8
+ 4
+ 3
+ 5
+ $(ExternalsDir)tcl-$(TclMajorVersion).$(TclMinorVersion).$(TclPatchLevel).$(TclRevision)\
+ $(ExternalsDir)tk-$(TkMajorVersion).$(TkMinorVersion).$(TkPatchLevel).$(TkRevision)\
+ $(ExternalsDir)tix-$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel).$(TixRevision)\
+ $(ExternalsDir)tcltk\
+ $(ExternalsDir)tcltk64\
+ g
+ tcl$(TclMajorVersion)$(TclMinorVersion)$(TclDebugExt).dll
+ tcl$(TclMajorVersion)$(TclMinorVersion)$(TclDebugExt).lib
+ tclsh$(TclMajorVersion)$(TclMinorVersion)$(TclDebugExt).exe
+ tk$(TkMajorVersion)$(TkMinorVersion)$(TclDebugExt).dll
+ tk$(TkMajorVersion)$(TkMinorVersion)$(TclDebugExt).lib
+ tix$(TixMajorVersion)$(TixMinorVersion)$(TclDebugExt).dll
+ $(tcltkDir)lib\tix$(TixMajorVersion).$(TixMinorVersion).$(TixPatchLevel)\$(tixDLLName)
+ $(tcltkDir)lib\tcl$(TclMajorVersion)$(TclMinorVersion)$(TclDebugExt).lib;$(tcltkDir)lib\tk$(TkMajorVersion)$(TkMinorVersion)$(TclDebugExt).lib
+ IX86
+ AMD64
+ TCL_MAJOR_VERSION=$(TclMajorVersion) TCL_MINOR_VERSION=$(TclMinorVersion) TCL_PATCH_LEVEL=$(TclPatchLevel)
+ TCL_MAJOR=$(TclMajorVersion) TCL_MINOR=$(TclMinorVersion) TCL_PATCH=$(TclPatchLevel)
+ TK_MAJOR_VERSION=$(TkMajorVersion) TK_MINOR_VERSION=$(TkMinorVersion) TK_PATCH_LEVEL=$(TkPatchLevel)
+
+ Release
+ Debug
+ $(BuildDirTop)_$(TclMachine)
+
+ $(BuildDirTop)_VC9
+
+
diff --git a/PCbuild/tix.vcxproj b/PCbuild/tix.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/tix.vcxproj
@@ -0,0 +1,94 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}
+ tix
+
+
+
+
+
+
+
+ Makefile
+ $(tcltkDir)
+ $(tixDLLPath)
+
+
+
+
+
+
+
+
+
+ msvcrt
+ symbols,msvcrt
+ BUILDDIRTOP="$(BuildDirTop)" TCL_DIR="$(tclDir.TrimEnd(`\`))" TK_DIR="$(tkDir.TrimEnd(`\`))" INSTALL_DIR="$(OutDir.TrimEnd(`\`))"
+ DEBUG=1 NODEBUG=0 TCL_DBGX=g DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"
+ DEBUG=0 NODEBUG=1
+ setlocal
+@(ExpectedOutputs->'if not exist "%(FullPath)" goto build','
+')
+goto :eof
+:build
+set VCINSTALLDIR=$(VCInstallDir)
+cd /D "$(tixDir)win"
+nmake /nologo -f makefile.vc MACHINE=$(TclMachine) $(DebugFlags) $(TclShortVersions) $(TixDirs) all install
+
+ rmdir /q/s "$(OutDir.TrimEnd(`\`))"
+
+
+
+
+ {b5fd6f1d-129e-4bff-9340-03606fac7283}
+ false
+
+
+ {7e85eccf-a72c-4da4-9e52-884508e80ba1}
+ false
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PCbuild/tk.vcxproj b/PCbuild/tk.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/tk.vcxproj
@@ -0,0 +1,95 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {7E85ECCF-A72C-4DA4-9E52-884508E80BA1}
+ tk
+
+
+
+
+
+
+
+ Makefile
+ $(tcltkDir)
+ $(OutDir)bin\$(tkDLLName)
+
+
+
+
+
+
+
+
+
+ msvcrt
+ symbols,msvcrt
+ TCLDIR="$(tclDir.TrimEnd(`\`))" INSTALLDIR="$(OutDir.TrimEnd(`\`))"
+ DEBUGFLAGS="-wd4456 -wd4457 -wd4458 -wd4459 -wd4996"
+ setlocal
+@(ExpectedOutputs->'if not exist "%(FullPath)" goto build','
+')
+goto :eof
+:build
+set VCINSTALLDIR=$(VCInstallDir)
+cd /D "$(tkDir)win"
+nmake /nologo -f makefile.vc RC=rc MACHINE=$(TclMachine) OPTS=$(TkOpts) $(TkDirs) $(DebugFlags) all
+nmake /nologo -f makefile.vc RC=rc MACHINE=$(TclMachine) OPTS=$(TkOpts) $(TkDirs) $(DebugFlags) install-binaries install-libraries
+
+
+
+
+ {b5fd6f1d-129e-4bff-9340-03606fac7283}
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PCbuild/unicodedata.vcxproj b/PCbuild/unicodedata.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/unicodedata.vcxproj
@@ -0,0 +1,83 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {ECC7CEAC-A5E5-458E-BB9E-2413CC847881}
+ unicodedata
+ Win32Proj
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ 0x1D120000
+
+
+
+
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+
+
+
+
diff --git a/PCbuild/unicodedata.vcxproj.filters b/PCbuild/unicodedata.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/unicodedata.vcxproj.filters
@@ -0,0 +1,24 @@
+
+
+
+
+ {b939a8f1-ccd7-420a-974a-243606dccd74}
+
+
+ {e2c055bb-ec62-4bbc-aa1c-d88da4d4ad1c}
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/w9xpopen.vcxproj b/PCbuild/w9xpopen.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/w9xpopen.vcxproj
@@ -0,0 +1,77 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}
+ w9xpopen
+ Win32Proj
+ false
+
+
+
+
+ Application
+ false
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+ _CONSOLE;%(PreprocessorDefinitions)
+ MaxSpeed
+ OnlyExplicitInline
+ true
+ MultiThreaded
+ true
+
+
+ Console
+
+
+
+
+
+
+
+
+
diff --git a/PCbuild/w9xpopen.vcxproj.filters b/PCbuild/w9xpopen.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/w9xpopen.vcxproj.filters
@@ -0,0 +1,13 @@
+
+
+
+
+ {abc2dffd-3f2a-47bd-b89b-0314c99ef21e}
+
+
+
+
+ Source Files
+
+
+
diff --git a/PCbuild/winsound.vcxproj b/PCbuild/winsound.vcxproj
new file mode 100644
--- /dev/null
+++ b/PCbuild/winsound.vcxproj
@@ -0,0 +1,79 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ PGInstrument
+ Win32
+
+
+ PGInstrument
+ x64
+
+
+ PGUpdate
+ Win32
+
+
+ PGUpdate
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {28B5D777-DDF2-4B6B-B34F-31D938813856}
+ winsound
+ Win32Proj
+
+
+
+
+ DynamicLibrary
+ NotSet
+
+
+
+ .pyd
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+
+
+ winmm.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}
+ false
+
+
+
+
+
+
diff --git a/PCbuild/winsound.vcxproj.filters b/PCbuild/winsound.vcxproj.filters
new file mode 100644
--- /dev/null
+++ b/PCbuild/winsound.vcxproj.filters
@@ -0,0 +1,14 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+
+
+ Source Files
+
+
+
diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -15,4 +15,4 @@
@rem 4) re-comment, commit and push again
@rem Do the build
-call "%~dp0..\..\PCbuild\build.bat" -e -d -k %*
+call "%~dp0..\..\PCbuild\build.bat" -v -e -d -k %*