Kaydet (Commit) 2f507850 authored tarafından Thomas Heller's avatar Thomas Heller

Backport from the trunk.

To build on windows, the manual editing of the python_nt.rc file to
change the version number is no longer required.

Instead, a make_versioninfo.exe is compiled, which spits out an
include file for python_nt.rc.
üst c7cd9cff
...@@ -6,42 +6,12 @@ ...@@ -6,42 +6,12 @@
#define MS_WINDOWS #define MS_WINDOWS
#include "modsupport.h" #include "modsupport.h"
#include "patchlevel.h" #include "patchlevel.h"
#ifdef _DEBUG
/* Across releases, change: # include "pythonnt_rc_d.h"
* MS_DLL_ID if the minor version number changes. #else
* PYTHON_DLL_NAME ditto. # include "pythonnt_rc.h"
* MS_DLL_ID must match PY_VERSION in the Windows install script.
*/
#define MS_DLL_ID "2.3"
#ifndef PYTHON_DLL_NAME
#define PYTHON_DLL_NAME "python23.dll"
#endif #endif
/* Nothing below this should need to be changed except for copyright
* notices, company name, and FIELD3. Unfortunately, all attempts
* to get the resource compiler to do arithmetic in macros have
* failed miserably -- it gives syntax errors, ignores operators,
* or does stuff that's simply bizarre.
*/
/* This is what we'd like FIELD3 to be:
*
* #define FIELD3 (PY_MICRO_VERSION*1000 + PY_RELEASE_LEVEL*10 + PY_RELEASE_SERIAL)
*
* but that neither gives an error nor comes anywhere close to working. The
* following comment and #define are output from PCbuild\field3.py:
*
* For 2.3.2,
* PY_MICRO_VERSION = 2
* PY_RELEASE_LEVEL = 'final' = 0xf
* PY_RELEASE_SERIAL = 0
*
* and 2*1000 + 15*10 + 0 = 2150
*/
#define FIELD3 2150
/* e.g., 2.1a2 /* e.g., 2.1a2
* PY_VERSION comes from patchevel.h * PY_VERSION comes from patchevel.h
*/ */
......
...@@ -159,6 +159,18 @@ Package=<4> ...@@ -159,6 +159,18 @@ Package=<4>
############################################################################### ###############################################################################
Project: "make_versioninfo"=.\make_versioninfo.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "mmap"=.\mmap.dsp - Package Owner=<4> Project: "mmap"=.\mmap.dsp - Package Owner=<4>
Package=<5> Package=<5>
...@@ -227,6 +239,9 @@ Package=<5> ...@@ -227,6 +239,9 @@ Package=<5>
Package=<4> Package=<4>
{{{ {{{
Begin Project Dependency
Project_Dep_Name make_versioninfo
End Project Dependency
}}} }}}
############################################################################### ###############################################################################
......
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