Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit bbac193

Browse filesBrowse files
paulmonpaulmon
authored
Merge pull request python#19 from paulmon/fix-venvlauncher
Fix venvlauncher
2 parents 964996e + bcd39c1 commit bbac193
Copy full SHA for bbac193

File tree

Expand file treeCollapse file tree

6 files changed

+152
-4
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+152
-4
lines changed

‎Modules/_ctypes/callproc.c

Copy file name to clipboardExpand all lines: Modules/_ctypes/callproc.c
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,8 +781,10 @@ static int _call_function_pointer(int flags,
781781
int *space;
782782
ffi_cif cif;
783783
int cc;
784-
#if defined(MS_WIN32) && !defined(_M_ARM)
784+
#ifdef MS_WIN32
785+
#if !defined(_M_ARM)
785786
int delta;
787+
#endif // _M _ARM
786788
#ifndef DONT_USE_SEH
787789
DWORD dwExceptionCode = 0;
788790
EXCEPTION_RECORD record;

‎PCbuild/build.bat

Copy file name to clipboardExpand all lines: PCbuild/build.bat
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ echo.Available flags to avoid building certain modules.
3737
echo.These flags have no effect if '-e' is not given:
3838
echo. --no-ssl Do not attempt to build _ssl
3939
echo. --no-tkinter Do not attempt to build Tkinter
40+
echo. --no-venv Do not build venv[w]launcher
4041
echo.
4142
echo.Available arguments:
4243
echo. -c Release ^| Debug ^| PGInstrument ^| PGUpdate
@@ -83,10 +84,12 @@ if "%~1"=="-e" (set IncludeExternals=true) & shift & goto CheckOpts
8384
if "%~1"=="-E" (set IncludeExternals=false) & shift & goto CheckOpts
8485
if "%~1"=="--no-ssl" (set IncludeSSL=false) & shift & goto CheckOpts
8586
if "%~1"=="--no-tkinter" (set IncludeTkinter=false) & shift & goto CheckOpts
87+
if "%~1"=="--no-venv" (set IncludeVenvLauncher=false) & shift & goto CheckOpts
8688

8789
if "%IncludeExternals%"=="" set IncludeExternals=true
8890
if "%IncludeSSL%"=="" set IncludeSSL=true
8991
if "%IncludeTkinter%"=="" set IncludeTkinter=true
92+
if "%IncludeVenvLauncher%"=="" set IncludeVenvLauncher=true
9093

9194
if "%IncludeExternals%"=="true" call "%dir%get_externals.bat"
9295

@@ -140,6 +143,7 @@ echo on
140143
/p:Configuration=%conf% /p:Platform=%platf%^
141144
/p:IncludeExternals=%IncludeExternals%^
142145
/p:IncludeSSL=%IncludeSSL% /p:IncludeTkinter=%IncludeTkinter%^
146+
/p:IncludeVenvLauncher=%IncludeVenvLauncher%^
143147
/p:UseTestMarker=%UseTestMarker% %GITProperty%^
144148
%1 %2 %3 %4 %5 %6 %7 %8 %9
145149

‎PCbuild/pcbuild.proj

Copy file name to clipboardExpand all lines: PCbuild/pcbuild.proj
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<IncludeTests Condition="'$(IncludeTest)' == ''">true</IncludeTests>
1010
<IncludeSSL Condition="'$(IncludeSSL)' == ''">true</IncludeSSL>
1111
<IncludeTkinter Condition="'$(IncludeTkinter)' == ''">true</IncludeTkinter>
12+
<IncludeVenvLauncher Condition="'$(IncludeVenvLauncher)' == ''">true</IncludeVenvLauncher>
1213
</PropertyGroup>
1314

1415
<ItemDefinitionGroup>
@@ -71,7 +72,7 @@
7172
<!-- python[w].exe -->
7273
<Projects2 Include="python.vcxproj;pythonw.vcxproj" />
7374
<!-- venv[w]launcher.exe -->
74-
<Projects2 Condition="$(Platform) != 'ARM'" Include="venvlauncher.vcxproj;venvwlauncher.vcxproj" />
75+
<Projects2 Condition="$(IncludeVenvLauncher)" Include="venvlauncher.vcxproj;venvwlauncher.vcxproj" />
7576
</ItemGroup>
7677

7778
<Target Name="Build">

‎PCbuild/pcbuild.sln

Copy file name to clipboardExpand all lines: PCbuild/pcbuild.sln
+96-1Lines changed: 96 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_queue", "_queue.vcxproj",
9393
EndProject
9494
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblzma", "liblzma.vcxproj", "{12728250-16EC-4DC6-94D7-E21DD88947F8}"
9595
EndProject
96+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python_uwp", "python_uwp.vcxproj", "{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}"
97+
EndProject
98+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "venvlauncher", "venvlauncher.vcxproj", "{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}"
99+
EndProject
100+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "venvwlauncher", "venvwlauncher.vcxproj", "{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}"
101+
EndProject
102+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw_uwp", "pythonw_uwp.vcxproj", "{AB603547-1E2A-45B3-9E09-B04596006393}"
103+
EndProject
96104
Global
97105
GlobalSection(SolutionConfigurationPlatforms) = preSolution
98106
Debug|ARM = Debug|ARM
@@ -463,7 +471,6 @@ Global
463471
{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
464472
{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.PGUpdate|x64.Build.0 = PGUpdate|x64
465473
{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|ARM.ActiveCfg = Release|ARM
466-
{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|ARM.Build.0 = Release|ARM
467474
{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|Win32.ActiveCfg = Release|Win32
468475
{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|Win32.Build.0 = Release|Win32
469476
{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}.Release|x64.ActiveCfg = Release|x64
@@ -990,6 +997,94 @@ Global
990997
{12728250-16EC-4DC6-94D7-E21DD88947F8}.Release|Win32.Build.0 = Release|Win32
991998
{12728250-16EC-4DC6-94D7-E21DD88947F8}.Release|x64.ActiveCfg = Release|x64
992999
{12728250-16EC-4DC6-94D7-E21DD88947F8}.Release|x64.Build.0 = Release|x64
1000+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.Debug|ARM.ActiveCfg = Debug|Win32
1001+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.Debug|Win32.ActiveCfg = Debug|Win32
1002+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.Debug|Win32.Build.0 = Debug|Win32
1003+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.Debug|x64.ActiveCfg = Debug|x64
1004+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.Debug|x64.Build.0 = Debug|x64
1005+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.PGInstrument|ARM.ActiveCfg = PGInstrument|Win32
1006+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
1007+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
1008+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
1009+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.PGInstrument|x64.Build.0 = PGInstrument|x64
1010+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.PGUpdate|ARM.ActiveCfg = PGUpdate|Win32
1011+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
1012+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
1013+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
1014+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.PGUpdate|x64.Build.0 = PGUpdate|x64
1015+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.Release|ARM.ActiveCfg = Release|Win32
1016+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.Release|Win32.ActiveCfg = Release|Win32
1017+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.Release|Win32.Build.0 = Release|Win32
1018+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.Release|x64.ActiveCfg = Release|x64
1019+
{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}.Release|x64.Build.0 = Release|x64
1020+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.Debug|ARM.ActiveCfg = Debug|ARM
1021+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.Debug|ARM.Build.0 = Debug|ARM
1022+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.Debug|Win32.ActiveCfg = Debug|Win32
1023+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.Debug|Win32.Build.0 = Debug|Win32
1024+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.Debug|x64.ActiveCfg = Debug|x64
1025+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.Debug|x64.Build.0 = Debug|x64
1026+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.PGInstrument|ARM.ActiveCfg = PGInstrument|ARM
1027+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.PGInstrument|ARM.Build.0 = PGInstrument|ARM
1028+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
1029+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
1030+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
1031+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.PGInstrument|x64.Build.0 = PGInstrument|x64
1032+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.PGUpdate|ARM.ActiveCfg = PGUpdate|ARM
1033+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.PGUpdate|ARM.Build.0 = PGUpdate|ARM
1034+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
1035+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
1036+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
1037+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.PGUpdate|x64.Build.0 = PGUpdate|x64
1038+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.Release|ARM.ActiveCfg = Release|ARM
1039+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.Release|ARM.Build.0 = Release|ARM
1040+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.Release|Win32.ActiveCfg = Release|Win32
1041+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.Release|Win32.Build.0 = Release|Win32
1042+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.Release|x64.ActiveCfg = Release|x64
1043+
{494BAC80-A60C-43A9-99E7-ACB691CE2C4D}.Release|x64.Build.0 = Release|x64
1044+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.Debug|ARM.ActiveCfg = Debug|ARM
1045+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.Debug|ARM.Build.0 = Debug|ARM
1046+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.Debug|Win32.ActiveCfg = Debug|Win32
1047+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.Debug|Win32.Build.0 = Debug|Win32
1048+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.Debug|x64.ActiveCfg = Debug|x64
1049+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.Debug|x64.Build.0 = Debug|x64
1050+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.PGInstrument|ARM.ActiveCfg = PGInstrument|Win32
1051+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.PGInstrument|ARM.Build.0 = PGInstrument|Win32
1052+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
1053+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
1054+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
1055+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.PGInstrument|x64.Build.0 = PGInstrument|x64
1056+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.PGUpdate|ARM.ActiveCfg = PGUpdate|Win32
1057+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.PGUpdate|ARM.Build.0 = PGUpdate|Win32
1058+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
1059+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
1060+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
1061+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.PGUpdate|x64.Build.0 = PGUpdate|x64
1062+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.Release|ARM.ActiveCfg = Release|ARM
1063+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.Release|ARM.Build.0 = Release|ARM
1064+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.Release|Win32.ActiveCfg = Release|Win32
1065+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.Release|Win32.Build.0 = Release|Win32
1066+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.Release|x64.ActiveCfg = Release|x64
1067+
{FDB84CBB-2FB6-47C8-A2D6-091E0833239D}.Release|x64.Build.0 = Release|x64
1068+
{AB603547-1E2A-45B3-9E09-B04596006393}.Debug|ARM.ActiveCfg = Debug|Win32
1069+
{AB603547-1E2A-45B3-9E09-B04596006393}.Debug|Win32.ActiveCfg = Debug|Win32
1070+
{AB603547-1E2A-45B3-9E09-B04596006393}.Debug|Win32.Build.0 = Debug|Win32
1071+
{AB603547-1E2A-45B3-9E09-B04596006393}.Debug|x64.ActiveCfg = Debug|x64
1072+
{AB603547-1E2A-45B3-9E09-B04596006393}.Debug|x64.Build.0 = Debug|x64
1073+
{AB603547-1E2A-45B3-9E09-B04596006393}.PGInstrument|ARM.ActiveCfg = PGInstrument|Win32
1074+
{AB603547-1E2A-45B3-9E09-B04596006393}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
1075+
{AB603547-1E2A-45B3-9E09-B04596006393}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
1076+
{AB603547-1E2A-45B3-9E09-B04596006393}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
1077+
{AB603547-1E2A-45B3-9E09-B04596006393}.PGInstrument|x64.Build.0 = PGInstrument|x64
1078+
{AB603547-1E2A-45B3-9E09-B04596006393}.PGUpdate|ARM.ActiveCfg = PGUpdate|Win32
1079+
{AB603547-1E2A-45B3-9E09-B04596006393}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
1080+
{AB603547-1E2A-45B3-9E09-B04596006393}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
1081+
{AB603547-1E2A-45B3-9E09-B04596006393}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
1082+
{AB603547-1E2A-45B3-9E09-B04596006393}.PGUpdate|x64.Build.0 = PGUpdate|x64
1083+
{AB603547-1E2A-45B3-9E09-B04596006393}.Release|ARM.ActiveCfg = Release|Win32
1084+
{AB603547-1E2A-45B3-9E09-B04596006393}.Release|Win32.ActiveCfg = Release|Win32
1085+
{AB603547-1E2A-45B3-9E09-B04596006393}.Release|Win32.Build.0 = Release|Win32
1086+
{AB603547-1E2A-45B3-9E09-B04596006393}.Release|x64.ActiveCfg = Release|x64
1087+
{AB603547-1E2A-45B3-9E09-B04596006393}.Release|x64.Build.0 = Release|x64
9931088
EndGlobalSection
9941089
GlobalSection(SolutionProperties) = preSolution
9951090
HideSolutionNode = FALSE

‎PCbuild/venvwlauncher.vcxproj

Copy file name to clipboardExpand all lines: PCbuild/venvwlauncher.vcxproj
+16Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|ARM">
5+
<Configuration>Debug</Configuration>
6+
<Platform>ARM</Platform>
7+
</ProjectConfiguration>
48
<ProjectConfiguration Include="Debug|Win32">
59
<Configuration>Debug</Configuration>
610
<Platform>Win32</Platform>
@@ -9,6 +13,10 @@
913
<Configuration>Debug</Configuration>
1014
<Platform>x64</Platform>
1115
</ProjectConfiguration>
16+
<ProjectConfiguration Include="PGInstrument|ARM">
17+
<Configuration>PGInstrument</Configuration>
18+
<Platform>ARM</Platform>
19+
</ProjectConfiguration>
1220
<ProjectConfiguration Include="PGInstrument|Win32">
1321
<Configuration>PGInstrument</Configuration>
1422
<Platform>Win32</Platform>
@@ -17,6 +25,10 @@
1725
<Configuration>PGInstrument</Configuration>
1826
<Platform>x64</Platform>
1927
</ProjectConfiguration>
28+
<ProjectConfiguration Include="PGUpdate|ARM">
29+
<Configuration>PGUpdate</Configuration>
30+
<Platform>ARM</Platform>
31+
</ProjectConfiguration>
2032
<ProjectConfiguration Include="PGUpdate|Win32">
2133
<Configuration>PGUpdate</Configuration>
2234
<Platform>Win32</Platform>
@@ -25,6 +37,10 @@
2537
<Configuration>PGUpdate</Configuration>
2638
<Platform>x64</Platform>
2739
</ProjectConfiguration>
40+
<ProjectConfiguration Include="Release|ARM">
41+
<Configuration>Release</Configuration>
42+
<Platform>ARM</Platform>
43+
</ProjectConfiguration>
2844
<ProjectConfiguration Include="Release|Win32">
2945
<Configuration>Release</Configuration>
3046
<Platform>Win32</Platform>

‎Tools/winiot/sync_win_iot.py

Copy file name to clipboardExpand all lines: Tools/winiot/sync_win_iot.py
+31-1Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ def include_in_tools(p):
127127
FULL_LAYOUT = [
128128
('/', '$source', 'python.exe', is_not_debug),
129129
('/', '$source', 'pythonw.exe', is_not_debug),
130+
('/', '$source', 'venvlauncher.exe', is_not_debug),
131+
('/', '$source', 'venvwlauncher.exe', is_not_debug),
130132
('/', '$source', 'python{}.dll'.format(sys.version_info.major), is_not_debug),
131133
('/', '$source', '{}.dll'.format(BASE_NAME), is_not_debug),
132134
('DLLs/', '$source', '*.pyd', is_not_debug),
@@ -141,6 +143,8 @@ def include_in_tools(p):
141143
FULL_LAYOUT_DEBUG = [
142144
('/', '$source', 'python_d.exe', is_debug),
143145
('/', '$source', 'pythonw_d.exe', is_debug),
146+
('Lib/', '$source', 'venvlauncher_d.exe', is_debug),
147+
('Lib/', '$source', 'venvwlauncher_d.exe', is_debug),
144148
('/', '$source', 'python{}_d.dll'.format(sys.version_info.major), is_debug),
145149
('/', '$source', '{}_d.dll'.format(BASE_NAME), is_debug),
146150
('include/', 'include', '*.h', None),
@@ -269,7 +273,33 @@ def main():
269273
fs = repo / s
270274
print('fs = {}'.format(fs))
271275
files = rglob(fs, p, c, includeDebug)
272-
copied = copy_to_layout(output / t.rstrip('/'), files)
276+
extra_files = []
277+
if s == 'Lib' and p == '**/*':
278+
extra_files.append((
279+
repo / 'tools' / 'msi' / 'distutils.command.bdist_wininst.py',
280+
Path('distutils') / 'command' / 'bdist_wininst.py'
281+
))
282+
if p == 'venvlauncher.exe':
283+
extra_files.append((
284+
source / p,
285+
Path('venv') / 'Scripts' / 'nt' / 'python.exe'
286+
))
287+
if p == 'venvwlauncher.exe':
288+
extra_files.append((
289+
source / p,
290+
Path('venv') / 'Scripts' / 'nt' / 'pythonw.exe'
291+
))
292+
if p == 'venvlauncher_d.exe':
293+
extra_files.append((
294+
source / p,
295+
Path('venv') / 'Scripts' / 'nt' / 'python_d.exe'
296+
))
297+
if p == 'venvwlauncher_d.exe':
298+
extra_files.append((
299+
source / p,
300+
Path('venv') / 'Scripts' / 'nt' / 'pythonw_d.exe'
301+
))
302+
copied = copy_to_layout(output / t.rstrip('/'), chain(files, extra_files))
273303
print('Copied {} files'.format(copied))
274304

275305
print("================================================================================")

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.