birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[cpack/jenkins-main] fixed bug where some resources were not embedded in the bootstrapper

Browse Source
This commit is contained in:
scottr
2021-06-20 20:00:23 -07:00
parent b3a5afe8a3
commit b089facc23
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Platform/Windows/Packaging/Bootstrapper.wxs
+8
View File
@@ -17,6 +17,10 @@
Value="[ProgramFiles64Folder]$(var.CPACK_PACKAGE_INSTALL_DIRECTORY)"
bal:Overridable="yes"/>
<PayloadGroup Id="Images">
<Payload Id="warning.png" SourceFile="$(var.CPACK_RESOURCE_PATH)/warning.png" Compressed="yes"/>
</PayloadGroup>
<?ifdef CPACK_LICENSE_URL?>
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
<bal:WixStandardBootstrapperApplication
@@ -25,6 +29,8 @@
ThemeFile="$(var.CPACK_BOOTSTRAP_THEME_FILE).xml"
LocalizationFile="$(var.CPACK_BOOTSTRAP_THEME_FILE).wxl"
ShowVersion="yes" />
<PayloadGroupRef Id="Images"/>
</BootstrapperApplicationRef>
<?else?>
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
@@ -34,6 +40,8 @@
ThemeFile="$(var.CPACK_BOOTSTRAP_THEME_FILE).xml"
LocalizationFile="$(var.CPACK_BOOTSTRAP_THEME_FILE).wxl"
ShowVersion="yes" />
<PayloadGroupRef Id="Images"/>
</BootstrapperApplicationRef>
<?endif?>
cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
+1 -1
View File
@@ -76,7 +76,7 @@
<!-- final page (failure state) -->
<Page Name="Failure">
<Image X="38" Y="132" Width="42" Height="42" ImageFile="@WIX_THEME_WARNING_IMAGE@"/>
<Image X="38" Y="132" Width="42" Height="42" ImageFile="warning.png"/>
<Text Name="FailureHeader" X="86" Y="142" Width="-42" Height="34" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
<Text Name="FailureInstallHeader" X="86" Y="142" Width="-42" Height="34" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
<Text Name="FailureUninstallHeader" X="86" Y="142" Width="-42" Height="34" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
cmake/Platform/Windows/PackagingPostBuild.cmake
+1
View File
@@ -32,6 +32,7 @@ set(_addtional_defines
-dCPACK_PACKAGE_FILE_NAME=${CPACK_PACKAGE_FILE_NAME}
-dCPACK_PACKAGE_INSTALL_DIRECTORY=${_fixed_package_install_dir}
-dCPACK_WIX_PRODUCT_LOGO=${CPACK_WIX_PRODUCT_LOGO}
-dCPACK_RESOURCE_PATH=${CPACK_SOURCE_DIR}/Platform/Windows/Packaging
)
if(CPACK_LICENSE_URL)