Show More
@@ -12,14 +12,11 b' import pathlib' | |||
|
12 | 12 | import shutil |
|
13 | 13 | import subprocess |
|
14 | 14 | |
|
15 |
from . |
|
|
16 | download_entry, | |
|
15 | from .py2exe import ( | |
|
16 | build_py2exe, | |
|
17 | 17 | ) |
|
18 | 18 | from .util import ( |
|
19 | extract_tar_to_directory, | |
|
20 | extract_zip_to_directory, | |
|
21 | 19 | find_vc_runtime_files, |
|
22 | python_exe_info, | |
|
23 | 20 | ) |
|
24 | 21 | |
|
25 | 22 | |
@@ -37,98 +34,13 b' def build(source_dir: pathlib.Path, buil' | |||
|
37 | 34 | if not iscc_exe.exists(): |
|
38 | 35 | raise Exception('%s does not exist' % iscc_exe) |
|
39 | 36 | |
|
40 | if 'VCINSTALLDIR' not in os.environ: | |
|
41 | raise Exception('not running from a Visual C++ build environment; ' | |
|
42 | 'execute the "Visual C++ <version> Command Prompt" ' | |
|
43 | 'application shortcut or a vcsvarsall.bat file') | |
|
44 | ||
|
45 | # Identity x86/x64 and validate the environment matches the Python | |
|
46 | # architecture. | |
|
47 | vc_x64 = r'\x64' in os.environ['LIB'] | |
|
48 | ||
|
49 | py_info = python_exe_info(python_exe) | |
|
50 | ||
|
51 | if vc_x64: | |
|
52 | if py_info['arch'] != '64bit': | |
|
53 | raise Exception('architecture mismatch: Visual C++ environment ' | |
|
54 | 'is configured for 64-bit but Python is 32-bit') | |
|
55 | else: | |
|
56 | if py_info['arch'] != '32bit': | |
|
57 | raise Exception('architecture mismatch: Visual C++ environment ' | |
|
58 | 'is configured for 32-bit but Python is 64-bit') | |
|
59 | ||
|
60 | if py_info['py3']: | |
|
61 | raise Exception('Only Python 2 is currently supported') | |
|
62 | ||
|
63 | build_dir.mkdir(exist_ok=True) | |
|
64 | ||
|
65 | gettext_pkg, gettext_entry = download_entry('gettext', build_dir) | |
|
66 | gettext_dep_pkg = download_entry('gettext-dep', build_dir)[0] | |
|
67 | virtualenv_pkg, virtualenv_entry = download_entry('virtualenv', build_dir) | |
|
68 | py2exe_pkg, py2exe_entry = download_entry('py2exe', build_dir) | |
|
69 | ||
|
70 | venv_path = build_dir / ('venv-inno-%s' % ('x64' if vc_x64 else 'x86')) | |
|
71 | ||
|
72 | gettext_root = build_dir / ( | |
|
73 | 'gettext-win-%s' % gettext_entry['version']) | |
|
74 | ||
|
75 | if not gettext_root.exists(): | |
|
76 | extract_zip_to_directory(gettext_pkg, gettext_root) | |
|
77 | extract_zip_to_directory(gettext_dep_pkg, gettext_root) | |
|
78 | ||
|
79 | # This assumes Python 2. We don't need virtualenv on Python 3. | |
|
80 | virtualenv_src_path = build_dir / ( | |
|
81 | 'virtualenv-%s' % virtualenv_entry['version']) | |
|
82 | virtualenv_py = virtualenv_src_path / 'virtualenv.py' | |
|
83 | ||
|
84 | if not virtualenv_src_path.exists(): | |
|
85 | extract_tar_to_directory(virtualenv_pkg, build_dir) | |
|
86 | ||
|
87 | py2exe_source_path = build_dir / ('py2exe-%s' % py2exe_entry['version']) | |
|
88 | ||
|
89 | if not py2exe_source_path.exists(): | |
|
90 | extract_zip_to_directory(py2exe_pkg, build_dir) | |
|
91 | ||
|
92 | if not venv_path.exists(): | |
|
93 | print('creating virtualenv with dependencies') | |
|
94 | subprocess.run( | |
|
95 | [str(python_exe), str(virtualenv_py), str(venv_path)], | |
|
96 | check=True) | |
|
97 | ||
|
98 | venv_python = venv_path / 'Scripts' / 'python.exe' | |
|
99 | venv_pip = venv_path / 'Scripts' / 'pip.exe' | |
|
37 | vc_x64 = r'\x64' in os.environ.get('LIB', '') | |
|
100 | 38 | |
|
101 | 39 | requirements_txt = (source_dir / 'contrib' / 'packaging' / |
|
102 | 40 | 'inno' / 'requirements.txt') |
|
103 | subprocess.run([str(venv_pip), 'install', '-r', str(requirements_txt)], | |
|
104 | check=True) | |
|
105 | 41 | |
|
106 | # Force distutils to use VC++ settings from environment, which was | |
|
107 | # validated above. | |
|
108 | env = dict(os.environ) | |
|
109 | env['DISTUTILS_USE_SDK'] = '1' | |
|
110 | env['MSSdk'] = '1' | |
|
111 | ||
|
112 | py2exe_py_path = venv_path / 'Lib' / 'site-packages' / 'py2exe' | |
|
113 | if not py2exe_py_path.exists(): | |
|
114 | print('building py2exe') | |
|
115 | subprocess.run([str(venv_python), 'setup.py', 'install'], | |
|
116 | cwd=py2exe_source_path, | |
|
117 | env=env, | |
|
118 | check=True) | |
|
119 | ||
|
120 | # Register location of msgfmt and other binaries. | |
|
121 | env['PATH'] = '%s%s%s' % ( | |
|
122 | env['PATH'], os.pathsep, str(gettext_root / 'bin')) | |
|
123 | ||
|
124 | print('building Mercurial') | |
|
125 | subprocess.run( | |
|
126 | [str(venv_python), 'setup.py', | |
|
127 | 'py2exe', '-b', '3' if vc_x64 else '2', | |
|
128 | 'build_doc', '--html'], | |
|
129 | cwd=str(source_dir), | |
|
130 | env=env, | |
|
131 | check=True) | |
|
42 | build_py2exe(source_dir, build_dir, python_exe, 'inno', | |
|
43 | requirements_txt) | |
|
132 | 44 | |
|
133 | 45 | # hg.exe depends on VC9 runtime DLLs. Copy those into place. |
|
134 | 46 | for f in find_vc_runtime_files(vc_x64): |
@@ -1,4 +1,4 b'' | |||
|
1 | # inno.py - Inno Setup functionality. | |
|
1 | # py2exe.py - Functionality for performing py2exe builds. | |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2019 Gregory Szorc <gregory.szorc@gmail.com> |
|
4 | 4 | # |
@@ -9,7 +9,6 b'' | |||
|
9 | 9 | |
|
10 | 10 | import os |
|
11 | 11 | import pathlib |
|
12 | import shutil | |
|
13 | 12 | import subprocess |
|
14 | 13 | |
|
15 | 14 | from .downloads import ( |
@@ -18,15 +17,14 b' from .downloads import (' | |||
|
18 | 17 | from .util import ( |
|
19 | 18 | extract_tar_to_directory, |
|
20 | 19 | extract_zip_to_directory, |
|
21 | find_vc_runtime_files, | |
|
22 | 20 | python_exe_info, |
|
23 | 21 | ) |
|
24 | 22 | |
|
25 | 23 | |
|
26 | def build(source_dir: pathlib.Path, build_dir: pathlib.Path, | |
|
27 |
python_exe: pathlib.Path, |
|
|
28 | version=None): | |
|
29 | """Build the Inno installer. | |
|
24 | def build_py2exe(source_dir: pathlib.Path, build_dir: pathlib.Path, | |
|
25 | python_exe: pathlib.Path, build_name: str, | |
|
26 | venv_requirements_txt: pathlib.Path): | |
|
27 | """Build Mercurial with py2exe. | |
|
30 | 28 | |
|
31 | 29 | Build files will be placed in ``build_dir``. |
|
32 | 30 | |
@@ -34,9 +32,6 b' def build(source_dir: pathlib.Path, buil' | |||
|
34 | 32 | for finding the Python 2.7 toolchain. So, we require the environment |
|
35 | 33 | to already be configured with an active toolchain. |
|
36 | 34 | """ |
|
37 | if not iscc_exe.exists(): | |
|
38 | raise Exception('%s does not exist' % iscc_exe) | |
|
39 | ||
|
40 | 35 | if 'VCINSTALLDIR' not in os.environ: |
|
41 | 36 | raise Exception('not running from a Visual C++ build environment; ' |
|
42 | 37 | 'execute the "Visual C++ <version> Command Prompt" ' |
@@ -67,7 +62,8 b' def build(source_dir: pathlib.Path, buil' | |||
|
67 | 62 | virtualenv_pkg, virtualenv_entry = download_entry('virtualenv', build_dir) |
|
68 | 63 | py2exe_pkg, py2exe_entry = download_entry('py2exe', build_dir) |
|
69 | 64 | |
|
70 |
venv_path = build_dir / ('venv- |
|
|
65 | venv_path = build_dir / ('venv-%s-%s' % (build_name, | |
|
66 | 'x64' if vc_x64 else 'x86')) | |
|
71 | 67 | |
|
72 | 68 | gettext_root = build_dir / ( |
|
73 | 69 | 'gettext-win-%s' % gettext_entry['version']) |
@@ -98,9 +94,7 b' def build(source_dir: pathlib.Path, buil' | |||
|
98 | 94 | venv_python = venv_path / 'Scripts' / 'python.exe' |
|
99 | 95 | venv_pip = venv_path / 'Scripts' / 'pip.exe' |
|
100 | 96 | |
|
101 | requirements_txt = (source_dir / 'contrib' / 'packaging' / | |
|
102 | 'inno' / 'requirements.txt') | |
|
103 | subprocess.run([str(venv_pip), 'install', '-r', str(requirements_txt)], | |
|
97 | subprocess.run([str(venv_pip), 'install', '-r', str(venv_requirements_txt)], | |
|
104 | 98 | check=True) |
|
105 | 99 | |
|
106 | 100 | # Force distutils to use VC++ settings from environment, which was |
@@ -129,30 +123,3 b' def build(source_dir: pathlib.Path, buil' | |||
|
129 | 123 | cwd=str(source_dir), |
|
130 | 124 | env=env, |
|
131 | 125 | check=True) |
|
132 | ||
|
133 | # hg.exe depends on VC9 runtime DLLs. Copy those into place. | |
|
134 | for f in find_vc_runtime_files(vc_x64): | |
|
135 | if f.name.endswith('.manifest'): | |
|
136 | basename = 'Microsoft.VC90.CRT.manifest' | |
|
137 | else: | |
|
138 | basename = f.name | |
|
139 | ||
|
140 | dest_path = source_dir / 'dist' / basename | |
|
141 | ||
|
142 | print('copying %s to %s' % (f, dest_path)) | |
|
143 | shutil.copyfile(f, dest_path) | |
|
144 | ||
|
145 | print('creating installer') | |
|
146 | ||
|
147 | args = [str(iscc_exe)] | |
|
148 | ||
|
149 | if vc_x64: | |
|
150 | args.append('/dARCH=x64') | |
|
151 | ||
|
152 | if version: | |
|
153 | args.append('/dVERSION=%s' % version) | |
|
154 | ||
|
155 | args.append('/Odist') | |
|
156 | args.append('contrib/packaging/inno/mercurial.iss') | |
|
157 | ||
|
158 | subprocess.run(args, cwd=str(source_dir), check=True) |
@@ -14,6 +14,7 b' New errors are not allowed. Warnings are' | |||
|
14 | 14 | > | sed 's-\\-/-g' | "$check_code" --warnings --per-file=0 - || false |
|
15 | 15 | Skipping contrib/packaging/hgpackaging/downloads.py it has no-che?k-code (glob) |
|
16 | 16 | Skipping contrib/packaging/hgpackaging/inno.py it has no-che?k-code (glob) |
|
17 | Skipping contrib/packaging/hgpackaging/py2exe.py it has no-che?k-code (glob) | |
|
17 | 18 | Skipping contrib/packaging/hgpackaging/util.py it has no-che?k-code (glob) |
|
18 | 19 | Skipping contrib/packaging/inno/build.py it has no-che?k-code (glob) |
|
19 | 20 | Skipping i18n/polib.py it has no-che?k-code (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now