##// END OF EJS Templates
inno: stop shipping pywin32...
Gregory Szorc -
r42020:7a1433e9 default
parent child Browse files
Show More
@@ -124,20 +124,6 b' def build(source_dir: pathlib.Path, buil'
124 124 if py_version != 2:
125 125 raise Exception('Only Python 2 is currently supported')
126 126
127 # Some extensions may require DLLs from the Universal C Runtime (UCRT).
128 # These are typically not in PATH and py2exe will have trouble finding
129 # them. We find the Windows 10 SDK and the UCRT files within.
130 sdk_path = (pathlib.Path(os.environ['ProgramFiles(x86)']) /
131 'Windows Kits' / '10' / 'Redist' / 'ucrt' / 'DLLs')
132
133 if vc_x64:
134 sdk_path = sdk_path / 'x64'
135 else:
136 sdk_path = sdk_path / 'x86'
137
138 if not sdk_path.is_dir():
139 raise Exception('UCRT files could not be found at %s' % sdk_path)
140
141 127 build_dir.mkdir(exist_ok=True)
142 128
143 129 gettext_pkg = download_entry(DOWNLOADS['gettext'], build_dir)
@@ -196,11 +182,6 b' def build(source_dir: pathlib.Path, buil'
196 182 env=env,
197 183 check=True)
198 184
199 if str(sdk_path) not in os.environ['PATH'].split(os.pathsep):
200 print('adding %s to PATH' % sdk_path)
201 env['PATH'] = '%s%s%s' % (
202 os.environ['PATH'], os.pathsep, str(sdk_path))
203
204 185 # Register location of msgfmt and other binaries.
205 186 env['PATH'] = '%s%s%s' % (
206 187 env['PATH'], os.pathsep, str(gettext_root / 'bin'))
@@ -8,9 +8,6 b' The following system dependencies must b'
8 8 * Python 2.7 (download from https://www.python.org/downloads/)
9 9 * Microsoft Visual C++ Compiler for Python 2.7
10 10 (https://www.microsoft.com/en-us/download/details.aspx?id=44266)
11 * Windows 10 SDK (download from
12 https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk
13 or install via a modern version of Visual Studio)
14 11 * Inno Setup (http://jrsoftware.org/isdl.php) version 5.4 or newer.
15 12 Be sure to install the optional Inno Setup Preprocessor feature,
16 13 which is required.
@@ -32,15 +32,6 b' pywin32-ctypes==0.2.0 \\'
32 32 --hash=sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942 \
33 33 --hash=sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98 \
34 34 # via keyring
35 pywin32==224 \
36 --hash=sha256:22e218832a54ed206452c8f3ca9eff07ef327f8e597569a4c2828be5eaa09a77 \
37 --hash=sha256:32b37abafbfeddb0fe718008d6aada5a71efa2874f068bee1f9e703983dcc49a \
38 --hash=sha256:35451edb44162d2f603b5b18bd427bc88fcbc74849eaa7a7e7cfe0f507e5c0c8 \
39 --hash=sha256:4eda2e1e50faa706ff8226195b84fbcbd542b08c842a9b15e303589f85bfb41c \
40 --hash=sha256:5f265d72588806e134c8e1ede8561739071626ea4cc25c12d526aa7b82416ae5 \
41 --hash=sha256:6852ceac5fdd7a146b570655c37d9eacd520ed1eaeec051ff41c6fc94243d8bf \
42 --hash=sha256:6dbc4219fe45ece6a0cc6baafe0105604fdee551b5e876dc475d3955b77190ec \
43 --hash=sha256:9bd07746ce7f2198021a9fa187fa80df7b221ec5e4c234ab6f00ea355a3baf99
44 35 urllib3==1.24.1 \
45 36 --hash=sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39 \
46 37 --hash=sha256:de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22 \
@@ -2,4 +2,3 b' docutils'
2 2 dulwich
3 3 keyring
4 4 pygments
5 pywin32
@@ -1286,9 +1286,9 b' if py2exeloaded:'
1286 1286 pass
1287 1287
1288 1288 try:
1289 import pywintypes
1290 pywintypes.TRUE
1291 py2exepackages.append('pywintypes')
1289 import win32ctypes
1290 win32ctypes.__version__
1291 py2exepackages.append('win32ctypes')
1292 1292 except ImportError:
1293 1293 pass
1294 1294
@@ -1372,14 +1372,6 b" setup(name='mercurial',"
1372 1372 options={
1373 1373 'py2exe': {
1374 1374 'packages': py2exepackages,
1375 'dll_excludes': [
1376 'api-ms-win-core-apiquery-l1-1-0.dll',
1377 'api-ms-win-core-delayload-l1-1-0.dll',
1378 'api-ms-win-core-delayload-l1-1-1.dll',
1379 'api-ms-win-core-heap-l2-1-0.dll',
1380 'api-ms-win-core-libraryloader-l1-2-0.dll',
1381 'api-ms-win-core-registry-l1-1-0.dll',
1382 ]
1383 1375 },
1384 1376 'bdist_mpkg': {
1385 1377 'zipdist': False,
General Comments 0
You need to be logged in to leave comments. Login now