]> granicus.if.org Git - python/commitdiff
Revert incorrect file merge from 3.5.
authorSteve Dower <steve.dower@microsoft.com>
Thu, 27 Oct 2016 19:14:48 +0000 (12:14 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Thu, 27 Oct 2016 19:14:48 +0000 (12:14 -0700)
Tools/msi/make_zip.proj

index 13f75ba84931db9c6666af02e65f20260eab8529..d2e031f6b6aba14a6afd6602582a1af30c5d4153 100644 (file)
@@ -16,7 +16,7 @@
         <TargetPath>$(OutputPath)\en-us\$(TargetName)$(TargetExt)</TargetPath>
         <CleanCommand>rmdir /q/s "$(IntermediateOutputPath)\zip_$(ArchName)"</CleanCommand>
         <Arguments>"$(PythonExe)" "$(MSBuildThisFileDirectory)\make_zip.py"</Arguments>
-        <Arguments>$(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -b "$(OutDir.TrimEnd('\'))"</Arguments>
+        <Arguments>$(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -a $(ArchName)</Arguments>
         <Environment>set DOC_FILENAME=python$(PythonVersion).chm
 set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.CRT</Environment>
     </PropertyGroup>