diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-09-08 16:27:54 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-09-08 16:27:54 (GMT) |
| commit | 1c4c306626af9fa9a963caf55df2e90739152107 (patch) | |
| tree | 887108ea6f26ad02554b5125970be161a824f479 /Tools/msi/merge.py | |
| parent | 9a46cab6134eb8e575a54cd52d14eb2f679df718 (diff) | |
| download | cpython-1c4c306626af9fa9a963caf55df2e90739152107.zip cpython-1c4c306626af9fa9a963caf55df2e90739152107.tar.gz cpython-1c4c306626af9fa9a963caf55df2e90739152107.tar.bz2 | |
Merged revisions 66304-66305,66307 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66304 | martin.v.loewis | 2008-09-08 14:02:45 +0200 (Mo, 08 Sep 2008) | 2 lines
Allow passing the MSI file name to merge.py.
........
r66305 | martin.v.loewis | 2008-09-08 15:50:10 +0200 (Mo, 08 Sep 2008) | 3 lines
Issue #2271: Set SecureCustomProperties so that installation will properly
use the TARGETDIR even for unprivileged users.
........
r66307 | martin.v.loewis | 2008-09-08 18:15:38 +0200 (Mo, 08 Sep 2008) | 1 line
Add UUIDs for upcoming releases
........
Diffstat (limited to 'Tools/msi/merge.py')
| -rw-r--r-- | Tools/msi/merge.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Tools/msi/merge.py b/Tools/msi/merge.py index ff34b93..4123567 100644 --- a/Tools/msi/merge.py +++ b/Tools/msi/merge.py @@ -1,16 +1,19 @@ -import msilib,os,win32com,tempfile
+import msilib,os,win32com,tempfile,sys
PCBUILD="PCBuild"
from config import *
Win64 = "amd64" in PCBUILD
mod_dir = os.path.join(os.environ["ProgramFiles"], "Common Files", "Merge Modules")
+msi = None
+if len(sys.argv)==2:
+ msi = sys.argv[1]
if Win64:
modules = ["Microsoft_VC90_CRT_x86.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"]
- msi = "python-%s.amd64.msi" % full_current_version
+ if not msi: msi = "python-%s.amd64.msi" % full_current_version
else:
modules = ["Microsoft_VC90_CRT_x86.msm","policy_8_0_Microsoft_VC80_CRT_x86.msm"]
- msi = "python-%s.msi" % full_current_version
+ if not msi: msi = "python-%s.msi" % full_current_version
for i, n in enumerate(modules):
modules[i] = os.path.join(mod_dir, n)
|