diff --git a/Misc/NEWS b/Misc/NEWS index 38545454cbe..0d1e5db48ef 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ What's New in Python 2.6 alpha 1? Core and builtins ----------------- +- Moved PCbuild/ directory for VS 2003 to PC/VS7.1 and renamed PCBuild9/ + directory to PCBuild/. + - Issue #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. diff --git a/PCbuild9/_bsddb.vcproj b/PCbuild/_bsddb.vcproj similarity index 100% rename from PCbuild9/_bsddb.vcproj rename to PCbuild/_bsddb.vcproj diff --git a/PCbuild9/_ctypes.vcproj b/PCbuild/_ctypes.vcproj similarity index 100% rename from PCbuild9/_ctypes.vcproj rename to PCbuild/_ctypes.vcproj diff --git a/PCbuild9/_ctypes_test.vcproj b/PCbuild/_ctypes_test.vcproj similarity index 100% rename from PCbuild9/_ctypes_test.vcproj rename to PCbuild/_ctypes_test.vcproj diff --git a/PCbuild9/_elementtree.vcproj b/PCbuild/_elementtree.vcproj similarity index 100% rename from PCbuild9/_elementtree.vcproj rename to PCbuild/_elementtree.vcproj diff --git a/PCbuild9/_msi.vcproj b/PCbuild/_msi.vcproj similarity index 100% rename from PCbuild9/_msi.vcproj rename to PCbuild/_msi.vcproj diff --git a/PCbuild9/_socket.vcproj b/PCbuild/_socket.vcproj similarity index 100% rename from PCbuild9/_socket.vcproj rename to PCbuild/_socket.vcproj diff --git a/PCbuild9/_sqlite3.vcproj b/PCbuild/_sqlite3.vcproj similarity index 100% rename from PCbuild9/_sqlite3.vcproj rename to PCbuild/_sqlite3.vcproj diff --git a/PCbuild9/_ssl.vcproj b/PCbuild/_ssl.vcproj similarity index 100% rename from PCbuild9/_ssl.vcproj rename to PCbuild/_ssl.vcproj diff --git a/PCbuild9/_testcapi.vcproj b/PCbuild/_testcapi.vcproj similarity index 100% rename from PCbuild9/_testcapi.vcproj rename to PCbuild/_testcapi.vcproj diff --git a/PCbuild9/_tkinter.vcproj b/PCbuild/_tkinter.vcproj similarity index 100% rename from PCbuild9/_tkinter.vcproj rename to PCbuild/_tkinter.vcproj diff --git a/PCbuild9/bdist_wininst.vcproj b/PCbuild/bdist_wininst.vcproj similarity index 100% rename from PCbuild9/bdist_wininst.vcproj rename to PCbuild/bdist_wininst.vcproj diff --git a/PCbuild9/build.bat b/PCbuild/build.bat similarity index 100% rename from PCbuild9/build.bat rename to PCbuild/build.bat diff --git a/PCbuild9/build_env.bat b/PCbuild/build_env.bat similarity index 100% rename from PCbuild9/build_env.bat rename to PCbuild/build_env.bat diff --git a/PCbuild9/build_pgo.bat b/PCbuild/build_pgo.bat similarity index 100% rename from PCbuild9/build_pgo.bat rename to PCbuild/build_pgo.bat diff --git a/PCbuild9/build_ssl.bat b/PCbuild/build_ssl.bat similarity index 100% rename from PCbuild9/build_ssl.bat rename to PCbuild/build_ssl.bat diff --git a/PCbuild9/build_ssl.py b/PCbuild/build_ssl.py similarity index 100% rename from PCbuild9/build_ssl.py rename to PCbuild/build_ssl.py diff --git a/PCbuild9/build_tkinter.py b/PCbuild/build_tkinter.py similarity index 100% rename from PCbuild9/build_tkinter.py rename to PCbuild/build_tkinter.py diff --git a/PCbuild9/bz2.vcproj b/PCbuild/bz2.vcproj similarity index 100% rename from PCbuild9/bz2.vcproj rename to PCbuild/bz2.vcproj diff --git a/PCbuild9/debug.vsprops b/PCbuild/debug.vsprops similarity index 100% rename from PCbuild9/debug.vsprops rename to PCbuild/debug.vsprops diff --git a/PCbuild9/env.bat b/PCbuild/env.bat similarity index 100% rename from PCbuild9/env.bat rename to PCbuild/env.bat diff --git a/PCbuild9/field3.py b/PCbuild/field3.py similarity index 100% rename from PCbuild9/field3.py rename to PCbuild/field3.py diff --git a/PCbuild9/idle.bat b/PCbuild/idle.bat similarity index 100% rename from PCbuild9/idle.bat rename to PCbuild/idle.bat diff --git a/PCbuild9/installer.bmp b/PCbuild/installer.bmp similarity index 100% rename from PCbuild9/installer.bmp rename to PCbuild/installer.bmp diff --git a/PCbuild9/make_buildinfo.c b/PCbuild/make_buildinfo.c similarity index 100% rename from PCbuild9/make_buildinfo.c rename to PCbuild/make_buildinfo.c diff --git a/PCbuild9/make_buildinfo.vcproj b/PCbuild/make_buildinfo.vcproj similarity index 100% rename from PCbuild9/make_buildinfo.vcproj rename to PCbuild/make_buildinfo.vcproj diff --git a/PCbuild9/make_versioninfo.vcproj b/PCbuild/make_versioninfo.vcproj similarity index 100% rename from PCbuild9/make_versioninfo.vcproj rename to PCbuild/make_versioninfo.vcproj diff --git a/PCbuild9/pcbuild.sln b/PCbuild/pcbuild.sln similarity index 100% rename from PCbuild9/pcbuild.sln rename to PCbuild/pcbuild.sln diff --git a/PCbuild9/pginstrument.vsprops b/PCbuild/pginstrument.vsprops similarity index 100% rename from PCbuild9/pginstrument.vsprops rename to PCbuild/pginstrument.vsprops diff --git a/PCbuild9/pgupdate.vsprops b/PCbuild/pgupdate.vsprops similarity index 100% rename from PCbuild9/pgupdate.vsprops rename to PCbuild/pgupdate.vsprops diff --git a/PCbuild9/pyd.vsprops b/PCbuild/pyd.vsprops similarity index 100% rename from PCbuild9/pyd.vsprops rename to PCbuild/pyd.vsprops diff --git a/PCbuild9/pyd_d.vsprops b/PCbuild/pyd_d.vsprops similarity index 100% rename from PCbuild9/pyd_d.vsprops rename to PCbuild/pyd_d.vsprops diff --git a/PCbuild9/pyexpat.vcproj b/PCbuild/pyexpat.vcproj similarity index 100% rename from PCbuild9/pyexpat.vcproj rename to PCbuild/pyexpat.vcproj diff --git a/PCbuild9/pyproject.vsprops b/PCbuild/pyproject.vsprops similarity index 100% rename from PCbuild9/pyproject.vsprops rename to PCbuild/pyproject.vsprops diff --git a/PCbuild9/python.vcproj b/PCbuild/python.vcproj similarity index 100% rename from PCbuild9/python.vcproj rename to PCbuild/python.vcproj diff --git a/PCbuild9/pythoncore.vcproj b/PCbuild/pythoncore.vcproj similarity index 100% rename from PCbuild9/pythoncore.vcproj rename to PCbuild/pythoncore.vcproj diff --git a/PCbuild9/pythonw.vcproj b/PCbuild/pythonw.vcproj similarity index 100% rename from PCbuild9/pythonw.vcproj rename to PCbuild/pythonw.vcproj diff --git a/PCbuild9/readme.txt b/PCbuild/readme.txt similarity index 97% rename from PCbuild9/readme.txt rename to PCbuild/readme.txt index ef3b97da884..fe264e363ef 100644 --- a/PCbuild9/readme.txt +++ b/PCbuild/readme.txt @@ -11,7 +11,7 @@ build the solution. Unless you are going to debug a problem in the core or you are going to create an optimized build you want to select "Release" as configuration. -The PCbuild9 directory is compatible with all versions of Visual Studio from +The PCbuild directory is compatible with all versions of Visual Studio from VS C++ Express Edition over the standard edition up to the professional edition. However the express edition does support features like solution folders or profile guided optimization (PGO). The missing bits and pieces @@ -32,7 +32,7 @@ NOTE: When using the Debug setting, the output files have a _d added to their name: python30_d.dll, python_d.exe, parser_d.pyd, and so on. -The 32bit builds end up in the solution folder PCbuild9 while the x64 builds +The 32bit builds end up in the solution folder PCbuild while the x64 builds land in the amd64 subfolder. The PGI and PGO builds for profile guided optimization end up in their own folders, too. @@ -67,7 +67,7 @@ winsound The following subprojects will generally NOT build out of the box. They wrap code Python doesn't control, and you'll need to download the base packages first and unpack them into siblings of PCbuilds's parent -directory; for example, if your PCbuild9 is ..\dist\py3k\PCbuild9\, +directory; for example, if your PCbuild is ..\dist\py3k\PCbuild\, unpack into new subdirectories of ..\dist\. _tkinter @@ -85,7 +85,7 @@ _tkinter Build with build_tkinter.py --------------------------- - The PCbuild9 directory contains a Python script which automates all + The PCbuild directory contains a Python script which automates all steps. Run the script in a Visual Studio 2009 command prompt with python build_tkinter.py Win32 @@ -145,7 +145,7 @@ bz2 A custom pre-link step in the bz2 project settings should manage to build bzip2-1.0.3\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is - linked in PCbuild9\. + linked in PCbuild\. However, the bz2 project is not smart enough to remove anything under bzip2-1.0.3\ when you do a clean, so if you want to rebuild bzip2.lib you need to clean up bzip2-1.0.3\ by hand. @@ -304,7 +304,7 @@ change the "Runtime Library" from "Multi-threaded DLL (/MD)" to Visual Studio properties ------------------------ -The PCbuild9 solution makes heavy use of Visual Studio property files +The PCbuild solution makes heavy use of Visual Studio property files (*.vsprops). The properties can be viewed and altered in the Property Manager (View -> Other Windows -> Property Manager). diff --git a/PCbuild9/release.vsprops b/PCbuild/release.vsprops similarity index 100% rename from PCbuild9/release.vsprops rename to PCbuild/release.vsprops diff --git a/PCbuild9/rmpyc.py b/PCbuild/rmpyc.py similarity index 100% rename from PCbuild9/rmpyc.py rename to PCbuild/rmpyc.py diff --git a/PCbuild9/rt.bat b/PCbuild/rt.bat similarity index 100% rename from PCbuild9/rt.bat rename to PCbuild/rt.bat diff --git a/PCbuild9/select.vcproj b/PCbuild/select.vcproj similarity index 100% rename from PCbuild9/select.vcproj rename to PCbuild/select.vcproj diff --git a/PCbuild9/unicodedata.vcproj b/PCbuild/unicodedata.vcproj similarity index 100% rename from PCbuild9/unicodedata.vcproj rename to PCbuild/unicodedata.vcproj diff --git a/PCbuild9/w9xpopen.vcproj b/PCbuild/w9xpopen.vcproj similarity index 100% rename from PCbuild9/w9xpopen.vcproj rename to PCbuild/w9xpopen.vcproj diff --git a/PCbuild9/winsound.vcproj b/PCbuild/winsound.vcproj similarity index 100% rename from PCbuild9/winsound.vcproj rename to PCbuild/winsound.vcproj diff --git a/PCbuild9/x64.vsprops b/PCbuild/x64.vsprops similarity index 100% rename from PCbuild9/x64.vsprops rename to PCbuild/x64.vsprops