##// END OF EJS Templates
packaging: add -python2 to Windows installer filenames...
Gregory Szorc -
r45262:03bb3ce4 default draft
parent child Browse files
Show More
@@ -108,10 +108,10 b" WHEEL_FILENAME_PYTHON37_X64 = 'mercurial"
108 WHEEL_FILENAME_PYTHON38_X86 = 'mercurial-{version}-cp38-cp38-win32.whl'
108 WHEEL_FILENAME_PYTHON38_X86 = 'mercurial-{version}-cp38-cp38-win32.whl'
109 WHEEL_FILENAME_PYTHON38_X64 = 'mercurial-{version}-cp38-cp38-win_amd64.whl'
109 WHEEL_FILENAME_PYTHON38_X64 = 'mercurial-{version}-cp38-cp38-win_amd64.whl'
110
110
111 X86_EXE_FILENAME = 'Mercurial-{version}.exe'
111 X86_EXE_FILENAME = 'Mercurial-{version}-x86-python2.exe'
112 X64_EXE_FILENAME = 'Mercurial-{version}-x64.exe'
112 X64_EXE_FILENAME = 'Mercurial-{version}-x64-python2.exe'
113 X86_MSI_FILENAME = 'mercurial-{version}-x86.msi'
113 X86_MSI_FILENAME = 'mercurial-{version}-x86-python2.msi'
114 X64_MSI_FILENAME = 'mercurial-{version}-x64.msi'
114 X64_MSI_FILENAME = 'mercurial-{version}-x64-python2.msi'
115
115
116 MERCURIAL_SCM_BASE_URL = 'https://mercurial-scm.org/release/windows'
116 MERCURIAL_SCM_BASE_URL = 'https://mercurial-scm.org/release/windows'
117
117
@@ -111,6 +111,7 b' def build_with_py2exe('
111 iscc_exe,
111 iscc_exe,
112 version,
112 version,
113 arch="x64" if vc_x64 else None,
113 arch="x64" if vc_x64 else None,
114 suffix="-python2",
114 )
115 )
115
116
116
117
@@ -150,6 +151,7 b' def build_installer('
150 iscc_exe: pathlib.Path,
151 iscc_exe: pathlib.Path,
151 version,
152 version,
152 arch=None,
153 arch=None,
154 suffix="",
153 ):
155 ):
154 """Build an Inno installer from staged Mercurial files.
156 """Build an Inno installer from staged Mercurial files.
155
157
@@ -214,6 +216,9 b' def build_installer('
214
216
215 if arch:
217 if arch:
216 args.append('/dARCH=%s' % arch)
218 args.append('/dARCH=%s' % arch)
219 args.append('/dSUFFIX=-%s%s' % (arch, suffix))
220 else:
221 args.append('/dSUFFIX=-x86%s' % suffix)
217
222
218 if not version:
223 if not version:
219 version = read_version_py(source_dir)
224 version = read_version_py(source_dir)
@@ -358,6 +358,7 b' def build_installer_py2exe('
358 version=version,
358 version=version,
359 python2=True,
359 python2=True,
360 msi_name=msi_name,
360 msi_name=msi_name,
361 suffix="-python2",
361 extra_wxs=extra_wxs,
362 extra_wxs=extra_wxs,
362 extra_features=extra_features,
363 extra_features=extra_features,
363 signing_info=signing_info,
364 signing_info=signing_info,
@@ -415,6 +416,7 b' def run_wix_packaging('
415 version: str,
416 version: str,
416 python2: bool,
417 python2: bool,
417 msi_name: typing.Optional[str] = "mercurial",
418 msi_name: typing.Optional[str] = "mercurial",
419 suffix: str = "",
418 extra_wxs: typing.Optional[typing.Dict[str, str]] = None,
420 extra_wxs: typing.Optional[typing.Dict[str, str]] = None,
419 extra_features: typing.Optional[typing.List[str]] = None,
421 extra_features: typing.Optional[typing.List[str]] = None,
420 signing_info: typing.Optional[typing.Dict[str, str]] = None,
422 signing_info: typing.Optional[typing.Dict[str, str]] = None,
@@ -489,7 +491,9 b' def run_wix_packaging('
489 run_candle(wix_path, build_dir, source, source_build_rel, defines=defines)
491 run_candle(wix_path, build_dir, source, source_build_rel, defines=defines)
490
492
491 msi_path = (
493 msi_path = (
492 source_dir / 'dist' / ('%s-%s-%s.msi' % (msi_name, orig_version, arch))
494 source_dir
495 / 'dist'
496 / ('%s-%s-%s%s.msi' % (msi_name, orig_version, arch, suffix))
493 )
497 )
494
498
495 args = [
499 args = [
@@ -9,14 +9,13 b''
9 AppCopyright=Copyright 2005-2020 Matt Mackall and others
9 AppCopyright=Copyright 2005-2020 Matt Mackall and others
10 AppName=Mercurial
10 AppName=Mercurial
11 AppVersion={#VERSION}
11 AppVersion={#VERSION}
12 OutputBaseFilename=Mercurial-{#VERSION}{#SUFFIX}
12 #if ARCH == "x64"
13 #if ARCH == "x64"
13 AppVerName=Mercurial {#VERSION} (64-bit)
14 AppVerName=Mercurial {#VERSION} (64-bit)
14 OutputBaseFilename=Mercurial-{#VERSION}-x64
15 ArchitecturesAllowed=x64
15 ArchitecturesAllowed=x64
16 ArchitecturesInstallIn64BitMode=x64
16 ArchitecturesInstallIn64BitMode=x64
17 #else
17 #else
18 AppVerName=Mercurial {#VERSION}
18 AppVerName=Mercurial {#VERSION}
19 OutputBaseFilename=Mercurial-{#VERSION}
20 #endif
19 #endif
21 InfoAfterFile=../postinstall.txt
20 InfoAfterFile=../postinstall.txt
22 LicenseFile=Copying.txt
21 LicenseFile=Copying.txt
General Comments 0
You need to be logged in to leave comments. Login now