cmake: Add WiX definitions for MSI packages and specify install components.

Author: rsomla1

CMakeLists.txt

@@ -576,16 +576,16 @@ set_target_properties(connector PROPERTIES
 
 install(TARGETS connector
   CONFIGURATIONS Release RelWithDebInfo
-  ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}"
-  RUNTIME DESTINATION "${INSTALL_LIB_DIR}"
-  LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+  ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev
+  RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
+  LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
 )
 
 install(TARGETS connector
   CONFIGURATIONS Debug
-  ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}/debug"
-  RUNTIME DESTINATION "${INSTALL_LIB_DIR}/debug"
-  LIBRARY DESTINATION "${INSTALL_LIB_DIR}/debug"
+  ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}/debug" COMPONENT XDevAPIDev
+  RUNTIME DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT XDevAPIDll
+  LIBRARY DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT XDevAPIDll
 )
 
 if(MAINTAINER_MODE)
@@ -765,5 +765,6 @@ message("Connector libraries will be installed at: ${INSTALL_LIB_DIR}")
 option(WITH_PACKAGES "Configure for building binary/source packages" OFF)
 if(WITH_PACKAGES)
   include(PackageSpecs.cmake)
+  ADD_SUBDIRECTORY(packaging/WiX)
 endif()
 

PackageSpecs.cmake

@@ -148,7 +148,7 @@ foreach(file ${info_files})
   set(file_bin "${CMAKE_BINARY_DIR}/${file}${info_ext}")
 
   configure_file("${file_src}" "${file_bin}" NEWLINE_STYLE ${newline})
-  install(FILES "${file_bin}" DESTINATION .)
+  install(FILES "${file_bin}" DESTINATION . COMPONENT Readme)
 
 endforeach()
 

buildinfo.cmake

@@ -112,4 +112,4 @@ if(WITH_JDBC)
 endif()
 
 
-install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION .)
+install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION . COMPONENT Readme)

include/mysqlx/CMakeLists.txt

@@ -36,5 +36,5 @@ ADD_HEADERS_DIR(devapi)
 ADD_HEADERS(${headers})
 ADD_HEADER_CHECKS()
 
-INSTALL(FILES ${headers} DESTINATION include/mysqlx)
+INSTALL(FILES ${headers} DESTINATION include/mysqlx COMPONENT XDevAPIDev)
 

include/mysqlx/common/CMakeLists.txt

@@ -32,4 +32,4 @@ check_headers(${headers})
 
 ADD_HEADERS(${headers})
 ADD_HEADER_CHECKS()
-INSTALL(FILES ${headers} DESTINATION include/mysqlx/common)
+INSTALL(FILES ${headers} DESTINATION include/mysqlx/common COMPONENT XDevAPIDev)

include/mysqlx/devapi/CMakeLists.txt

@@ -35,4 +35,4 @@ check_headers(${headers})
 ADD_HEADERS_DIR(detail)
 ADD_HEADERS(${headers})
 ADD_HEADER_CHECKS()
-INSTALL(FILES ${headers} DESTINATION "${INSTALL_INCLUDE_DIR}/mysqlx/devapi")
+INSTALL(FILES ${headers} DESTINATION "${INSTALL_INCLUDE_DIR}/mysqlx/devapi" COMPONENT XDevAPIDev)

include/mysqlx/devapi/detail/CMakeLists.txt

@@ -33,4 +33,4 @@ check_headers(${headers})
 
 ADD_HEADERS(${headers})
 ADD_HEADER_CHECKS()
-INSTALL(FILES ${headers} DESTINATION include/mysqlx/devapi/detail)
+INSTALL(FILES ${headers} DESTINATION include/mysqlx/devapi/detail COMPONENT XDevAPIDev)

jdbc.cmake

@@ -216,13 +216,14 @@ foreach(config ${configurations})
       FILES ${location}
       CONFIGURATIONS ${config}
       DESTINATION ${loc_static}
+      COMPONENT JDBCDev
     )
 
   else()
 
     if(WIN32)
 
-      install(FILES ${location} CONFIGURATIONS ${config} DESTINATION ${loc})
+      install(FILES ${location} CONFIGURATIONS ${config} DESTINATION ${loc} COMPONENT JDBCDll)
 
       # install import library for the DLL
 
@@ -232,6 +233,7 @@ foreach(config ${configurations})
         FILES ${imp_location}
         CONFIGURATIONS ${config}
         DESTINATION ${loc_static}
+        COMPONENT JDBCDev
       )
 
     else()
@@ -271,6 +273,7 @@ endforeach()
 install(
   DIRECTORY ${JDBC_DIR}/install/include/jdbc
   DESTINATION ${INSTALL_INCLUDE_DIR}
+  COMPONENT JDBCDev
 )
 
 #
@@ -309,6 +312,7 @@ if(BUNDLE_DEPENDENCIES AND WITH_SSL STREQUAL "bundled")
 
   install(DIRECTORY "${MYSQL_DIR}/bin/" DESTINATION lib64
     FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}"
+    COMPONENT JDBCDev
   )
 
 endif()

packaging/WiX/AdminBackground.jpg

@@ -0,0 +1,64 @@
+# Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+IF(NOT WIN32)
+  RETURN()
+ENDIF()
+
+include(wix_setup.cmake)
+
+# WiX wants the license text as rtf; if there is no rtf license, 
+# we create a fake one from the plain text LICENSE file.
+IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.rtf")
+ SET(LICENSE_RTF "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.rtf")
+ELSE()
+  SET(LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE.txt")
+  FILE(READ ${LICENSE_FILE} CONTENTS)
+  STRING(REGEX REPLACE "\n" "\\\\par\n" CONTENTS "${CONTENTS}")
+  STRING(REGEX REPLACE "\t" "\\\\tab" CONTENTS "${CONTENTS}")
+  FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.rtf" "{\\rtf1\\ansi\\deff0{\\fonttbl{\\f0\\fnil\\fcharset0 Courier New;}}\\viewkind4\\uc1\\pard\\lang1031\\f0\\fs15")
+  FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.rtf" "${CONTENTS}")
+  FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.rtf" "\n}\n")
+  SET(LICENSE_RTF "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.rtf")
+ENDIF()
+# GET_TARGET_PROPERTY(WIXCA_LOCATION wixca LOCATION)
+# MESSAGE(STATUS "\nWIXCA_LOCATION ${WIXCA_LOCATION}\n")
+
+SET(CPACK_WIX_CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/CPackWixConfig.cmake)
+SET(CPACK_WIX_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/custom_ui.wxs")
+SET(CPACK_MSI_SETUP ${CMAKE_CURRENT_SOURCE_DIR}/cpack_msi_setup.cmake)
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/create_msi.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
+  @ONLY)
+
+IF(CMAKE_GENERATOR MATCHES "Visual Studio")
+ SET(CONFIG_PARAM "-DCMAKE_INSTALL_CONFIG_NAME=${CMAKE_CFG_INTDIR}")
+ENDIF()
+
+ADD_CUSTOM_TARGET(
+  MSI
+  COMMAND set VS_UNICODE_OUTPUT=
+  COMMAND ${CMAKE_COMMAND} 
+  ${CONFIG_PARAM} 
+  -P  ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
+)

packaging/WiX/AdminHeader.jpg

@@ -0,0 +1,80 @@
+# Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+SET(CPACK_COMPONENTS_USED 
+    "XDevAPIDll;JDBCDll;XDevAPIDev;JDBCDev;Readme")
+
+# Some components are optional
+# We will build MSI without optional components that are not selected for build
+#(need to modify CPACK_COMPONENTS_ALL for that)
+SET(CPACK_ALL)
+FOREACH(comp1 ${CPACK_COMPONENTS_USED})
+ SET(found)
+ FOREACH(comp2 ${CPACK_COMPONENTS_ALL})
+  IF(comp1 STREQUAL comp2)
+    SET(found 1)
+    BREAK()
+  ENDIF()
+ ENDFOREACH()
+ IF(found)
+   SET(CPACK_ALL ${CPACK_ALL} ${comp1})
+ ENDIF()
+ENDFOREACH()
+SET(CPACK_COMPONENTS_ALL ${CPACK_ALL})
+
+# Always install (hidden), includes Readme files
+SET(CPACK_COMPONENT_GROUP_ALWAYSINSTALL_HIDDEN 1)
+SET(CPACK_COMPONENT_README_GROUP "AlwaysInstall")
+
+# Feature Connector C++
+SET(CPACK_COMPONENT_GROUP_CONNECTORCPP_DISPLAY_NAME "Connector C++")
+SET(CPACK_COMPONENT_GROUP_CONNECTORCPP_EXPANDED "1")
+SET(CPACK_COMPONENT_GROUP_CONNECTORCPP_DESCRIPTION "Install MySQL Connector C++")
+  # Subfeature "DLL Libraries"
+  SET(CPACK_COMPONENT_GROUP_DLLLIBRARIES_GROUP "ConnectorCpp")
+  SET(CPACK_COMPONENT_GROUP_DLLLIBRARIES_DISPLAY_NAME "Dll Libraries")
+  SET(CPACK_COMPONENT_GROUP_DLLLIBRARIES_DESCRIPTION 
+    "Connector C++ dll libraries and depdnencies" )
+    #Subfeature "New XDevAPI/XAPI connector"
+    SET(CPACK_COMPONENT_XDEVAPIDLL_GROUP "DLLLibraries")
+    SET(CPACK_COMPONENT_XDEVAPIDLL_DISPLAY_NAME "New XDevAPI/XAPI")
+    SET(CPACK_COMPONENT_XDEVAPIDLL_DESCRIPTION "Installs new XDevAPI/XAPI dlls")
+    #Subfeature "Legacy JDBC API connector"
+    SET(CPACK_COMPONENT_JDBCDLL_GROUP "DLLLibraries")
+    SET(CPACK_COMPONENT_JDBCDLL_DISPLAY_NAME "Legacy JDBC API connector")
+    SET(CPACK_COMPONENT_JDBCDLL_DESCRIPTION "Installs legacy JDBC API connector dlls")
+    SET(CPACK_COMPONENT_JDBCDLL_WIX_LEVEL 2)
+  # Subfeature "Development Components"
+  SET(CPACK_COMPONENT_GROUP_DEV_GROUP "ConnectorCpp")
+  SET(CPACK_COMPONENT_GROUP_DEV_DISPLAY_NAME "Development Components")
+  SET(CPACK_COMPONENT_GROUP_DEV_DESCRIPTION 
+    "Connector C++ headers, static libraries and import libraries" )
+    #Subfeature "New XDevAPI/XAPI connector"
+    SET(CPACK_COMPONENT_XDEVAPIDEV_GROUP "Dev")
+    SET(CPACK_COMPONENT_XDEVAPIDEV_DISPLAY_NAME "New XDevAPI/XAPI")
+    SET(CPACK_COMPONENT_XDEVAPIDEV_DESCRIPTION "Installs new XDevAPI/XAPI dev files")
+    #Subfeature "Legacy JDBC API connector"
+    SET(CPACK_COMPONENT_JDBCDEV_GROUP "Dev")
+    SET(CPACK_COMPONENT_JDBCDEV_DISPLAY_NAME "Legacy JDBC API connector")
+    SET(CPACK_COMPONENT_JDBCDEV_DESCRIPTION "Installs legacy JDBC API connector dev files")
+    SET(CPACK_COMPONENT_JDBCDEV_WIX_LEVEL 2)
+

packaging/WiX/CMakeLists.txt

@@ -0,0 +1,23 @@
+# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms,
+# as designated in a particular file or component or in included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+CONFIGURE_FILE(${INPUT_FILE} ${OUTPUT_FILE})