]> granicus.if.org Git - handbrake/commitdiff
Update WinGUI build script: allow SignTool.exe location to be specified and assume...
authorFrederick Ding <frederick@frederickding.com>
Thu, 31 May 2018 07:35:03 +0000 (03:35 -0400)
committerScott <628593+sr55@users.noreply.github.com>
Thu, 31 May 2018 07:35:03 +0000 (08:35 +0100)
* 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@d375071be1158deb73ccb1d262310f15f231eca9

* WinGUI: Assume x64 platform in examples

Since 32-bit Windows is no longer supported (HandBrake/HandBrake@ecbd10efbdf286b9a5248fd0a870036cd4437360), 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

win/CS/build.xml

index e50b3ae38af9de21b60ab6c27fcb7338f5339fbf..e493e0047c9ef170614b9adf5ee3cfb0d66ebdcf 100644 (file)
@@ -4,14 +4,14 @@
   Homepage: <http://handbrake.fr>.\r
   It may be used under the terms of the GNU General Public License\r
   \r
-  HandBrake Build Scipt for usage with Jenkins.\r
+  HandBrake Build Script for usage with Jenkins.\r
   Usage: \r
-    msbuild build.xml /p:Platform=x64 /t:Nightly\r
-    msbuild build.xml /p:Platform=x64 /t:Release\r
+    msbuild build.xml /t:Nightly\r
+    msbuild build.xml /t:Release\r
   Example with code signing:\r
-    msbuild build.xml /p:Platform=x64 /t:Release /p:SignThumbprint=XYZ /p:SignTimestampServer=http://time.certum.pl/\r
+    msbuild build.xml /t:Release /p:SignThumbprint=XYZ /p:SignTimestampServer=http://time.certum.pl/\r
     \r
-  Reuqires: libhb.dll to be in the release folder.\r
+  Requires: libhb.dll to be in the release folder.\r
   \r
 -->\r
 <Project DefaultTargets="Nightly" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
@@ -38,7 +38,7 @@
   <Target Name="Nightly" DependsOnTargets="$(NightlyDependsOn)"/>\r
   <Target Name="Release" DependsOnTargets="$(InstallDependsOn)"/>\r
 \r
-  <!-- Build All Components (WPF, ApplicationServices, Interop -->\r
+  <!-- Build All Components (WPF, ApplicationServices, Interop) -->\r
   <Target Name="BuildRelease">\r
     <MSBuild Projects ="@(ProjectsToBuild)"\r
              ContinueOnError ="false"\r
@@ -49,7 +49,7 @@
 \r
   <!-- Code Signing Configuration -->\r
   <PropertyGroup Condition="'$(SignToolLocation)'==''">\r
-    <SighToolLocation>C:\Program Files (x86)\Windows Kits\10\bin\10.0.15063.0\x64\SignTool.exe</SighToolLocation>\r
+    <SignToolLocation>C:\Program Files (x86)\Windows Kits\10\bin\10.0.15063.0\x64\SignTool.exe</SignToolLocation>\r
   </PropertyGroup>\r
 \r
   <PropertyGroup Condition="'$(SignThumbprint)'!=''">\r
@@ -62,7 +62,7 @@
     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />\r
     <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" Condition="$(Platform) == 'x64'" />\r
     <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />\r
-    <Exec Command="&quot;$(SighToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;"  Condition="'$(SignThumbprint)' != ''" />\r
+    <Exec Command="&quot;$(SignToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;"  Condition="'$(SignThumbprint)' != ''" />\r
   </Target>\r
 \r
   <Target Name="ReleasePostBuild">\r
@@ -70,7 +70,7 @@
     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" Condition="$(Platform) == 'x64'" />\r
     <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" Condition="$(Platform) == 'x64'" />\r
     <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\Installer64.nsi" Condition="$(Platform) == 'x64'" />\r
-    <Exec Command="&quot;$(SighToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;"  Condition="'$(SignThumbprint)' != ''" />\r
+    <Exec Command="&quot;$(SignToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;"  Condition="'$(SignThumbprint)' != ''" />\r
   </Target>\r
 \r
-</Project>
\ No newline at end of file
+</Project>\r