[AD-930] Adding AWS Logo to the installer (#116)

* added aws logo to the installer * fix identation * fixed merge conflict
aws · Sep 16, 2022 · b7a67ce · b7a67ce
1 parent 21709ec
commit b7a67ce
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/odbc/CMakeLists.txt b/src/odbc/CMakeLists.txt
@@ -298,12 +298,13 @@ if (WIN32 AND ${WITH_ODBC_MSI})
         @ONLY
     )
 
-    add_custom_command(TARGET ${TARGET} PRE_BUILD
+    file(DOWNLOAD ${WIX_VC_DOWNLOAD_URL} "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${WIX_VCRUNTIME_NAME}")
+
+    add_custom_command(
+        TARGET ${TARGET} PRE_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory
         ${CMAKE_SOURCE_DIR}/odbc/install/images $<TARGET_FILE_DIR:${TARGET}>/images)
 
-    file(DOWNLOAD ${WIX_VC_DOWNLOAD_URL} "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${WIX_VCRUNTIME_NAME}")
-
     add_custom_command(
         TARGET ${TARGET} POST_BUILD
         COMMAND ${WIX_CANDLE} ${WIX_INSTALLER_PREFIX}.wxs -out ${WIX_INSTALLER_PREFIX}.wxobj

diff --git a/src/odbc/install/documentdb-odbc.wxs.in b/src/odbc/install/documentdb-odbc.wxs.in
@@ -28,6 +28,9 @@
             InstallerVersion='301' Languages='1033' Compressed='yes' SummaryCodepage='1252' 
             InstallScope="perMachine" InstallPrivileges="elevated"/>
 
+        <WixVariable Id="WixUIBannerBmp" Value=".\images\awstop.png" />
+        <WixVariable Id="WixUIDialogBmp" Value=".\images\awsdialog.png" />
+
         <Media Id='1' Cabinet='package.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
         <Property Id='DiskPrompt' Value="@WIX_PRODUCT_NAME@ Installation [1]" />
 

diff --git a/src/odbc/install/images/awsdialog.png b/src/odbc/install/images/awsdialog.png
diff --git a/src/odbc/install/images/awstop.png b/src/odbc/install/images/awstop.png