From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 10 Sep 2015 20:02:14 +0000 (-0500)
Subject: Issue #25022: Merge with 3.4
X-Git-Tag: v3.5.1rc1~397
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=018e380d55a5dbaa383deed6cdf9ba048e840416;p=python

Issue #25022: Merge with 3.4
---

018e380d55a5dbaa383deed6cdf9ba048e840416
diff --cc PC/readme.txt
index 8639dc33d9,99006bfe61..0a96d269b0
--- a/PC/readme.txt
+++ b/PC/readme.txt
@@@ -71,9 -71,12 +71,7 @@@ getpathp.c     Default sys.path calcula
  dllbase_nt.txt A (manually maintained) list of base addresses for
                 various DLLs, to avoid run-time relocation.
  
- example_nt     A subdirectory showing how to build an extension as a
-                DLL.
  
 -Legacy support for older versions of Visual Studio
 -==================================================
 -The subdirectories VC6, VS7.1 and VS8.0 contain legacy support older
 -versions of Microsoft Visual Studio. See PCbuild/readme.txt.
 -
  Note for Windows 3.x and DOS users
  ==================================
  
diff --cc PCbuild/readme.txt
index 7e7ab6424b,a3c7fbd59f..09a996f34c
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@@ -282,27 -288,27 +282,19 @@@ also have to change the "Runtime Librar
  Visual Studio properties
  ------------------------
  
 -The PCbuild solution makes heavy use of Visual Studio property files
 -(*.props). The properties can be viewed and altered in the Property
 -Manager (View -> Other Windows -> Property Manager).
 -
 -The property files used are (+-- = "also imports"):
 - * debug (debug macro: _DEBUG)
 - * pginstrument (PGO)
 - * pgupdate (PGO)
 -    +-- pginstrument
 - * pyd (python extension, release build)
 -    +-- release
 -    +-- pyproject
 - * pyd_d (python extension, debug build)
 -    +-- debug
 -    +-- pyproject
 - * pyproject (base settings for all projects, user macros like PyDllName)
 - * release (release macro: NDEBUG)
 - * sqlite3 (used only by sqlite3.vcxproj)
 - * x64 (AMD64 / x64 platform specific settings)
 -
 -The pyproject property file defines _WIN32 and x64 defines _WIN64 and
 -_M_X64 although the macros are set by the compiler, too. The GUI doesn't
 -always know about the macros and confuse the user with false
 -information.
 +The PCbuild solution makes use of Visual Studio property files (*.props)
 +to simplify each project. The properties can be viewed in the Property
 +Manager (View -> Other Windows -> Property Manager) but should be
 +carefully modified by hand.
 +
 +The property files used are:
 + * python (versions, directories and build names)
 + * pyproject (base settings for all projects)
 + * openssl (used by libeay and ssleay projects)
 + * tcltk (used by _tkinter, tcl, tk and tix projects)
 +
 +The pyproject property file defines all of the build settings for each
 +project, with some projects overriding certain specific values. The GUI
 +doesn't always reflect the correct settings and may confuse the user
 +with false information, especially for settings that automatically adapt
 +for diffirent configurations.
- 
- 
- Your Own Extension DLLs
- -----------------------
- 
- If you want to create your own extension module DLL (.pyd), there's an
- example with easy-to-follow instructions in ..\PC\example_nt\; read the
- file readme.txt there first.