diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-10-31 19:17:11 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-10-31 19:17:11 (GMT) |
| commit | 940f6a8f11b5ef0f9fa85b0be4b95608efebb2e8 (patch) | |
| tree | a75f4cc54fd92dac49b0e9a127d956f7f4e41a3b /Tools/msi/msi.props | |
| parent | f97edf1aa630d507a69885e5a3e9ff8edbe3ea02 (diff) | |
| download | cpython-940f6a8f11b5ef0f9fa85b0be4b95608efebb2e8.zip cpython-940f6a8f11b5ef0f9fa85b0be4b95608efebb2e8.tar.gz cpython-940f6a8f11b5ef0f9fa85b0be4b95608efebb2e8.tar.bz2 | |
Improves handling of test markers for building Python without intefering with actual installs.
Diffstat (limited to 'Tools/msi/msi.props')
| -rw-r--r-- | Tools/msi/msi.props | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props index 01a81b4..bbb8aeb 100644 --- a/Tools/msi/msi.props +++ b/Tools/msi/msi.props @@ -80,17 +80,13 @@ NextMajorVersionNumber=$(MajorVersionNumber).$([msbuild]::Add($(MinorVersionNumber), 1)).0.0; Bitness=$(Bitness); PyDebugExt=$(PyDebugExt); + PyArchExt=$(PyArchExt); + PyTestExt=$(PyTestExt); OptionalFeatureName=$(OutputName); </DefineConstants> <DefineConstants Condition="'$(CRTRedist)' != ''"> $(DefineConstants);CRTRedist=$(CRTRedist); </DefineConstants> - <DefineConstants Condition="$(UseTestMarker) != 'true'"> - $(DefineConstants);TestPrefix=;FileExtension=py; - </DefineConstants> - <DefineConstants Condition="$(UseTestMarker) == 'true'"> - $(DefineConstants);TestPrefix=x;FileExtension=px; - </DefineConstants> <DefineConstants Condition="$(Platform) != 'x64'"> $(DefineConstants);Suffix32=-32; </DefineConstants> |