Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(28469)

Side by Side Diff: Tools/msi/msi.py

Issue 11535: Misspelled architecture
Patch Set: Created 8 years, 6 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Python MSI Generator 1 # Python MSI Generator
2 # (C) 2003 Martin v. Loewis 2 # (C) 2003 Martin v. Loewis
3 # See "FOO" in comments refers to MSDN sections with the title FOO. 3 # See "FOO" in comments refers to MSDN sections with the title FOO.
4 import msilib, schema, sequence, os, glob, time, re, shutil, zipfile 4 import msilib, schema, sequence, os, glob, time, re, shutil, zipfile
5 from msilib import Feature, CAB, Directory, Dialog, Binary, add_data 5 from msilib import Feature, CAB, Directory, Dialog, Binary, add_data
6 import uisample 6 import uisample
7 from win32com.client import constants 7 from win32com.client import constants
8 from distutils.spawn import find_executable 8 from distutils.spawn import find_executable
9 from uuids import product_codes 9 from uuids import product_codes
10 import tempfile 10 import tempfile
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 return True 171 return True
172 172
173 # Target files (.def and .a) go in PCBuild directory 173 # Target files (.def and .a) go in PCBuild directory
174 lib_file = os.path.join(srcdir, PCBUILD, "python%s%s.lib" % (major, minor)) 174 lib_file = os.path.join(srcdir, PCBUILD, "python%s%s.lib" % (major, minor))
175 def_file = os.path.join(srcdir, PCBUILD, "python%s%s.def" % (major, minor)) 175 def_file = os.path.join(srcdir, PCBUILD, "python%s%s.def" % (major, minor))
176 dll_file = "python%s%s.dll" % (major, minor) 176 dll_file = "python%s%s.dll" % (major, minor)
177 mingw_lib = os.path.join(srcdir, PCBUILD, "libpython%s%s.a" % (major, minor)) 177 mingw_lib = os.path.join(srcdir, PCBUILD, "libpython%s%s.a" % (major, minor))
178 178
179 have_mingw = build_mingw_lib(lib_file, def_file, dll_file, mingw_lib) 179 have_mingw = build_mingw_lib(lib_file, def_file, dll_file, mingw_lib)
180 180
181 # Determine the target architechture 181 # Determine the target architecture
182 dll_path = os.path.join(srcdir, PCBUILD, dll_file) 182 dll_path = os.path.join(srcdir, PCBUILD, dll_file)
183 msilib.set_arch_from_file(dll_path) 183 msilib.set_arch_from_file(dll_path)
184 if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"): 184 if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"):
185 raise SystemError("msisupport.dll for incorrect architecture") 185 raise SystemError("msisupport.dll for incorrect architecture")
186 if msilib.Win64: 186 if msilib.Win64:
187 upgrade_code = upgrade_code_64 187 upgrade_code = upgrade_code_64
188 # Bump the last digit of the code by one, so that 32-bit and 64-bit 188 # Bump the last digit of the code by one, so that 32-bit and 64-bit
189 # releases get separate product codes 189 # releases get separate product codes
190 digit = hex((int(product_code[-2],16)+1)%16)[-1] 190 digit = hex((int(product_code[-2],16)+1)%16)[-1]
191 product_code = product_code[:-2] + digit + '}' 191 product_code = product_code[:-2] + digit + '}'
(...skipping 1218 matching lines...) Expand 10 before | Expand all | Expand 10 after
1410 1410
1411 merge(msiname, "SharedCRT", "TARGETDIR", modules) 1411 merge(msiname, "SharedCRT", "TARGETDIR", modules)
1412 1412
1413 # certname (from config.py) should be (a substring of) 1413 # certname (from config.py) should be (a substring of)
1414 # the certificate subject, e.g. "Python Software Foundation" 1414 # the certificate subject, e.g. "Python Software Foundation"
1415 if certname: 1415 if certname:
1416 os.system('signtool sign /n "%s" /t http://timestamp.verisign.com/scripts/ti mestamp.dll %s' % (certname, msiname)) 1416 os.system('signtool sign /n "%s" /t http://timestamp.verisign.com/scripts/ti mestamp.dll %s' % (certname, msiname))
1417 1417
1418 if pdbzip: 1418 if pdbzip:
1419 build_pdbzip() 1419 build_pdbzip()
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

RSS Feeds Recent Issues | This issue
This is Rietveld 894c83f36cb7+