Try to fix Windows builds... (#939)

* Try to fix Windows builds...

* AppVeyor stop being drunk.

* Attempt 3
This commit is contained in:
Pieter-Jan Briers
2020-01-23 00:42:00 +01:00
committed by GitHub
parent 9b8c122f03
commit 4b5cf26153
2 changed files with 15 additions and 3 deletions

View File

@@ -3,15 +3,24 @@
<RobustToolsPath>$(MSBuildThisFileDirectory)/../Tools/</RobustToolsPath>
</PropertyGroup>
<Target Name="CopySwnfd">
<Exec Condition="'$(Platform)' == 'x64'" Command="$(Python) '$(RobustToolsPath)/download_swnfd.py' $(Platform) $(TargetOS) $(OutputPath)" CustomErrorRegularExpression="^Error" />
<CombinePath BasePath="$(RobustToolsPath)" Paths="download_swnfd.py">
<Output TaskParameter="CombinedPaths" PropertyName="ScriptPath" />
</CombinePath>
<Exec Condition="'$(Platform)' == 'x64'" Command="$(Python) &quot;$(ScriptPath)&quot; $(Platform) $(TargetOS) $(OutputPath)" CustomErrorRegularExpression="^Error" />
<Warning Condition="'$(Platform)' != 'x64'" Text="Did not download swnfd because the platform is not set to x64. Only use this build for unit testing!" />
</Target>
<Target Name="CopyGlfw">
<Exec Condition="'$(Platform)' == 'x64'" Command="$(Python) '$(RobustToolsPath)/download_glfw.py' $(Platform) $(TargetOS) $(OutputPath)" CustomErrorRegularExpression="^Error" />
<CombinePath BasePath="$(RobustToolsPath)" Paths="download_glfw.py">
<Output TaskParameter="CombinedPaths" PropertyName="ScriptPath" />
</CombinePath>
<Exec Condition="'$(Platform)' == 'x64'" Command="$(Python) &quot;$(ScriptPath)&quot; $(Platform) $(TargetOS) $(OutputPath)" CustomErrorRegularExpression="^Error" />
<Warning Condition="'$(Platform)' != 'x64'" Text="Did not download GLFW because the platform is not set to x64. Only use this build for unit testing!" />
</Target>
<Target Name="CopyMiscDependencies">
<Exec Condition="'$(Platform)' == 'x64'" Command="$(Python) '$(RobustToolsPath)/download_misc_dependencies.py' $(Platform) $(TargetOS) $(OutputPath)" CustomErrorRegularExpression="^Error" />
<CombinePath BasePath="$(RobustToolsPath)" Paths="download_misc_dependencies.py">
<Output TaskParameter="CombinedPaths" PropertyName="ScriptPath" />
</CombinePath>
<Exec Condition="'$(Platform)' == 'x64'" Command="$(Python) &quot;$(ScriptPath)&quot; $(Platform) $(TargetOS) $(OutputPath)" CustomErrorRegularExpression="^Error" />
<Warning Condition="'$(Platform)' != 'x64'" Text="Did not download misc dependencies because the platform is not set to x64. Only use this build for unit testing!" />
</Target>
<Target Name="ClientAfterBuild" DependsOnTargets="CopyMiscDependencies;CopySwnfd;CopyGlfw" />