Show More
@@ -65,7 +65,6 b' def bootstrap_windows_dev(hga: HGAutomat' | |||||
65 | def build_inno( |
|
65 | def build_inno( | |
66 | hga: HGAutomation, |
|
66 | hga: HGAutomation, | |
67 | aws_region, |
|
67 | aws_region, | |
68 | python_version, |
|
|||
69 | arch, |
|
68 | arch, | |
70 | revision, |
|
69 | revision, | |
71 | version, |
|
70 | version, | |
@@ -80,21 +79,18 b' def build_inno(' | |||||
80 |
|
79 | |||
81 | windows.synchronize_hg(SOURCE_ROOT, revision, instance) |
|
80 | windows.synchronize_hg(SOURCE_ROOT, revision, instance) | |
82 |
|
81 | |||
83 | for py_version in python_version: |
|
82 | for a in arch: | |
84 | for a in arch: |
|
83 | windows.build_inno_installer( | |
85 | windows.build_inno_installer( |
|
84 | instance.winrm_client, | |
86 |
|
|
85 | a, | |
87 |
|
|
86 | DIST_PATH, | |
88 |
|
|
87 | version=version, | |
89 | DIST_PATH, |
|
88 | ) | |
90 | version=version, |
|
|||
91 | ) |
|
|||
92 |
|
89 | |||
93 |
|
90 | |||
94 | def build_wix( |
|
91 | def build_wix( | |
95 | hga: HGAutomation, |
|
92 | hga: HGAutomation, | |
96 | aws_region, |
|
93 | aws_region, | |
97 | python_version, |
|
|||
98 | arch, |
|
94 | arch, | |
99 | revision, |
|
95 | revision, | |
100 | version, |
|
96 | version, | |
@@ -109,15 +105,13 b' def build_wix(' | |||||
109 |
|
105 | |||
110 | windows.synchronize_hg(SOURCE_ROOT, revision, instance) |
|
106 | windows.synchronize_hg(SOURCE_ROOT, revision, instance) | |
111 |
|
107 | |||
112 | for py_version in python_version: |
|
108 | for a in arch: | |
113 | for a in arch: |
|
109 | windows.build_wix_installer( | |
114 | windows.build_wix_installer( |
|
110 | instance.winrm_client, | |
115 |
|
|
111 | a, | |
116 |
|
|
112 | DIST_PATH, | |
117 |
|
|
113 | version=version, | |
118 | DIST_PATH, |
|
114 | ) | |
119 | version=version, |
|
|||
120 | ) |
|
|||
121 |
|
115 | |||
122 |
|
116 | |||
123 | def build_windows_wheel( |
|
117 | def build_windows_wheel( | |
@@ -168,15 +162,14 b' def build_all_windows_packages(' | |||||
168 | dest_path=DIST_PATH, |
|
162 | dest_path=DIST_PATH, | |
169 | ) |
|
163 | ) | |
170 |
|
164 | |||
171 |
for |
|
165 | for arch in ('x86', 'x64'): | |
172 | for arch in ('x86', 'x64'): |
|
166 | windows.purge_hg(winrm_client) | |
173 | windows.purge_hg(winrm_client) |
|
167 | windows.build_inno_installer( | |
174 | windows.build_inno_installer( |
|
168 | winrm_client, arch, DIST_PATH, version=version | |
175 | winrm_client, py_version, arch, DIST_PATH, version=version |
|
169 | ) | |
176 | ) |
|
170 | windows.build_wix_installer( | |
177 | windows.build_wix_installer( |
|
171 | winrm_client, arch, DIST_PATH, version=version | |
178 | winrm_client, py_version, arch, DIST_PATH, version=version |
|
172 | ) | |
179 | ) |
|
|||
180 |
|
173 | |||
181 |
|
174 | |||
182 | def terminate_ec2_instances(hga: HGAutomation, aws_region): |
|
175 | def terminate_ec2_instances(hga: HGAutomation, aws_region): | |
@@ -340,14 +333,6 b' def get_parser():' | |||||
340 | help='Build Inno Setup installer(s)', |
|
333 | help='Build Inno Setup installer(s)', | |
341 | ) |
|
334 | ) | |
342 | sp.add_argument( |
|
335 | sp.add_argument( | |
343 | '--python-version', |
|
|||
344 | help='Which version of Python to target', |
|
|||
345 | choices={3}, |
|
|||
346 | type=int, |
|
|||
347 | nargs='*', |
|
|||
348 | default=[3], |
|
|||
349 | ) |
|
|||
350 | sp.add_argument( |
|
|||
351 | '--arch', |
|
336 | '--arch', | |
352 | help='Architecture to build for', |
|
337 | help='Architecture to build for', | |
353 | choices={'x86', 'x64'}, |
|
338 | choices={'x86', 'x64'}, | |
@@ -402,14 +387,6 b' def get_parser():' | |||||
402 |
|
387 | |||
403 | sp = subparsers.add_parser('build-wix', help='Build WiX installer(s)') |
|
388 | sp = subparsers.add_parser('build-wix', help='Build WiX installer(s)') | |
404 | sp.add_argument( |
|
389 | sp.add_argument( | |
405 | '--python-version', |
|
|||
406 | help='Which version of Python to target', |
|
|||
407 | choices={3}, |
|
|||
408 | type=int, |
|
|||
409 | nargs='*', |
|
|||
410 | default=[3], |
|
|||
411 | ) |
|
|||
412 | sp.add_argument( |
|
|||
413 | '--arch', |
|
390 | '--arch', | |
414 | help='Architecture to build for', |
|
391 | help='Architecture to build for', | |
415 | choices={'x86', 'x64'}, |
|
392 | choices={'x86', 'x64'}, |
@@ -264,7 +264,6 b' def copy_latest_dist(winrm_client, patte' | |||||
264 |
|
264 | |||
265 | def build_inno_installer( |
|
265 | def build_inno_installer( | |
266 | winrm_client, |
|
266 | winrm_client, | |
267 | python_version: int, |
|
|||
268 | arch: str, |
|
267 | arch: str, | |
269 | dest_path: pathlib.Path, |
|
268 | dest_path: pathlib.Path, | |
270 | version=None, |
|
269 | version=None, | |
@@ -274,10 +273,7 b' def build_inno_installer(' | |||||
274 | Using a WinRM client, remote commands are executed to build |
|
273 | Using a WinRM client, remote commands are executed to build | |
275 | a Mercurial Inno Setup installer. |
|
274 | a Mercurial Inno Setup installer. | |
276 | """ |
|
275 | """ | |
277 | print( |
|
276 | print('building Inno Setup installer for %s' % arch) | |
278 | 'building Inno Setup installer for Python %d %s' |
|
|||
279 | % (python_version, arch) |
|
|||
280 | ) |
|
|||
281 |
|
277 | |||
282 | # TODO fix this limitation in packaging code |
|
278 | # TODO fix this limitation in packaging code | |
283 | if not version: |
|
279 | if not version: | |
@@ -319,7 +315,6 b' def build_wheel(' | |||||
319 |
|
315 | |||
320 | def build_wix_installer( |
|
316 | def build_wix_installer( | |
321 | winrm_client, |
|
317 | winrm_client, | |
322 | python_version: int, |
|
|||
323 | arch: str, |
|
318 | arch: str, | |
324 | dest_path: pathlib.Path, |
|
319 | dest_path: pathlib.Path, | |
325 | version=None, |
|
320 | version=None, | |
@@ -328,7 +323,7 b' def build_wix_installer(' | |||||
328 |
|
323 | |||
329 | Using a WinRM client, remote commands are executed to build a WiX installer. |
|
324 | Using a WinRM client, remote commands are executed to build a WiX installer. | |
330 | """ |
|
325 | """ | |
331 |
print('Building WiX installer for |
|
326 | print('Building WiX installer for %s' % arch) | |
332 |
|
327 | |||
333 | # TODO fix this limitation in packaging code |
|
328 | # TODO fix this limitation in packaging code | |
334 | if not version: |
|
329 | if not version: |
General Comments 0
You need to be logged in to leave comments.
Login now