##// END OF EJS Templates
packaging: move version derivation to run_wix_packaging()...
Gregory Szorc -
r45273:a5740490 stable
parent child Browse files
Show More
@@ -327,12 +327,6 b' def build_installer('
327 327 extra_packages_script=extra_packages_script,
328 328 )
329 329
330 orig_version = version or find_version(source_dir)
331 version = normalize_windows_version(orig_version)
332 print('using version string: %s' % version)
333 if version != orig_version:
334 print('(normalized from: %s)' % orig_version)
335
336 330 build_dir = hg_build_dir / ('wix-%s' % arch)
337 331 staging_dir = build_dir / 'stage'
338 332
@@ -361,7 +355,6 b' def build_installer('
361 355 staging_dir,
362 356 arch,
363 357 version=version,
364 orig_version=orig_version,
365 358 msi_name=msi_name,
366 359 extra_wxs=extra_wxs,
367 360 extra_features=extra_features,
@@ -375,7 +368,6 b' def run_wix_packaging('
375 368 staging_dir: pathlib.Path,
376 369 arch: str,
377 370 version: str,
378 orig_version: str,
379 371 msi_name: typing.Optional[str] = "mercurial",
380 372 extra_wxs: typing.Optional[typing.Dict[str, str]] = None,
381 373 extra_features: typing.Optional[typing.List[str]] = None,
@@ -389,6 +381,13 b' def run_wix_packaging('
389 381 we will sign both the hg.exe and the .msi using the signing credentials
390 382 specified.
391 383 """
384
385 orig_version = version or find_version(source_dir)
386 version = normalize_windows_version(orig_version)
387 print('using version string: %s' % version)
388 if version != orig_version:
389 print('(normalized from: %s)' % orig_version)
390
392 391 if signing_info:
393 392 sign_with_signtool(
394 393 staging_dir / "hg.exe",
General Comments 0
You need to be logged in to leave comments. Login now