diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-07-04 18:48:37 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-07-04 18:48:37 (GMT) |
| commit | 06606e716540d6607a0a5496ab9d81f0ee646247 (patch) | |
| tree | 2d6d9be584b3b92f5a10ecbf65e616c1ed436a55 /Tools/msi/pip | |
| parent | 1b7f6fedb3472b709928e8763d0b86f99fb5d7a9 (diff) | |
| download | cpython-06606e716540d6607a0a5496ab9d81f0ee646247.zip cpython-06606e716540d6607a0a5496ab9d81f0ee646247.tar.gz cpython-06606e716540d6607a0a5496ab9d81f0ee646247.tar.bz2 | |
Ignore user environment/site-packages for ensurepip and compile_all
Remove build condition to prevent old strings hanging around
Add -h option to build.bat
Diffstat (limited to 'Tools/msi/pip')
| -rw-r--r-- | Tools/msi/pip/pip.wxs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/pip/pip.wxs b/Tools/msi/pip/pip.wxs index 4c3dc59..c46a868 100644 --- a/Tools/msi/pip/pip.wxs +++ b/Tools/msi/pip/pip.wxs @@ -27,8 +27,8 @@ <?endif ?> <!-- Install/uninstall pip --> - <CustomAction Id="SetUpdatePipCommandLine" Property="UpdatePip" Value='"[PYTHON_EXE]" -m ensurepip -U --default-pip' Execute="immediate" /> - <CustomAction Id="SetRemovePipCommandLine" Property="UpdatePip" Value='"[PYTHON_EXE]" -B -m ensurepip._uninstall' Execute="immediate" /> + <CustomAction Id="SetUpdatePipCommandLine" Property="UpdatePip" Value='"[PYTHON_EXE]" -E -s -m ensurepip -U --default-pip' Execute="immediate" /> + <CustomAction Id="SetRemovePipCommandLine" Property="UpdatePip" Value='"[PYTHON_EXE]" -E -s -B -m ensurepip._uninstall' Execute="immediate" /> <InstallExecuteSequence> <Custom Action="SetUpdatePipCommandLine" Before="UpdatePip">(&DefaultFeature=3) AND NOT (!DefaultFeature=3)</Custom> |