summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2001-03-11 04:30:35 (GMT)
committerTim Peters <tim.peters@gmail.com>2001-03-11 04:30:35 (GMT)
commitb2a22f453322ccfcabcdb633d42513e64d65659d (patch)
tree8e2326e669855d33fc2573e35581474f8c895161
parent8e68eb61f25deafc3c3b3beb814e5deadd05a496 (diff)
downloadcpython-b2a22f453322ccfcabcdb633d42513e64d65659d.zip
cpython-b2a22f453322ccfcabcdb633d42513e64d65659d.tar.gz
cpython-b2a22f453322ccfcabcdb633d42513e64d65659d.tar.bz2
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.
-rw-r--r--PC/python_nt.rc1
-rw-r--r--PCbuild/python20.wse5
2 files changed, 5 insertions, 1 deletions
diff --git a/PC/python_nt.rc b/PC/python_nt.rc
index 9162763..3061deb 100644
--- 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 f9bb5c4..cc9be9f 100644
--- 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