Magic strings in both Python and the Wise installer define the registry key

to be used in Windows.  They got out of synch.  Repaired that, and added
comments to each one pointing at the other.

diff --git a/PC/python_nt.rc b/PC/python_nt.rc
index 91627637daccecaa44cc065142fd46a23979a720..3061deb7ab05e3b81a90ba8d6c345aa4126f5b39 100644 (file)
--- a/PC/python_nt.rc
+++ b/PC/python_nt.rc
@@ -11,6 +11,7 @@
 /* Across releases, change:
  *    MS_DLL_ID if the minor version number changes.
  *    PYTHON_DLL_NAME ditto.
+ * MS_DLL_ID must match PY_VERSION in the Windows install script.
  */
 #define MS_DLL_ID "2.1"
 

diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index f9bb5c4382f1ae2576cac7c062f7a328e39dfa13..cc9be9fb1ff9d1f25124aeb3becaefbc29ce99d1 100644 (file)
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -70,9 +70,12 @@ item: Set Variable
   Variable=GROUP
   Value=Python 2.1
 end
+item: Remark
+  Text=PY_VERSION should be major.minor only; used to create the registry key; must match MS_DLL_ID in python_nt.rc
+end
 item: Set Variable
   Variable=PY_VERSION
-  Value=2.1b1
+  Value=2.1
 end
 item: Set Variable
   Variable=MAINDIR