[Python-checkins] CVS: python/dist/src/PC python_nt.rc,1.11,1.12

[Tim Peters]

Update of /cvsroot/python/python/dist/src/PC
In directory usw-pr-cvs1:/tmp/cvs-serv11828/python/dist/src/PC

Modified Files:
	python_nt.rc 
Log Message:
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.


Index: python_nt.rc
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/python_nt.rc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** python_nt.rc	2001/01/17 23:23:13	1.11
--- python_nt.rc	2001/02/09 07:02:22	1.12
***************
*** 9,24 ****
  #include "patchlevel.h"
  
! #define MS_DLL_ID "2.0"
  
- #define PYTHON_VERSION MS_DLL_ID "." PYTHON_API_STRING "\0"
- 
  #ifndef PYTHON_DLL_NAME
! #define PYTHON_DLL_NAME "Python21.dll"
  #endif
  
  // String Tables
  STRINGTABLE DISCARDABLE
  BEGIN
! 	1000,	MS_DLL_ID
  END
  
--- 9,48 ----
  #include "patchlevel.h"
  
! /* 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"
  #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
  END
  
***************
*** 29,34 ****
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 1,6,0,0
!  PRODUCTVERSION 1,6,0,0
   FILEFLAGSMASK 0x3fL
  #ifdef _DEBUG
--- 53,58 ----
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION PYVERSION64
!  PRODUCTVERSION PYVERSION64
   FILEFLAGSMASK 0x3fL
  #ifdef _DEBUG
***************
*** 45,53 ****
          BLOCK "000004b0"
          BEGIN
!             VALUE "CompanyName", "BeOpen.com\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 "OriginalFilename", PYTHON_DLL_NAME "\0"
              VALUE "ProductName", "Python\0"
--- 69,77 ----
          BLOCK "000004b0"
          BEGIN
!             VALUE "CompanyName", "Digital Creations 2\0"
              VALUE "FileDescription", "Python Core\0"
              VALUE "FileVersion", PYTHON_VERSION
              VALUE "InternalName", "Python DLL\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"
***************
*** 60,63 ****
      END
  END
- 
- /////////////////////////////////////////////////////////////////////////////
--- 84,85 ----