summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-05-28 22:38:30 (GMT)
committerGitHub <noreply@github.com>2018-05-28 22:38:30 (GMT)
commit100db0b5841e2e593bcdbf4a31c21c4075268cb5 (patch)
tree8e08123c727822d1fb3a6aecaf66a9e512e37474
parent7e8819a589c7630db9d440826143ad0a1daf948e (diff)
downloadcpython-100db0b5841e2e593bcdbf4a31c21c4075268cb5.zip
cpython-100db0b5841e2e593bcdbf4a31c21c4075268cb5.tar.gz
cpython-100db0b5841e2e593bcdbf4a31c21c4075268cb5.tar.bz2
bro-33614: Override exit code in find_msbuild.bat (GH-7169)
(cherry picked from commit f9b364fe51ac083e3e423b1e2cefe0e1ad7d9a60) Co-authored-by: Steve Dower <steve.dower@microsoft.com>
-rw-r--r--PCbuild/find_msbuild.bat1
-rw-r--r--PCbuild/python3dll.vcxproj4
2 files changed, 3 insertions, 2 deletions
diff --git a/PCbuild/find_msbuild.bat b/PCbuild/find_msbuild.bat
index 1364a17..b20fc42 100644
--- a/PCbuild/find_msbuild.bat
+++ b/PCbuild/find_msbuild.bat
@@ -58,3 +58,4 @@
@if not defined MSBUILD @echo Failed to find MSBuild
@set _Py_MSBuild_Source=
@if not defined MSBUILD @exit /b 1
+@exit /b 0
diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj
index 0ef7780..d2a9cae 100644
--- a/PCbuild/python3dll.vcxproj
+++ b/PCbuild/python3dll.vcxproj
@@ -142,8 +142,8 @@
<_Lines Include="@(_Symbols->'%(Symbol)')" />
</ItemGroup>
<MakeDir Directories="$(IntDir)" />
- <Message Text="Updating python3stub.def" Condition="@(_OriginalLines) != @(_Lines)" Importance="high" />
+ <Message Text="Updating python3stub.def" Condition="@(_Lines) != @(_OriginalLines)" Importance="high" />
<WriteLinesToFile File="$(IntDir)python3stub.def" Lines="@(_Lines)" Overwrite="true"
- Condition="@(_DefLines) != @(_Lines)" />
+ Condition="@(_Lines) != @(_OriginalLines)" />
</Target>
</Project> \ No newline at end of file