Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

SF bug #131225: sys.winver is still '2.0' in python 2.1a2. 

SF patch #103683: Alternative dll version resources.
Changes similar to the patch.  MarkH should review.
File version and Product version text strings now 2.1a2.
64-bit file and product version numbers are now
    PY_MAJOR_VERSION, PY_MINOR_VERSION, messy, PYTHON_API_VERSION
where
    messy = PY_MICRO_VERSION*1000 + PY_RELEASE_LEVEL*10 + PY_RELEASE_SERIAL
Updated company name to "Digital Creations 2".
Copyright now lists Guido; "C in a circle" symbol used instead of (C).
Comments added so this is less likely to get flubbed again, and
#if/#error guys added to trigger if the version number manipulations
above overflow.
This commit is contained in:
Tim Peters 2001-02-09 07:02:22 +00:00
parent b9c24fb543
commit 909bc1cf63
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/ACKS
View File

@ -179,6 +179,7 @@ Nadav Horesh
Ken Howard
Brad Howes
Chih-Hao Huang
Lawrence Hudson
Michael Hudson
Jim Hugunin
Greg Humphreys

44
PC/python_nt.rc
View File

@ -8,18 +8,42 @@
#include "modsupport.h"
#include "patchlevel.h"
#define MS_DLL_ID "2.0"
#define PYTHON_VERSION MS_DLL_ID "." PYTHON_API_STRING "\0"
/* Across releases, change:
* MS_DLL_ID if the minor version number changes.
* PYTHON_DLL_NAME ditto.
*/
#define MS_DLL_ID "2.1"
#ifndef PYTHON_DLL_NAME
#define PYTHON_DLL_NAME "Python21.dll"
#define PYTHON_DLL_NAME "python21.dll"
#endif
/* Nothing below this should need to be changed except for copyright
* notices and company name.
*/
/* e.g., 2.1a2
* PY_VERSION comes from patchevel.h
*/
#define PYTHON_VERSION PY_VERSION "\0"
/* 64-bit version number as comma-separated list of 4 16-bit ints */
#if PY_MICRO_VERSION > 64
# error "PY_MICRO_VERSION > 64"
#endif
#if PY_RELEASE_LEVEL > 99
# error "PY_RELEASE_LEVEL > 99"
#endif
#if PY_RELEASE_SERIAL > 9
# error "PY_RELEASE_SERIAL > 9"
#endif
#define FIELD3 (PY_MICRO_VERSION*1000 + PY_RELEASE_LEVEL*10 + PY_RELEASE_SERIAL)
#define PYVERSION64 PY_MAJOR_VERSION, PY_MINOR_VERSION, FIELD3, PYTHON_API_VERSION
// String Tables
STRINGTABLE DISCARDABLE
BEGIN
1000, MS_DLL_ID
1000, MS_DLL_ID
END
/////////////////////////////////////////////////////////////////////////////
@ -28,8 +52,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,6,0,0
PRODUCTVERSION 1,6,0,0
FILEVERSION PYVERSION64
PRODUCTVERSION PYVERSION64
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -44,11 +68,11 @@ BEGIN
BEGIN
BLOCK "000004b0"
BEGIN
VALUE "CompanyName", "BeOpen.com\0"
VALUE "CompanyName", "Digital Creations 2\0"
VALUE "FileDescription", "Python Core\0"
VALUE "FileVersion", PYTHON_VERSION
VALUE "InternalName", "Python DLL\0"
VALUE "LegalCopyright", "Copyright (c) 2000 BeOpen.com. Copyright (c) 1995-2000 CNRI. Copyright (c) 1990-1995 SMC.\0"
VALUE "LegalCopyright", "Copyright © 2000, 2001 Guido van Rossum. Copyright © 2000 BeOpen.com. Copyright © 1995-2000 CNRI. Copyright © 1991-1995 SMC.\0"
VALUE "OriginalFilename", PYTHON_DLL_NAME "\0"
VALUE "ProductName", "Python\0"
VALUE "ProductVersion", PYTHON_VERSION
@ -59,5 +83,3 @@ BEGIN
VALUE "Translation", 0x0, 1200
END
END
/////////////////////////////////////////////////////////////////////////////