diff options
| author | Scott <[email protected]> | 2020-04-04 20:46:13 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-04-04 20:46:13 +0100 |
| commit | ac9818ad863595ab6bc2dec5d36912f5b02b82bb (patch) | |
| tree | a8a86c2d9f2e5c7f8f9055e8a6a39610f8bcb829 /win | |
| parent | 60a96631589fc5afbfa506b35fb8e1311b4ac870 (diff) | |
New installer (#2739)
* WinGui: Add build system support for the new MSI installer.
* WinGui: Update the installer build process to correct some issues.
* Actions: Fix the installer path.
Diffstat (limited to 'win')
| -rw-r--r-- | win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi | 2 | ||||
| -rw-r--r-- | win/CS/build.xml | 19 |
2 files changed, 14 insertions, 7 deletions
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi index d8cd61a5d..0c619aa63 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi @@ -56,7 +56,7 @@ ManifestDPIAware true ; MUI end ------
Name "${PRODUCT_NAME}"
-OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}_x86_64-Win_GUI.exe"
+OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-x86_64-Win_GUI.exe"
!include WordFunc.nsh
!insertmacro VersionCompare
diff --git a/win/CS/build.xml b/win/CS/build.xml index a62e9a9d0..f496711d9 100644 --- a/win/CS/build.xml +++ b/win/CS/build.xml @@ -28,12 +28,13 @@ <ItemGroup>
<ProjectsToBuild Include="HandBrake.Interop\*proj" Exclude="$(MSBuildProjectFile)"/>
<ProjectsToBuild Include="HandBrakeWPF\*proj" Exclude="$(MSBuildProjectFile)"/>
+ <ProjectsToBuild Include="HandBrake.Installer\*wixproj" Exclude="$(MSBuildProjectFile)"/>
</ItemGroup>
<!-- Dependencies -->
<PropertyGroup>
- <NightlyDependsOn>BuildRelease;NightlyPostBuild</NightlyDependsOn>
- <InstallDependsOn>BuildRelease;ReleasePostBuild</InstallDependsOn>
+ <NightlyDependsOn>BuildRelease;NightlyPostBuild;CodeSign</NightlyDependsOn>
+ <InstallDependsOn>BuildRelease;ReleasePostBuild;CodeSign</InstallDependsOn>
</PropertyGroup>
<!-- Builds /t: -->
@@ -77,8 +78,8 @@ <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />
<Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" />
<Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\MakeNightly64.nsi" />
- <Exec Command=""$(SignToolLocation)" sign $(SignType) $(SignThumbprint)$(PfxFile) $(SignPwd) $(PfxPwd) $(SignTimestamp) $(SignTimestampServer) /v "$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe""
- Condition="'$(SignEnabled)' == 'true'" />
+
+ <Exec Command="copy $(MSBuildProjectDirectory)\HandBrake.Installer\bin\$(Platform)\$(Configuration)\HandBrake.msi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\HandBrake-Nightly-x86_64-Win_GUI.msi /Y" />
</Target>
<Target Name="ReleasePostBuild">
@@ -87,7 +88,13 @@ <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />
<Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" />
<Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\Installer64.nsi" />
- <Exec Command=""$(SignToolLocation)" sign $(SignType) $(SignThumbprint)$(PfxFile) $(SignPwd) $(PfxPwd) $(SignTimestamp) $(SignTimestampServer) /v "$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe""
- Condition="'$(SignEnabled)' == 'true'" /> </Target>
+
+ <Exec Command="copy $(MSBuildProjectDirectory)\HandBrake.Installer\bin\$(Platform)\$(Configuration)\HandBrake.msi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\HandBrake-Nightly-x86_64-Win_GUI.msi /Y" />
+ </Target>
+
+ <Target Name="CodeSign" Condition="'$(SignEnabled)' == 'true'">
+ <Exec Command=""$(SignToolLocation)" sign $(SignType) $(SignThumbprint)$(PfxFile) $(SignPwd) $(PfxPwd) $(SignTimestamp) $(SignTimestampServer) /v "$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\$(Configuration)\*Win_GUI.exe"" />
+ <Exec Command=""$(SignToolLocation)" sign $(SignType) $(SignThumbprint)$(PfxFile) $(SignPwd) $(PfxPwd) $(SignTimestamp) $(SignTimestampServer) /v "$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\$(Configuration)\*Win_GUI.msi"" />
+ </Target>
</Project>
|