Commit 4734372a authored by Zachary Ware's avatar Zachary Ware

Close #24508: Backport the 3.5 MSBuild project files.

The old project files move to PC/VS9.0 and remain supported.

VS2008 is still required to build 2.7; VS2010 (or later, plus Windows SDK 7.1)
is *also* required to use the new project files.
parent 10c997ae
......@@ -40,6 +40,7 @@ Lib/test/sndhdrdata/sndhdr.* = BIN
# 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!
......
......@@ -17,6 +17,7 @@ db_home
platform$
pyconfig.h$
python$
python.bat$
python.exe$
reflog.txt$
tags$
......@@ -44,21 +45,38 @@ libpython*.so*
*.pyd
*.cover
*~
Lib/distutils/command/*.pdb
Lib/lib2to3/*.pickle
Lib/test/data/*
Misc/*.wpu
PC/python_nt*.h
PC/pythonnt_rc*.h
PC/*.obj
PCbuild/*.exe
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/*.pdb
PCbuild/*.lib
PCbuild/*.exp
PCbuild/*.o
PCbuild/*.ncb
PCbuild/*.bsc
PCbuild/Win32-temp-*
PCbuild/*.exe
PCbuild/*.ilk
PCbuild/*.lib
PCbuild/*.pdb
PCbuild/amd64
PCbuild/obj
.coverage
coverage/
externals/
......
......@@ -199,7 +199,9 @@ class build_ext (Command):
else:
# win-amd64 or win-ia64
suffix = self.plat_name[4:]
new_lib = os.path.join(sys.exec_prefix, 'PCbuild')
# 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)
......
......@@ -49,7 +49,10 @@ else:
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):
......
......@@ -203,6 +203,15 @@ if sys.platform == 'darwin':
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
......
......@@ -8,9 +8,7 @@ from subprocess import Popen, PIPE
# 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
......
......@@ -103,6 +103,10 @@ Library
Build
-----
- Issue #24508: Backported the MSBuild project files from Python 3.5. The
backported files replace the old project files in PCbuild; the old files moved
to PC/VS9.0 and remain supported.
- Issue #24432: Update Windows builds and OS X 10.5 installer to use OpenSSL
1.0.2c.
......
......@@ -537,7 +537,7 @@
Name="Header Files"
>
<File
RelativePath="..\Modules\bsddb.h"
RelativePath="..\..\Modules\bsddb.h"
>
</File>
</Filter>
......@@ -545,7 +545,7 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\_bsddb.c"
RelativePath="..\..\Modules\_bsddb.c"
>
</File>
</Filter>
......
......@@ -42,7 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -103,7 +103,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -164,7 +164,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -228,7 +228,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -291,7 +291,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -355,7 +355,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -419,7 +419,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -483,7 +483,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
/>
<Tool
Name="VCManagedResourceCompilerTool"
......@@ -531,27 +531,27 @@
Name="Header Files"
>
<File
RelativePath="..\Modules\_ctypes\ctypes.h"
RelativePath="..\..\Modules\_ctypes\ctypes.h"
>
</File>
<File
RelativePath="..\Modules\_ctypes\ctypes_dlfcn.h"
RelativePath="..\..\Modules\_ctypes\ctypes_dlfcn.h"
>
</File>
<File
RelativePath="..\Modules\_ctypes\libffi_msvc\ffi.h"
RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi.h"
>
</File>
<File
RelativePath="..\Modules\_ctypes\libffi_msvc\ffi_common.h"
RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi_common.h"
>
</File>
<File
RelativePath="..\Modules\_ctypes\libffi_msvc\fficonfig.h"
RelativePath="..\..\Modules\_ctypes\libffi_msvc\fficonfig.h"
>
</File>
<File
RelativePath="..\Modules\_ctypes\libffi_msvc\ffitarget.h"
RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffitarget.h"
>
</File>
</Filter>
......@@ -559,39 +559,39 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\_ctypes\_ctypes.c"
RelativePath="..\..\Modules\_ctypes\_ctypes.c"
>
</File>
<File
RelativePath="..\Modules\_ctypes\callbacks.c"
RelativePath="..\..\Modules\_ctypes\callbacks.c"
>
</File>
<File
RelativePath="..\Modules\_ctypes\callproc.c"
RelativePath="..\..\Modules\_ctypes\callproc.c"
>
</File>
<File
RelativePath="..\Modules\_ctypes\cfield.c"
RelativePath="..\..\Modules\_ctypes\cfield.c"
>
</File>
<File
RelativePath="..\Modules\_ctypes\libffi_msvc\ffi.c"
RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi.c"
>
</File>
<File
RelativePath="..\Modules\_ctypes\malloc_closure.c"
RelativePath="..\..\Modules\_ctypes\malloc_closure.c"
>
</File>
<File
RelativePath="..\Modules\_ctypes\libffi_msvc\prep_cif.c"
RelativePath="..\..\Modules\_ctypes\libffi_msvc\prep_cif.c"
>
</File>
<File
RelativePath="..\Modules\_ctypes\stgdict.c"
RelativePath="..\..\Modules\_ctypes\stgdict.c"
>
</File>
<File
RelativePath="..\Modules\_ctypes\libffi_msvc\win32.c"
RelativePath="..\..\Modules\_ctypes\libffi_msvc\win32.c"
>
<FileConfiguration
Name="Debug|x64"
......@@ -627,7 +627,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\Modules\_ctypes\libffi_msvc\win64.asm"
RelativePath="..\..\Modules\_ctypes\libffi_msvc\win64.asm"
>
<FileConfiguration
Name="Debug|Win32"
......
......@@ -503,7 +503,7 @@
Name="Header Files"
>
<File
RelativePath="..\Modules\_ctypes\_ctypes_test.h"
RelativePath="..\..\Modules\_ctypes\_ctypes_test.h"
>
</File>
</Filter>
......@@ -511,7 +511,7 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\_ctypes\_ctypes_test.c"
RelativePath="..\..\Modules\_ctypes\_ctypes_test.c"
>
</File>
</Filter>
......
......@@ -42,7 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\expat"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -104,7 +104,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\expat"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -166,7 +166,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\expat"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -229,7 +229,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\expat"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -291,7 +291,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\expat"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -354,7 +354,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\expat"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -417,7 +417,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\expat"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -480,7 +480,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\expat"
AdditionalIncludeDirectories="..\..\Modules\expat"
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -527,63 +527,63 @@
Name="Header Files"
>
<File
RelativePath="..\Modules\expat\ascii.h"
RelativePath="..\..\Modules\expat\ascii.h"
>
</File>
<File
RelativePath="..\Modules\expat\asciitab.h"
RelativePath="..\..\Modules\expat\asciitab.h"
>
</File>
<File
RelativePath="..\Modules\expat\expat.h"
RelativePath="..\..\Modules\expat\expat.h"
>
</File>
<File
RelativePath="..\Modules\expat\expat_config.h"
RelativePath="..\..\Modules\expat\expat_config.h"
>
</File>
<File
RelativePath="..\Modules\expat\expat_external.h"
RelativePath="..\..\Modules\expat\expat_external.h"
>
</File>
<File
RelativePath="..\Modules\expat\iasciitab.h"
RelativePath="..\..\Modules\expat\iasciitab.h"
>
</File>
<File
RelativePath="..\Modules\expat\internal.h"
RelativePath="..\..\Modules\expat\internal.h"
>
</File>
<File
RelativePath="..\Modules\expat\latin1tab.h"
RelativePath="..\..\Modules\expat\latin1tab.h"
>
</File>
<File
RelativePath="..\Modules\expat\macconfig.h"
RelativePath="..\..\Modules\expat\macconfig.h"
>
</File>
<File
RelativePath="..\Modules\expat\nametab.h"
RelativePath="..\..\Modules\expat\nametab.h"
>
</File>
<File
RelativePath="..\Modules\expat\pyexpatns.h"
RelativePath="..\..\Modules\expat\pyexpatns.h"
>
</File>
<File
RelativePath="..\Modules\expat\utf8tab.h"
RelativePath="..\..\Modules\expat\utf8tab.h"
>
</File>
<File
RelativePath="..\Modules\expat\winconfig.h"
RelativePath="..\..\Modules\expat\winconfig.h"
>
</File>
<File
RelativePath="..\Modules\expat\xmlrole.h"
RelativePath="..\..\Modules\expat\xmlrole.h"
>
</File>
<File
RelativePath="..\Modules\expat\xmltok.h"
RelativePath="..\..\Modules\expat\xmltok.h"
>
</File>
</Filter>
......@@ -591,19 +591,19 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\_elementtree.c"
RelativePath="..\..\Modules\_elementtree.c"
>
</File>
<File
RelativePath="..\Modules\expat\xmlparse.c"
RelativePath="..\..\Modules\expat\xmlparse.c"
>
</File>
<File
RelativePath="..\Modules\expat\xmlrole.c"
RelativePath="..\..\Modules\expat\xmlrole.c"
>
</File>
<File
RelativePath="..\Modules\expat\xmltok.c"
RelativePath="..\..\Modules\expat\xmltok.c"
>
</File>
</Filter>
......
......@@ -535,7 +535,7 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\_hashopenssl.c"
RelativePath="..\..\Modules\_hashopenssl.c"
>
</File>
</Filter>
......
......@@ -519,7 +519,7 @@
Name="Source Files"
>
<File
RelativePath="..\PC\_msi.c"
RelativePath="..\..\PC\_msi.c"
>
</File>
</Filter>
......
......@@ -519,11 +519,11 @@
Name="Header Files"
>
<File
RelativePath="..\Modules\_multiprocessing\multiprocessing.h"
RelativePath="..\..\Modules\_multiprocessing\multiprocessing.h"
>
</File>
<File
RelativePath="..\Modules\_multiprocessing\connection.h"
RelativePath="..\..\Modules\_multiprocessing\connection.h"
>
</File>
</Filter>
......@@ -531,23 +531,23 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\_multiprocessing\multiprocessing.c"
RelativePath="..\..\Modules\_multiprocessing\multiprocessing.c"
>
</File>
<File
RelativePath="..\Modules\_multiprocessing\pipe_connection.c"
RelativePath="..\..\Modules\_multiprocessing\pipe_connection.c"
>
</File>
<File
RelativePath="..\Modules\_multiprocessing\semaphore.c"
RelativePath="..\..\Modules\_multiprocessing\semaphore.c"
>
</File>
<File
RelativePath="..\Modules\_multiprocessing\socket_connection.c"
RelativePath="..\..\Modules\_multiprocessing\socket_connection.c"
>
</File>
<File
RelativePath="..\Modules\_multiprocessing\win32_functions.c"
RelativePath="..\..\Modules\_multiprocessing\win32_functions.c"
>
</File>
</Filter>
......
......@@ -519,7 +519,7 @@
Name="Header Files"
>
<File
RelativePath="..\Modules\socketmodule.h"
RelativePath="..\..\Modules\socketmodule.h"
>
</File>
</Filter>
......@@ -527,7 +527,7 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\socketmodule.c"
RelativePath="..\..\Modules\socketmodule.c"
>
</File>
</Filter>
......
......@@ -527,43 +527,43 @@
Name="Header Files"
>
<File
RelativePath="..\Modules\_sqlite\cache.h"
RelativePath="..\..\Modules\_sqlite\cache.h"
>
</File>
<File
RelativePath="..\Modules\_sqlite\connection.h"
RelativePath="..\..\Modules\_sqlite\connection.h"
>
</File>
<File
RelativePath="..\Modules\_sqlite\cursor.h"
RelativePath="..\..\Modules\_sqlite\cursor.h"
>
</File>
<File
RelativePath="..\Modules\_sqlite\microprotocols.h"
RelativePath="..\..\Modules\_sqlite\microprotocols.h"
>
</File>
<File
RelativePath="..\Modules\_sqlite\module.h"
RelativePath="..\..\Modules\_sqlite\module.h"
>
</File>
<File
RelativePath="..\Modules\_sqlite\prepare_protocol.h"
RelativePath="..\..\Modules\_sqlite\prepare_protocol.h"
>
</File>
<File
RelativePath="..\Modules\_sqlite\row.h"
RelativePath="..\..\Modules\_sqlite\row.h"
>
</File>
<File
RelativePath="..\Modules\_sqlite\sqlitecompat.h"
RelativePath="..\..\Modules\_sqlite\sqlitecompat.h"
>
</File>
<File
RelativePath="..\Modules\_sqlite\statement.h"
RelativePath="..\..\Modules\_sqlite\statement.h"
>
</File>
<File
RelativePath="..\Modules\_sqlite\util.h"
RelativePath="..\..\Modules\_sqlite\util.h"
>
</File>
</Filter>
......@@ -571,39 +571,39 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\_sqlite\cache.c"
RelativePath="..\..\Modules\_sqlite\cache.c"
>
</File>
<File
RelativePath="..\Modules\_sqlite\connection.c"
RelativePath="..\..\Modules\_sqlite\connection.c"
>
</File>
<File
RelativePath="..\Modules\_sqlite\cursor.c"
RelativePath="..\..\Modules\_sqlite\cursor.c"
>
</File>
<File
RelativePath="..\Modules\_sqlite\microprotocols.c"
RelativePath="..\..\Modules\_sqlite\microprotocols.c"
>
</File>
<File
RelativePath="..\Modules\_sqlite\module.c"
RelativePath="..\..\Modules\_sqlite\module.c"
>
</File>
<File
RelativePath="..\Modules\_sqlite\prepare_protocol.c"
RelativePath="..\..\Modules\_sqlite\prepare_protocol.c"
>
</File>
<File
RelativePath="..\Modules\_sqlite\row.c"
RelativePath="..\..\Modules\_sqlite\row.c"
>
</File>
<File
RelativePath="..\Modules\_sqlite\statement.c"
RelativePath="..\..\Modules\_sqlite\statement.c"
>
</File>
<File
RelativePath="..\Modules\_sqlite\util.c"
RelativePath="..\..\Modules\_sqlite\util.c"
>
</File>
</Filter>
......
......@@ -535,7 +535,7 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\_ssl.c"
RelativePath="..\..\Modules\_ssl.c"
>
</File>
</Filter>
......
......@@ -511,7 +511,7 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\_testcapimodule.c"
RelativePath="..\..\Modules\_testcapimodule.c"
>
</File>
</Filter>
......
......@@ -527,11 +527,11 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\_tkinter.c"
RelativePath="..\..\Modules\_tkinter.c"
>
</File>
<File
RelativePath="..\Modules\tkappinit.c"
RelativePath="..\..\Modules\tkappinit.c"
>
</File>
</Filter>
......
......@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory="..\lib\distutils\command"
OutputDirectory="..\..\lib\distutils\command"
ConfigurationType="1"
InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"
UseOfMFC="0"
......@@ -45,14 +45,14 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\..\lib\distutils\command\wininst.tlb"
TypeLibraryName=".\..\..\lib\distutils\command\wininst.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\PC\bdist_wininst;..\Include;..\Modules\zlib"
AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
......@@ -67,7 +67,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="0"
AdditionalIncludeDirectories="..\PC;..\PC\bdist_wininst;..\Include"
AdditionalIncludeDirectories="..\..\PC;..\..\PC\bdist_wininst;..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
......@@ -75,11 +75,11 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib imagehlp.lib"
OutputFile="..\lib\distutils\command\wininst-9.0.exe"
OutputFile="..\..\lib\distutils\command\wininst-9.0.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="LIBC"
ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0.pdb"
ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
......@@ -135,14 +135,14 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
TypeLibraryName=".\..\lib\distutils\command\wininst.tlb"
TypeLibraryName=".\..\..\lib\distutils\command\wininst.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\PC\bdist_wininst;..\Include;..\Modules\zlib"
AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
......@@ -157,7 +157,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="0"
AdditionalIncludeDirectories="..\PC;..\PC\bdist_wininst;..\Include"
AdditionalIncludeDirectories="..\..\PC;..\..\PC\bdist_wininst;..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
......@@ -165,11 +165,11 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib imagehlp.lib"
OutputFile="..\lib\distutils\command\wininst-9.0-amd64.exe"
OutputFile="..\..\lib\distutils\command\wininst-9.0-amd64.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="LIBC"
ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0-amd64.pdb"
ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0-amd64.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
......@@ -206,38 +206,38 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath="..\PC\bdist_wininst\extract.c"
RelativePath="..\..\PC\bdist_wininst\extract.c"
>
</File>
<File
RelativePath="..\PC\bdist_wininst\install.c"
RelativePath="..\..\PC\bdist_wininst\install.c"
>
</File>
<Filter
Name="zlib"
>
<File
RelativePath="..\Modules\zlib\adler32.c"
RelativePath="..\..\Modules\zlib\adler32.c"
>
</File>
<File
RelativePath="..\Modules\zlib\crc32.c"
RelativePath="..\..\Modules\zlib\crc32.c"
>
</File>
<File
RelativePath="..\Modules\zlib\inffast.c"
RelativePath="..\..\Modules\zlib\inffast.c"
>
</File>
<File
RelativePath="..\Modules\zlib\inflate.c"
RelativePath="..\..\Modules\zlib\inflate.c"
>
</File>
<File
RelativePath="..\Modules\zlib\inftrees.c"
RelativePath="..\..\Modules\zlib\inftrees.c"
>
</File>
<File
RelativePath="..\Modules\zlib\zutil.c"
RelativePath="..\..\Modules\zlib\zutil.c"
>
</File>
</Filter>
......@@ -247,7 +247,7 @@
Filter="h;hpp;hxx;hm;inl"
>
<File
RelativePath="..\PC\bdist_wininst\archive.h"
RelativePath="..\..\PC\bdist_wininst\archive.h"
>
</File>
</Filter>
......@@ -256,11 +256,11 @@
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
<File
RelativePath="..\PC\bdist_wininst\install.rc"
RelativePath="..\..\PC\bdist_wininst\install.rc"
>
</File>
<File
RelativePath="..\PC\bdist_wininst\PythonPowered.bmp"
RelativePath="..\..\PC\bdist_wininst\PythonPowered.bmp"
>
</File>
</Filter>
......
@echo off
rem A batch program to build or rebuild a particular configuration,
rem just for convenience.
rem Arguments:
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 -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
setlocal
set platf=Win32
set vs_platf=x86
set conf=Release
set target=
set dir=%~dp0
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'=='-d' (set conf=Debug) & 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=)
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
)
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 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
@%comspec% /k env.bat %*
@echo off
rem A batch program to build PGO (Profile guided optimization) by first
rem building instrumented binaries, then running the testsuite, and
rem finally building the optimized code.
rem Note, after the first instrumented run, one can just keep on
rem building the PGUpdate configuration while developing.
setlocal
set platf=Win32
rem use the performance testsuite. This is quick and simple
set job1=..\..\tools\pybench\pybench.py -n 1 -C 1 --with-gc
set path1=..\..\tools\pybench
rem or the whole testsuite for more thorough testing
set job2=..\..\lib\test\regrtest.py
set path2=..\..\lib
set job=%job1%
set clrpath=%path1%
:CheckOpts
if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts
set PGI=%platf%-pgi
set PGO=%platf%-pgo
@echo on
rem build the instrumented version
call build -p %platf% -c PGInstrument
rem remove .pyc files, .pgc files and execute the job
%PGI%\python.exe rmpyc.py %clrpath%
del %PGI%\*.pgc
%PGI%\python.exe %job%
rem finally build the optimized version
if exist %PGO% del /s /q %PGO%
call build -p %platf% -c PGUpdate
......@@ -70,7 +70,7 @@ def get_ssl_dir():
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):
......
......@@ -527,7 +527,7 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\bz2module.c"
RelativePath="..\..\Modules\bz2module.c"
>
</File>
</Filter>
......
@echo off
echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64
echo.
call "%VS90COMNTOOLS%..\..\VC\vcvarsall.bat" %*
# An absurd workaround for the lack of arithmetic in MS's resource compiler.
# After building Python, run this, then paste the output into the appropriate
# part of PC\python_nt.rc.
# Example output:
#
# * For 2.3a0,
# * PY_MICRO_VERSION = 0
# * PY_RELEASE_LEVEL = 'alpha' = 0xA
# * PY_RELEASE_SERIAL = 1
# *
# * and 0*1000 + 10*10 + 1 = 101.
# */
# #define FIELD3 101
import sys
major, minor, micro, level, serial = sys.version_info
levelnum = {'alpha': 0xA,
'beta': 0xB,
'candidate': 0xC,
'final': 0xF,
}[level]
string = sys.version.split()[0] # like '2.3a0'
print(" * For %s," % string)
print(" * PY_MICRO_VERSION = %d" % micro)
print(" * PY_RELEASE_LEVEL = %r = %s" % (level, hex(levelnum)))
print(" * PY_RELEASE_SERIAL = %d" % serial)
print(" *")
field3 = micro * 1000 + levelnum * 10 + serial
print(" * and %d*1000 + %d*10 + %d = %d" % (micro, levelnum, serial, field3))
print(" */")
print("#define FIELD3", field3)
@echo off
rem start idle
rem Usage: idle [-d]
rem -d Run Debug build (python_d.exe). Else release build.
setlocal
set exe=python
PATH %PATH%;..\..\tcltk\bin
if "%1"=="-d" (set exe=python_d) & shift
set cmd=%exe% ../Lib/idlelib/idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9
echo on
%cmd%
This diff was suppressed by a .gitattributes entry.
......@@ -46,7 +46,7 @@ int make_buildinfo2()
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 @@ int main(int argc, char*argv[])
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)
......
......@@ -32,8 +32,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Build PC/pythonnt_rc(_d).h"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\pythonnt_rc.h&#x0D;&#x0A;"
Outputs="$(SolutionDir)..\PC\pythonnt_rc.h"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\pythonnt_rc.h&#x0D;&#x0A;"
Outputs="$(SolutionDir)..\..\PC\pythonnt_rc.h"
/>
<Tool
Name="VCXMLDataGeneratorTool"
......@@ -92,7 +92,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\python_nt.h&#x0D;&#x0A;"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\python_nt.h&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
......@@ -106,8 +106,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Build PC/pythonnt_rc(_d).h"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\pythonnt_rc.h&#x0D;&#x0A;"
Outputs="$(SolutionDir)..\PC\pythonnt_rc.h"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\pythonnt_rc.h&#x0D;&#x0A;"
Outputs="$(SolutionDir)..\..\PC\pythonnt_rc.h"
/>
<Tool
Name="VCXMLDataGeneratorTool"
......@@ -158,7 +158,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\python_nt.h&#x0D;&#x0A;"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\python_nt.h&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
......@@ -175,8 +175,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Build PC/pythonnt_rc(_d).h"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
Outputs="$(SolutionDir)..\..\PC\pythonnt_rc_d.h"
/>
<Tool
Name="VCXMLDataGeneratorTool"
......@@ -235,7 +235,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\python_nt_d.h&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
......@@ -249,8 +249,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Build PC/pythonnt_rc(_d).h"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
Outputs="$(SolutionDir)..\..\PC\pythonnt_rc_d.h"
/>
<Tool
Name="VCXMLDataGeneratorTool"
......@@ -303,7 +303,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\python_nt_d.h&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
......@@ -314,7 +314,7 @@
Name="Source Files"
>
<File
RelativePath="..\PC\make_versioninfo.c"
RelativePath="..\..\PC\make_versioninfo.c"
>
</File>
</Filter>
......
This diff is collapsed.
......@@ -42,7 +42,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\Modules\expat"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -103,7 +103,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\Modules\expat"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -164,7 +164,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\Modules\expat"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -226,7 +226,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\Modules\expat"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -287,7 +287,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\Modules\expat"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -349,7 +349,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\Modules\expat"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -411,7 +411,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\Modules\expat"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -473,7 +473,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".\..\Modules\expat"
AdditionalIncludeDirectories=".\..\..\Modules\expat"
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
/>
<Tool
......@@ -519,11 +519,11 @@
Name="Header Files"
>
<File
RelativePath="..\Modules\expat\xmlrole.h"
RelativePath="..\..\Modules\expat\xmlrole.h"
>
</File>
<File
RelativePath="..\Modules\expat\xmltok.h"
RelativePath="..\..\Modules\expat\xmltok.h"
>
</File>
</Filter>
......@@ -531,19 +531,19 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\pyexpat.c"
RelativePath="..\..\Modules\pyexpat.c"
>
</File>
<File
RelativePath="..\Modules\expat\xmlparse.c"
RelativePath="..\..\Modules\expat\xmlparse.c"
>
</File>
<File
RelativePath="..\Modules\expat\xmlrole.c"
RelativePath="..\..\Modules\expat\xmlrole.c"
>
</File>
<File
RelativePath="..\Modules\expat\xmltok.c"
RelativePath="..\..\Modules\expat\xmltok.c"
>
</File>
</Filter>
......
......@@ -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 @@
/>
<Tool
Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\PC;..\Include"
AdditionalIncludeDirectories="..\..\PC;..\..\Include"
/>
<UserMacro
Name="PyDllName"
......@@ -46,7 +46,7 @@
/>
<UserMacro
Name="externalsDir"
Value="..\externals"
Value="..\..\externals"
/>
<UserMacro
Name="bsddb47Dir"
......
......@@ -202,7 +202,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\Include"
AdditionalIncludeDirectories="..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
......@@ -277,7 +277,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
AdditionalIncludeDirectories="..\Include"
AdditionalIncludeDirectories="..\..\Include"
/>
<Tool
Name="VCPreLinkEventTool"
......@@ -615,11 +615,11 @@
Name="Resource Files"
>
<File
RelativePath="..\PC\pycon.ico"
RelativePath="..\..\PC\pycon.ico"
>
</File>
<File
RelativePath="..\PC\python_exe.rc"
RelativePath="..\..\PC\python_exe.rc"
>
</File>
</Filter>
......@@ -627,7 +627,7 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\python.c"
RelativePath="..\..\Modules\python.c"
>
</File>
</Filter>
......
......@@ -600,7 +600,7 @@
Name="Resource Files"
>
<File
RelativePath="..\PC\python_exe.rc"
RelativePath="..\..\PC\python_exe.rc"
>
</File>
</Filter>
......@@ -608,7 +608,7 @@
Name="Source Files"
>
<File
RelativePath="..\PC\WinMain.c"
RelativePath="..\..\PC\WinMain.c"
>
</File>
</Filter>
......
This diff is collapsed.
# Remove all the .pyc and .pyo files under ../Lib.
def deltree(root):
import os
from os.path import join
npyc = npyo = 0
for root, dirs, files in os.walk(root):
for name in files:
delete = False
if name.endswith('.pyc'):
delete = True
npyc += 1
elif name.endswith('.pyo'):
delete = True
npyo += 1
if delete:
os.remove(join(root, name))
return npyc, npyo
npyc, npyo = deltree("../Lib")
print(npyc, ".pyc deleted,", npyo, ".pyo deleted")
@echo off
rem Run Tests. Run the regression test suite.
rem Usage: rt [-d] [-O] [-q] [-x64] regrtest_args
rem -d Run Debug build (python_d.exe). Else release build.
rem -O Run python.exe or python_d.exe (see -d) with -O.
rem -q "quick" -- normally the tests are run twice, the first time
rem after deleting all the .py[co] files reachable from Lib/.
rem -q runs the tests just once, and without deleting .py[co] files.
rem -x64 Run the 64-bit build of python (or python_d if -d was specified)
rem from the 'amd64' dir instead of the 32-bit build in this dir.
rem All leading instances of these switches are shifted off, and
rem whatever remains (up to 9 arguments) is passed to regrtest.py.
rem For example,
rem rt -O -d -x test_thread
rem runs
rem python_d -O ../lib/test/regrtest.py -x test_thread
rem twice, and
rem rt -q -g test_binascii
rem runs
rem python_d ../lib/test/regrtest.py -g test_binascii
rem to generate the expected-output file for binascii quickly.
rem
rem Confusing: if you want to pass a comma-separated list, like
rem -u network,largefile
rem then you have to quote it on the rt line, like
rem rt -u "network,largefile"
setlocal
set pcbuild=%~dp0
set prefix=%pcbuild%
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
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
if defined qmode goto Qmode
echo Deleting .pyc/.pyo files ...
%exe% "%pcbuild%\rmpyc.py"
echo on
%cmd%
@echo off
echo About to run again without deleting .pyc/.pyo first:
pause
:Qmode
echo on
%cmd%
......@@ -527,7 +527,7 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\selectmodule.c"
RelativePath="..\..\Modules\selectmodule.c"
>
</File>
</Filter>
......
......@@ -511,11 +511,11 @@
Name="Header Files"
>
<File
RelativePath="..\Modules\unicodedata_db.h"
RelativePath="..\..\Modules\unicodedata_db.h"
>
</File>
<File
RelativePath="..\Modules\unicodename_db.h"
RelativePath="..\..\Modules\unicodename_db.h"
>
</File>
</Filter>
......@@ -523,7 +523,7 @@
Name="Source Files"
>
<File
RelativePath="..\Modules\unicodedata.c"
RelativePath="..\..\Modules\unicodedata.c"
>
</File>
</Filter>
......
......@@ -566,7 +566,7 @@
Name="Source Files"
>
<File
RelativePath="..\PC\w9xpopen.c"
RelativePath="..\..\PC\w9xpopen.c"
>
</File>
</Filter>
......
......@@ -513,7 +513,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\PC\winsound.c"
RelativePath="..\..\PC\winsound.c"
>
</File>
</Filter>
......
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGInstrument|Win32">
<Configuration>PGInstrument</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGInstrument|x64">
<Configuration>PGInstrument</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGUpdate|Win32">
<Configuration>PGUpdate</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGUpdate|x64">
<Configuration>PGUpdate</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}</ProjectGuid>
<RootNamespace>wininst</RootNamespace>
<MakeVersionInfoBeforeTarget>ClCompile</MakeVersionInfoBeforeTarget>
<SupportPGO>false</SupportPGO>
</PropertyGroup>
<Import Project="..\..\PCBuild\python.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\PCBuild\pyproject.props" />
</ImportGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir>$(PySourcePath)lib\distutils\command\</OutDir>
<LinkIncremental>false</LinkIncremental>
<TargetName>wininst-$(VisualStudioVersion)</TargetName>
<TargetName Condition="$(Platform) == 'x64'">$(TargetName)-amd64</TargetName>
<TargetExt>.exe</TargetExt>
</PropertyGroup>
<ItemDefinitionGroup>
<Midl>
<TypeLibraryName>$(OutDir)wininst.tlb</TypeLibraryName>
</Midl>
<ClCompile>
<Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories>$(PySourcePath)PC\bdist_wininst;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="extract.c" />
<ClCompile Include="install.c" />
<ClCompile Include="..\..\Modules\zlib\adler32.c" />
<ClCompile Include="..\..\Modules\zlib\crc32.c" />
<ClCompile Include="..\..\Modules\zlib\inffast.c" />
<ClCompile Include="..\..\Modules\zlib\inflate.c" />
<ClCompile Include="..\..\Modules\zlib\inftrees.c" />
<ClCompile Include="..\..\Modules\zlib\zutil.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="archive.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="install.rc" />
</ItemGroup>
<ItemGroup>
<None Include="PythonPowered.bmp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{293b1092-03ad-4b7c-acb9-c4ab62e52f55}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Source Files\zlib">
<UniqueIdentifier>{0edc0406-282f-4dbc-b60e-a867c34a2a31}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{ea0c0f0e-3b73-474e-a999-e9689d032ccc}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{0c77c1cf-3f87-4f87-bd86-b425211c2181}</UniqueIdentifier>
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\PC\bdist_wininst\extract.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\PC\bdist_wininst\install.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\adler32.c">
<Filter>Source Files\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\crc32.c">
<Filter>Source Files\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\inffast.c">
<Filter>Source Files\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\inflate.c">
<Filter>Source Files\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\inftrees.c">
<Filter>Source Files\zlib</Filter>
</ClCompile>
<ClCompile Include="..\Modules\zlib\zutil.c">
<Filter>Source Files\zlib</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\PC\bdist_wininst\archive.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\PC\bdist_wininst\install.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\PC\bdist_wininst\PythonPowered.bmp">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
</Project>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGInstrument|Win32">
<Configuration>PGInstrument</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGInstrument|x64">
<Configuration>PGInstrument</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGUpdate|Win32">
<Configuration>PGUpdate</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGUpdate|x64">
<Configuration>PGUpdate</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{0E9791DB-593A-465F-98BC-681011311618}</ProjectGuid>
<RootNamespace>_ctypes</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="python.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<PropertyGroup>
<TargetExt>.pyd</TargetExt>
</PropertyGroup>
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="pyproject.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>..\Modules\_ctypes\libffi_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<BaseAddress>0x1D1A0000</BaseAddress>
<AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\Modules\_ctypes\ctypes.h" />
<ClInclude Include="..\Modules\_ctypes\ctypes_dlfcn.h" />
<ClInclude Include="..\Modules\_ctypes\libffi_msvc\ffi.h" />
<ClInclude Include="..\Modules\_ctypes\libffi_msvc\ffi_common.h" />
<ClInclude Include="..\Modules\_ctypes\libffi_msvc\fficonfig.h" />
<ClInclude Include="..\Modules\_ctypes\libffi_msvc\ffitarget.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_ctypes\_ctypes.c" />
<ClCompile Include="..\Modules\_ctypes\callbacks.c" />
<ClCompile Include="..\Modules\_ctypes\callproc.c" />
<ClCompile Include="..\Modules\_ctypes\cfield.c" />
<ClCompile Include="..\Modules\_ctypes\libffi_msvc\ffi.c" />
<ClCompile Include="..\Modules\_ctypes\malloc_closure.c" />
<ClCompile Include="..\Modules\_ctypes\libffi_msvc\prep_cif.c" />
<ClCompile Include="..\Modules\_ctypes\stgdict.c" />
<ClCompile Include="..\Modules\_ctypes\libffi_msvc\win32.c">
<ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
</ClCompile>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\Modules\_ctypes\libffi_msvc\win64.asm">
<ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
<Command>ml64 /nologo /c /Zi /Fo "$(IntDir)win64.obj" "%(FullPath)"</Command>
<Outputs>$(IntDir)win64.obj;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="pythoncore.vcxproj">
<Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{806081ee-2af0-48d0-a83e-ee02a74baa0f}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{dbdea1f2-ad8b-44ca-b782-fcf65d91559b}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\_ctypes\ctypes.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_ctypes\ctypes_dlfcn.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_ctypes\libffi_msvc\ffi.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_ctypes\libffi_msvc\ffi_common.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_ctypes\libffi_msvc\fficonfig.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\_ctypes\libffi_msvc\ffitarget.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_ctypes\_ctypes.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_ctypes\callbacks.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_ctypes\callproc.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_ctypes\cfield.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_ctypes\libffi_msvc\ffi.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_ctypes\malloc_closure.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_ctypes\libffi_msvc\prep_cif.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_ctypes\stgdict.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\_ctypes\libffi_msvc\win32.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\Modules\_ctypes\libffi_msvc\win64.asm">
<Filter>Source Files</Filter>
</CustomBuild>
</ItemGroup>
</Project>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGInstrument|Win32">
<Configuration>PGInstrument</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGInstrument|x64">
<Configuration>PGInstrument</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGUpdate|Win32">
<Configuration>PGUpdate</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGUpdate|x64">
<Configuration>PGUpdate</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{9EC7190A-249F-4180-A900-548FDCF3055F}</ProjectGuid>
<RootNamespace>_ctypes_test</RootNamespace>
<Keyword>Win32Proj</Keyword>
<SupportPGO>false</SupportPGO>
</PropertyGroup>
<Import Project="python.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<PropertyGroup>
<TargetExt>.pyd</TargetExt>
</PropertyGroup>
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="pyproject.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\Modules\_ctypes\_ctypes_test.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_ctypes\_ctypes_test.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="pythoncore.vcxproj">
<Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{8fd70119-5481-4e5d-b187-d0b14eb27e38}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{38abc486-e143-49dc-8cf0-8aefab0e0d3d}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\_ctypes\_ctypes_test.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_ctypes\_ctypes_test.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGInstrument|Win32">
<Configuration>PGInstrument</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGInstrument|x64">
<Configuration>PGInstrument</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGUpdate|Win32">
<Configuration>PGUpdate</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGUpdate|x64">
<Configuration>PGUpdate</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{17E1E049-C309-4D79-843F-AE483C264AEA}</ProjectGuid>
<RootNamespace>_elementtree</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="python.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<PropertyGroup>
<TargetExt>.pyd</TargetExt>
</PropertyGroup>
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="pyproject.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<BaseAddress>0x1D100000</BaseAddress>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\Modules\expat\ascii.h" />
<ClInclude Include="..\Modules\expat\asciitab.h" />
<ClInclude Include="..\Modules\expat\expat.h" />
<ClInclude Include="..\Modules\expat\expat_config.h" />
<ClInclude Include="..\Modules\expat\expat_external.h" />
<ClInclude Include="..\Modules\expat\iasciitab.h" />
<ClInclude Include="..\Modules\expat\internal.h" />
<ClInclude Include="..\Modules\expat\latin1tab.h" />
<ClInclude Include="..\Modules\expat\macconfig.h" />
<ClInclude Include="..\Modules\expat\nametab.h" />
<ClInclude Include="..\Modules\expat\pyexpatns.h" />
<ClInclude Include="..\Modules\expat\utf8tab.h" />
<ClInclude Include="..\Modules\expat\winconfig.h" />
<ClInclude Include="..\Modules\expat\xmlrole.h" />
<ClInclude Include="..\Modules\expat\xmltok.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_elementtree.c" />
<ClCompile Include="..\Modules\expat\xmlparse.c" />
<ClCompile Include="..\Modules\expat\xmlrole.c" />
<ClCompile Include="..\Modules\expat\xmltok.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="pythoncore.vcxproj">
<Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{643d8607-d024-40fe-8583-1823c96430f0}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{7b5335ad-059f-486f-85e4-f4757e26a9bf}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\expat\ascii.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\expat\asciitab.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\expat\expat.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\expat\expat_config.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\expat\expat_external.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\expat\iasciitab.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\expat\internal.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\expat\latin1tab.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\expat\macconfig.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\expat\nametab.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\expat\pyexpatns.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\expat\utf8tab.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\expat\winconfig.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\expat\xmlrole.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\Modules\expat\xmltok.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_elementtree.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\expat\xmlparse.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\expat\xmlrole.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\Modules\expat\xmltok.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGInstrument|Win32">
<Configuration>PGInstrument</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGInstrument|x64">
<Configuration>PGInstrument</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGUpdate|Win32">
<Configuration>PGUpdate</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="PGUpdate|x64">
<Configuration>PGUpdate</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{447F05A8-F581-4CAC-A466-5AC7936E207E}</ProjectGuid>
<RootNamespace>_hashlib</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="python.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<PropertyGroup>
<TargetExt>.pyd</TargetExt>
</PropertyGroup>
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="pyproject.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(opensslDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_hashopenssl.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="pythoncore.vcxproj">
<Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="ssleay.vcxproj">
<Project>{10615b24-73bf-4efa-93aa-236916321317}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="libeay.vcxproj">
<Project>{e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{cc45963d-bd25-4eb8-bdba-a5507090bca4}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_hashopenssl.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
This diff is collapsed.
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{bdef7710-e433-4ac0-84e0-14f34454bd3e}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\PC\_msi.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{695348f7-e9f6-4fe1-bc03-5f08ffc8095b}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_ssl.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
@echo off
rem A batch program to clean a particular configuration,
rem just for convenience.
call %~dp0build.bat -t Clean %*
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment