Skip to content

Commit

Permalink
Update WinGUI build script: allow SignTool.exe location to be specifi…
Browse files Browse the repository at this point in the history
…ed and assume x64 (HandBrake#1376)

* WinGUI: fix `SignToolLocation` typos in build.xml

Previously, a mismatch between the condition (which checked for an empty `SignToolLocation`) and the action it took (by setting `SighToolLocation`) made it difficult to override the actual location of `SignTool.exe`. The bug was introduced in HandBrake/HandBrake@d375071

* WinGUI: Assume x64 platform in examples

Since 32-bit Windows is no longer supported (HandBrake/HandBrake@ecbd10e), the comment at the top of `build.xml` for WinGUI shouldn't need a platform property anymore. `build.xml` is already set to assume x64 as the default platform.

* WinGUI: minor typo fixes

Just a few aesthetic changes with no effect on functionality
  • Loading branch information
frederickding authored and sr55 committed May 31, 2018
1 parent d8347e1 commit 6e72950
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions win/CS/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
Homepage: <http://handbrake.fr>.
It may be used under the terms of the GNU General Public License
HandBrake Build Scipt for usage with Jenkins.
HandBrake Build Script for usage with Jenkins.
Usage:
msbuild build.xml /p:Platform=x64 /t:Nightly
msbuild build.xml /p:Platform=x64 /t:Release
msbuild build.xml /t:Nightly
msbuild build.xml /t:Release
Example with code signing:
msbuild build.xml /p:Platform=x64 /t:Release /p:SignThumbprint=XYZ /p:SignTimestampServer=http://time.certum.pl/
msbuild build.xml /t:Release /p:SignThumbprint=XYZ /p:SignTimestampServer=http://time.certum.pl/
Reuqires: libhb.dll to be in the release folder.
Requires: libhb.dll to be in the release folder.
-->
<Project DefaultTargets="Nightly" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
Expand All @@ -38,7 +38,7 @@
<Target Name="Nightly" DependsOnTargets="$(NightlyDependsOn)"/>
<Target Name="Release" DependsOnTargets="$(InstallDependsOn)"/>

<!-- Build All Components (WPF, ApplicationServices, Interop -->
<!-- Build All Components (WPF, ApplicationServices, Interop) -->
<Target Name="BuildRelease">
<MSBuild Projects ="@(ProjectsToBuild)"
ContinueOnError ="false"
Expand All @@ -49,7 +49,7 @@

<!-- Code Signing Configuration -->
<PropertyGroup Condition="'$(SignToolLocation)'==''">
<SighToolLocation>C:\Program Files (x86)\Windows Kits\10\bin\10.0.15063.0\x64\SignTool.exe</SighToolLocation>
<SignToolLocation>C:\Program Files (x86)\Windows Kits\10\bin\10.0.15063.0\x64\SignTool.exe</SignToolLocation>
</PropertyGroup>

<PropertyGroup Condition="'$(SignThumbprint)'!=''">
Expand All @@ -62,15 +62,15 @@
<Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />
<Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" Condition="$(Platform) == 'x64'" />
<Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
<Exec Command="&quot;$(SighToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;" Condition="'$(SignThumbprint)' != ''" />
<Exec Command="&quot;$(SignToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;" Condition="'$(SignThumbprint)' != ''" />
</Target>

<Target Name="ReleasePostBuild">
<Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\Installer64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />
<Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />
<Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" Condition="$(Platform) == 'x64'" />
<Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\Installer64.nsi" Condition="$(Platform) == 'x64'" />
<Exec Command="&quot;$(SighToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;" Condition="'$(SignThumbprint)' != ''" />
<Exec Command="&quot;$(SignToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;" Condition="'$(SignThumbprint)' != ''" />
</Target>

</Project>
</Project>

0 comments on commit 6e72950

Please sign in to comment.