From b3ba8115efebd200932a404e827759dc2be579ef Mon Sep 17 00:00:00 2001 From: Affonso Vieira Date: Fri, 9 Sep 2022 16:41:43 -0700 Subject: [PATCH 1/3] added aws logo to the installer --- src/odbc/CMakeLists.txt | 4 ++++ src/odbc/install/documentdb-odbc.wxs.in | 3 +++ src/odbc/install/images/awsdialog.png | Bin 0 -> 12065 bytes src/odbc/install/images/awstop.png | Bin 0 -> 6216 bytes 4 files changed, 7 insertions(+) create mode 100644 src/odbc/install/images/awsdialog.png create mode 100644 src/odbc/install/images/awstop.png diff --git a/src/odbc/CMakeLists.txt b/src/odbc/CMakeLists.txt index e809abefa..4a901ddcb 100644 --- a/src/odbc/CMakeLists.txt +++ b/src/odbc/CMakeLists.txt @@ -284,6 +284,10 @@ if (WIN32 AND ${WITH_ODBC_MSI}) @ONLY ) + add_custom_command(TARGET ${TARGET} PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory + ${CMAKE_SOURCE_DIR}/odbc/install/images $/images) + 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 index a5871fdd9..b91d731a8 100644 --- a/src/odbc/install/documentdb-odbc.wxs.in +++ b/src/odbc/install/documentdb-odbc.wxs.in @@ -27,6 +27,9 @@ Platform="@WIX_PACKAGE_PLATFORM@" InstallerVersion='301' Languages='1033' Compressed='yes' SummaryCodepage='1252' /> + + + diff --git a/src/odbc/install/images/awsdialog.png b/src/odbc/install/images/awsdialog.png new file mode 100644 index 0000000000000000000000000000000000000000..d1b8b3a3898ac1ca2246cc6de675203944272759 GIT binary patch literal 12065 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 DZ?^G% literal 0 HcmV?d00001 diff --git a/src/odbc/install/images/awstop.png b/src/odbc/install/images/awstop.png new file mode 100644 index 0000000000000000000000000000000000000000..07e0a906b2751d7e37cc517c5c0e8d23128450f8 GIT binary patch literal 6216 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 literal 0 HcmV?d00001 From 57544485723bdd660fc3e82c933786afdb2e2234 Mon Sep 17 00:00:00 2001 From: Affonso Vieira Date: Thu, 15 Sep 2022 17:45:52 -0700 Subject: [PATCH 2/3] fix identation --- src/odbc/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/odbc/CMakeLists.txt b/src/odbc/CMakeLists.txt index 4a901ddcb..abd6de7d6 100644 --- a/src/odbc/CMakeLists.txt +++ b/src/odbc/CMakeLists.txt @@ -284,9 +284,10 @@ if (WIN32 AND ${WITH_ODBC_MSI}) @ONLY ) - add_custom_command(TARGET ${TARGET} PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory - ${CMAKE_SOURCE_DIR}/odbc/install/images $/images) + add_custom_command( + TARGET ${TARGET} PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory + ${CMAKE_SOURCE_DIR}/odbc/install/images $/images) add_custom_command( TARGET ${TARGET} POST_BUILD From 86fb3b922f6bfe60c8d2e9cb159547b8ef150be9 Mon Sep 17 00:00:00 2001 From: Affonso Vieira Date: Fri, 16 Sep 2022 15:48:20 -0700 Subject: [PATCH 3/3] fixed merge conflict --- src/odbc/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/odbc/CMakeLists.txt b/src/odbc/CMakeLists.txt index d2b26a6d8..faced799e 100644 --- a/src/odbc/CMakeLists.txt +++ b/src/odbc/CMakeLists.txt @@ -298,10 +298,6 @@ if (WIN32 AND ${WITH_ODBC_MSI}) @ONLY ) - add_custom_command(TARGET ${TARGET} PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory - ${CMAKE_SOURCE_DIR}/odbc/install/images $/images) - file(DOWNLOAD ${WIX_VC_DOWNLOAD_URL} "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${WIX_VCRUNTIME_NAME}") add_custom_command(