Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 15:29:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix some issues after "merging" 7.6 into master

Browse Source 
- Installer: Include xcp-ng-splash
This commit is contained in:
Alexander Schulz 2019-02-09 12:13:53 +01:00
parent ea92aee61c
commit 54a7318858
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
installer-xcp-ng/Product.wxs
View File

@ -36,7 +36,7 @@
<Component Id="ApplicationShortcut" Guid="{2010795F-AB74-4166-89F0-B555B3DEB9C8}">
<Shortcut Id="startmenuxcpng"
Name="[XenCenter]"
Target="[INSTALLLOCATION]$(var.splash.TargetFileName)"
Target="[INSTALLLOCATION]$(var.splash-xcp-ng.TargetFileName)"
WorkingDirectory="INSTALLLOCATION" />
<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall" />
@ -55,7 +55,7 @@
KeyPath="yes" />
<Shortcut Id="ApplicationShortcutDesktop"
Target="[INSTALLLOCATION]$(var.splash.TargetFileName)"
Target="[INSTALLLOCATION]$(var.splash-xcp-ng.TargetFileName)"
WorkingDirectory="INSTALLLOCATION"
Directory="DesktopFolder"
Name="[XenCenter]"

14
installer-xcp-ng/installer-xcp-ng.wixproj
View File

@ -42,6 +42,16 @@
<Content Include="license.rtf" />
<Content Include="license.txt" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\xcpng.splash\splash-xcp-ng\splash-xcp-ng.csproj">
<Name>splash-xcp-ng</Name>
<Project>{cd563857-6159-4415-b7b2-a21991f572e3}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
</ItemGroup>
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
@ -70,9 +80,9 @@ del /Q $(SolutionDir)XenAdmin\bin\$(ConfigurationName)\ja
del /Q $(SolutionDir)XenAdmin\bin\$(ConfigurationName)\zh-CN
REM signtool.exe sign /a /n Vates /fd sha256 /t "http://timestamp.verisign.com/scripts/timestamp.dll" "$(SolutionDir)XenAdmin\bin\$(ConfigurationName)\%2a.dll"
signtool.exe sign /a /n Vates /fd sha256 /t "http://timestamp.verisign.com/scripts/timestamp.dll" "$(SolutionDir)XenAdmin\bin\$(ConfigurationName)\%2a.exe"
REM signtool.exe sign /a /n Vates /fd sha256 /t "http://timestamp.verisign.com/scripts/timestamp.dll" "$(SolutionDir)XenAdmin\bin\$(ConfigurationName)\%2a.exe"
heat.exe dir "$(SolutionDir)XenAdmin\bin\$(ConfigurationName)" -cg XCPngFiles -gg -scom -sreg -sfrag -srd -dr INSTALLLOCATION -out "$(ProjectDir)\FilesFragment.wxs"</PreBuildEvent>
REM heat.exe dir "$(SolutionDir)XenAdmin\bin\$(ConfigurationName)" -cg XCPngFiles -gg -scom -sreg -sfrag -srd -dr INSTALLLOCATION -out "$(ProjectDir)\FilesFragment.wxs"</PreBuildEvent>
</PropertyGroup>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.