Merge pull request #44 from Bit-Quill/AT-694

AT-694 - Update filename and version
aws · Mar 26, 2021 · dbcde82 · dbcde82
2 parents 40df897 + 9cd5fb0
commit dbcde82
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -78,8 +78,11 @@ set(INSTALL_SRC "${CMAKE_CURRENT_SOURCE_DIR}/installer")
 set(DSN_INSTALLER_SRC "${CMAKE_CURRENT_SOURCE_DIR}/DSNInstaller")
 
 # ODBC Driver version 
-set(DRIVER_PACKAGE_VERSION "0.1.0")
-set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "0,1,0")
+set(MAJOR 0)
+set(MINOR 2)
+set(PATCH 0)
+set(DRIVER_PACKAGE_VERSION "${MAJOR}.${MINOR}.${PATCH}")
+set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "${MAJOR},${MINOR},${PATCH}")
 add_compile_definitions( TS_ODBC_VERSION="${DRIVER_PACKAGE_VERSION}"
                          # Comma separated version is required for odbc administrator's driver file.
                          TS_ODBC_DRVFILE_VERSION=${DRIVER_PACKAGE_VERSION_COMMA_SEPARATED} )

diff --git a/src/installer/CMakeLists.txt b/src/installer/CMakeLists.txt
@@ -19,13 +19,25 @@ include(CPackComponent)
 set(CMAKE_INSTALL_PREFIX ${INSTALL_ROOT})
 
 # General package info
-set(CPACK_PACKAGE_NAME "Amazon Timestream ODBC Driver ${BITNESS}-bit")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Amazon Timestream ODBC Driver ${BITNESS}-bit")
+set(CPACK_PACKAGE_VERSION "${DRIVER_PACKAGE_VERSION}")
+if(WIN32)
+    set(CPACK_PACKAGE_FILE_NAME "AmazonTimestreamODBC${BITNESS}-${CPACK_PACKAGE_VERSION}")
+    set(CPACK_PACKAGE_NAME "Amazon Timestream ODBC Driver ${BITNESS}-bit ${CPACK_PACKAGE_VERSION}")
+elseif(APPLE)
+    set(CPACK_PACKAGE_FILE_NAME "AmazonTimestreamODBC-${CPACK_PACKAGE_VERSION}")
+    set(CPACK_PACKAGE_NAME "Amazon Timestream ODBC Driver ${CPACK_PACKAGE_VERSION}")
+else()
+    if(${BITNESS} EQUAL 32)
+        set(CPACK_PACKAGE_FILE_NAME "AmazonTimestreamODBC-${BITNESS}-bit-${CPACK_PACKAGE_VERSION}.i686")
+    else()
+        set(CPACK_PACKAGE_FILE_NAME "AmazonTimestreamODBC-${BITNESS}-bit-${CPACK_PACKAGE_VERSION}.x86_64")
+    endif()
+    set(CPACK_PACKAGE_NAME "Amazon Timestream ODBC Driver ${BITNESS}-bit ${CPACK_PACKAGE_VERSION}")
+endif()
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${CPACK_PACKAGE_NAME}")
 set(CPACK_PACKAGE_VENDOR "Amazon")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}")
 set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}")
-set(CPACK_PACKAGE_VERSION "${DRIVER_PACKAGE_VERSION}")
-
 # OS-specific package info
 if(WIN32)
     # Set generator to WIX