Bug#35613791 - Upgrade from Wix 3.11 to 4.0.1 for Server/Cluster MSI builds

WiX Toolset v3 is no longer actively maintained.

Change-Id: I4b2e94ed51708a74ee3bbd82ffe97dcc4e7338d8
(cherry picked from commit 4c13451d68768d8989a5ce3752b66ecb23460cda)

Author: kboortz

packaging/WiX/CMakeLists.txt

@@ -20,59 +20,28 @@
 # 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()
-
-# Need an extra indirection to access ENV(ProgramFiles(x86))
-SET(MYENV "ProgramFiles(x86)")
-
-# Look in various paths for 'heat.exe'
-# Different installations have different layouts.
-# Not really necessary to use V3.8 but keep backward compatibility just in case.
-IF(MSVC_VERSION LESS 1900)
-  FOREACH(path
-      "$ENV{ProgramFiles}/WiX Toolset V3.8"
-      "$ENV{ProgramFiles}/WiX Toolset V3.8/bin"
-      "$ENV{${MYENV}}/WiX Toolset V3.8"
-      "$ENV{${MYENV}}/WiX Toolset V3.8/bin")
-    FIND_PATH(WIX_DIR heat.exe "${path}")
-    MESSAGE(STATUS "WIX_DIR ${WIX_DIR} path ${path}")
-    IF(WIX_DIR)
-      BREAK()
-    ENDIF()
-  ENDFOREACH()
-ELSE()
-  FOREACH(path
-      "$ENV{ProgramFiles}/WiX Toolset V3.10"
-      "$ENV{ProgramFiles}/WiX Toolset V3.10/bin"
-      "$ENV{${MYENV}}/WiX Toolset V3.10"
-      "$ENV{${MYENV}}/WiX Toolset V3.10/bin")
-    FIND_PATH(WIX_DIR heat.exe "${path}")
-    MESSAGE(STATUS "WIX_DIR ${WIX_DIR} path ${path}")
-    IF(WIX_DIR)
-      BREAK()
-    ENDIF()
-  ENDFOREACH()
+# First we look for "wix.exe" using the CMake variable WIX_DIR, second using the
+# environment variable WIX, and then we add "$ENV{USERPROFILE}\\.dotnet\\tools"
+# to the PATH before searching the other default locations
+IF(NOT WIX_DIR AND "$ENV{WIX}")
+  SET(WIX_DIR "$ENV{WIX}")
 ENDIF()
-
-# Finally, look in environment
-IF(NOT WIX_DIR)
-  FIND_PATH(WIX_DIR heat.exe "$ENV{WIX}")
-  MESSAGE(STATUS "WIX_DIR ${WIX_DIR} looked at $ENV{WIX}")
+FIND_PATH(WIX_DIR wix.exe "$ENV{USERPROFILE}\\.dotnet\\tools")
+
+IF(NOT _WIX_DIR_CHECKED)
+  SET(_WIX_DIR_CHECKED 1 CACHE INTERNAL "")
+  IF(WIX_DIR)
+    MESSAGE(STATUS "WIX_DIR ${WIX_DIR}")
+  ELSE()
+    MESSAGE(STATUS "Cannot find \"wix.exe\", installer project will not be generated")
+  ENDIF()
 ENDIF()
 
 IF(NOT WIX_DIR)
-  IF(NOT _WIX_DIR_CHECKED)
-    SET(_WIX_DIR_CHECKED 1 CACHE INTERNAL "")
-    MESSAGE(STATUS "Cannot find wix 3, installer project will not be generated")
-  ENDIF()
   RETURN()
 ENDIF()
 
-FIND_PROGRAM(HEAT_EXECUTABLE heat ${WIX_DIR})
-FIND_PROGRAM(CANDLE_EXECUTABLE candle ${WIX_DIR})
-FIND_PROGRAM(LIGHT_EXECUTABLE light ${WIX_DIR})
+FIND_PROGRAM(WIX_EXECUTABLE wix ${WIX_DIR})
 
 # WiX wants the license text as rtf; if there is no rtf license, 
 # we create a fake one from the plain text LICENSE file.
@@ -92,9 +61,9 @@ SET(CPACK_WIX_CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/CPackWixConfig.cmake)
 SET(CPACK_WIX_INCLUDE "${CMAKE_CURRENT_BINARY_DIR}/mysql_server_extra.wxs;${CMAKE_CURRENT_SOURCE_DIR}/custom_ui.wxs")
 
 IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  SET(WixWin64 " Win64='yes'")
+  SET(WixWin64 " Bitness='always64'")
 ELSE()
-  SET(WixWin64 " Win64='no'")
+  SET(WixWin64 " Bitness='always32'")
 ENDIF()
 
 IF("${VERSION}" MATCHES "-ndb-")
@@ -111,21 +80,13 @@ IF("${VERSION}" MATCHES "-ndb-")
   MESSAGE(STATUS "DISPLAY_PATCH_VERSION: ${DISPLAY_PATCH_VERSION}")
 ENDIF()
 
-#CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server_extra.wxs.in
-#  ${CMAKE_CURRENT_BINARY_DIR}/mysql_server_extra.wxs)
-
-ADD_CUSTOM_TARGET(
-  configure_mysql_server_extra
-  COMMAND ${CMAKE_COMMAND}
-  -DINPUT_FILE=${CMAKE_CURRENT_SOURCE_DIR}/mysql_server_extra.wxs.in
-  -DOUTPUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/mysql_server_extra.wxs
-  -DMAJOR_VERSION=${MAJOR_VERSION}
-  -DMINOR_VERSION=${MINOR_VERSION}
-  -DWixWin64=${WixWin64}
-  -P ${CMAKE_CURRENT_SOURCE_DIR}/configure_file.cmake
-  )
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_server_extra.wxs.in
+  ${CMAKE_CURRENT_BINARY_DIR}/mysql_server_extra.wxs
+  @ONLY)
 
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/create_msi.cmake.in
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/create_msi.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
   @ONLY)
 
@@ -151,7 +112,6 @@ ADD_CUSTOM_TARGET(
   ${CONFIG_PARAM} 
   -P  ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
 )
-ADD_DEPENDENCIES(MSI configure_mysql_server_extra)
 
 IF(TARGET remove_INFO_SRC_from_bs)
   ADD_DEPENDENCIES(MSI remove_INFO_SRC_from_bs)

packaging/WiX/CPackWixConfig.cmake

@@ -41,7 +41,6 @@ IF("${VERSION}" MATCHES "-ndb-")
     ClusterManagementServer
     ClusterManagementClient
     ClusterJ
-    nodejs
     )
 ENDIF()
 
@@ -156,9 +155,4 @@ IF("${VERSION}" MATCHES "-ndb-")
   SET(CPACK_COMPONENT_CLUSTERJ_GROUP "Devel")
   SET(CPACK_COMPONENT_CLUSTERJ_DISPLAY_NAME "ClusterJ Java Connector for Cluster")
   SET(CPACK_COMPONENT_CLUSTERJ_DESCRIPTION "Installs ClusterJ")
-
-  #Subfeature "nodejs"
-  SET(CPACK_COMPONENT_NODEJS_GROUP "Devel")
-  SET(CPACK_COMPONENT_NODEJS_DISPLAY_NAME "nodejs Connector for Cluster")
-  SET(CPACK_COMPONENT_NODEJS_DESCRIPTION "Installs nodejs connector")
 ENDIF()

packaging/WiX/configure_file.cmake

@@ -23,8 +23,7 @@
 SET(LINK_STATIC_RUNTIME_LIBRARIES "@LINK_STATIC_RUNTIME_LIBRARIES@")
 SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@")
 SET(CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
-SET(CANDLE_EXECUTABLE "@CANDLE_EXECUTABLE@")
-SET(LIGHT_EXECUTABLE "@LIGHT_EXECUTABLE@")
+SET(WIX_EXECUTABLE "@WIX_EXECUTABLE@")
 SET(CMAKE_COMMAND "@CMAKE_COMMAND@")
 SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@")
 SET(VERSION "@VERSION@")
@@ -90,13 +89,11 @@ LIST(APPEND EXCLUDE_FILES
 )
 
 IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  SET(Win64 " Win64='yes'")
+  SET(Win64 " Bitness='always64'")
   SET(Platform x64)
-  SET(PlatformProgramFilesFolder ProgramFiles64Folder)
 ELSE()
   SET(Platform x86)
-  SET(PlatformProgramFilesFolder ProgramFilesFolder)
-  SET(Win64 " Win64='no'")
+  SET(Win64 " Bitness='always32'")
 ENDIF()
 
 SET(ENV{VS_UNICODE_OUTPUT})
@@ -399,36 +396,27 @@ SET(CPACK_WIX_INCLUDES
 ENDFOREACH()
 
 
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in 
- ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs)
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in 
+  ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs
+  @ONLY)
 
-SET(EXTRA_CANDLE_ARGS)
-IF("$ENV{EXTRA_CANDLE_ARGS}")
-	SET(EXTRA_CANDLE_ARGS "$ENV{EXTRA_CANDLE_ARGS}")
-ENDIF()
-
-SET(EXTRA_LIGHT_ARGS)
-IF("$ENV{EXTRA_LIGHT_ARGS}")
-	SET(EXTRA_LIGHT_ARGS "$ENV{EXTRA_LIGHT_ARGS}")
-ENDIF()
-
-FILE(REMOVE mysql_server.wixobj)
-EXECUTE_PROCESS(
- COMMAND ${CANDLE_EXECUTABLE} -ext WixUtilExtension  mysql_server.wxs ${EXTRA_CANDLE_ARGS}
- RESULT_VARIABLE CANDLE_RESULT
-)
-
-IF(CANDLE_RESULT)
-  MESSAGE(FATAL_ERROR "ERROR: can't run candle")
+SET(EXTRA_WIX_ARGS)
+IF("$ENV{EXTRA_WIX_ARGS}")
+  SET(EXTRA_WIX_ARGS "$ENV{EXTRA_WIX_ARGS}")
 ENDIF()
 
 EXECUTE_PROCESS(
- COMMAND ${LIGHT_EXECUTABLE} -ext WixUIExtension -ext WixUtilExtension
-  mysql_server.wixobj  -out  ${CMAKE_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.msi
-  ${EXTRA_LIGHT_ARGS}
- RESULT_VARIABLE LIGHT_RESULT
+  COMMAND ${WIX_EXECUTABLE} build
+  -arch ${Platform}
+  -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext ${EXTRA_WIX_ARGS}
+  -out ${CMAKE_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.msi
+  mysql_server.wxs
+  RESULT_VARIABLE WIX_RESULT
+  OUTPUT_VARIABLE WIX_OUTPUT
+  ERROR_VARIABLE WIX_OUTPUT
 )
 
-IF(LIGHT_RESULT)
-  MESSAGE(FATAL_ERROR "ERROR: can't run light")
+IF(WIX_RESULT)
+  MESSAGE(FATAL_ERROR "ERROR: can't run WiX: ${WIX_RESULT} ${WIX_OUTPUT}")
 ENDIF()