CRLF->LF

5 files changed, 909 insertions, 909 deletions

diff --git a/packaging/WiX/CPackWixConfig.cmake b/packaging/WiX/CPackWixConfig.cmake
index c782b7cd17a..9caae8375d8 100644
--- a/packaging/WiX/CPackWixConfig.cmake
+++ b/packaging/WiX/CPackWixConfig.cmake
@@ -1,119 +1,119 @@
-# Copyright (c) 2010, 2013, 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 as published by

-# the Free Software Foundation; version 2 of the License.

-# 

-# 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 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(ESSENTIALS)

- SET(CPACK_COMPONENTS_USED "Server;Client;DataFiles")

- SET(CPACK_WIX_UI "WixUI_InstallDir")

- IF(CMAKE_SIZEOF_VOID_P MATCHES 8)

-  SET(CPACK_PACKAGE_FILE_NAME  "mysql-essential-${VERSION}-winx64")

- ELSE()

-  SET(CPACK_PACKAGE_FILE_NAME  "mysql-essential-${VERSION}-win32")

- ENDIF()

-ELSE()

-  SET(CPACK_COMPONENTS_USED 

-    "Server;Client;DataFiles;Development;SharedLibraries;Documentation;IniFiles;Readme;Server_Scripts;DebugBinaries")

-ENDIF()

-

-

-# Some components like Embedded are optional

-# We will build MSI without embedded if it was 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 MySQL Server

-SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DISPLAY_NAME "MySQL Server")

-SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_EXPANDED "1")

-SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DESCRIPTION "Install MySQL Server")

- # Subfeature "Server" (hidden)

- SET(CPACK_COMPONENT_SERVER_GROUP "MySQLServer")

- SET(CPACK_COMPONENT_SERVER_HIDDEN 1)

- # Subfeature "Client" 

- SET(CPACK_COMPONENT_CLIENT_GROUP "MySQLServer")

- SET(CPACK_COMPONENT_CLIENT_DISPLAY_NAME "Client Programs")

- SET(CPACK_COMPONENT_CLIENT_DESCRIPTION 

-   "Various helpful (commandline) tools including the mysql command line client" )

- # Subfeature "Debug binaries" 

- SET(CPACK_COMPONENT_DEBUGBINARIES_GROUP "MySQLServer")

- SET(CPACK_COMPONENT_DEBUGBINARIES_DISPLAY_NAME "Debug binaries")

- SET(CPACK_COMPONENT_DEBUGBINARIES_DESCRIPTION 

-   "Debug/trace versions of executables and libraries" )

- #SET(CPACK_COMPONENT_DEBUGBINARIES_WIX_LEVEL 2)

-  

-   

- #Subfeature "Data Files" 

- SET(CPACK_COMPONENT_DATAFILES_GROUP "MySQLServer")

- SET(CPACK_COMPONENT_DATAFILES_DISPLAY_NAME "Server data files")

- SET(CPACK_COMPONENT_DATAFILES_DESCRIPTION "Server data files" )

- SET(CPACK_COMPONENT_DATAFILES_HIDDEN 1)

- 

- 

-#Feature "Devel"

-SET(CPACK_COMPONENT_GROUP_DEVEL_DISPLAY_NAME "Development Components")

-SET(CPACK_COMPONENT_GROUP_DEVEL_DESCRIPTION "Installs C/C++ header files and libraries")

- #Subfeature "Development"

- SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "Devel")

- SET(CPACK_COMPONENT_DEVELOPMENT_HIDDEN 1)

- 

- #Subfeature "Shared libraries"

- SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "Devel")

- SET(CPACK_COMPONENT_SHAREDLIBRARIES_DISPLAY_NAME "Client C API library (shared)")

- SET(CPACK_COMPONENT_SHAREDLIBRARIES_DESCRIPTION "Installs shared client library")

- 

- #Subfeature "Embedded"

- SET(CPACK_COMPONENT_EMBEDDED_GROUP "Devel")

- SET(CPACK_COMPONENT_EMBEDDED_DISPLAY_NAME "Embedded server library")

- SET(CPACK_COMPONENT_EMBEDDED_DESCRIPTION "Installs embedded server library")

- SET(CPACK_COMPONENT_EMBEDDED_WIX_LEVEL 2)

-

-#Feature Debug Symbols

-SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DISPLAY_NAME "Debug Symbols")

-SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DESCRIPTION "Installs Debug Symbols")

-SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_WIX_LEVEL 2)

- SET(CPACK_COMPONENT_DEBUGINFO_GROUP "DebugSymbols")

- SET(CPACK_COMPONENT_DEBUGINFO_HIDDEN 1)

-

-#Feature Documentation

-SET(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")

-SET(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "Installs documentation")

-SET(CPACK_COMPONENT_DOCUMENTATION_WIX_LEVEL 2)

-

-#Feature tests

-SET(CPACK_COMPONENT_TEST_DISPLAY_NAME "Tests")

-SET(CPACK_COMPONENT_TEST_DESCRIPTION "Installs unittests (requires Perl to run)")

-SET(CPACK_COMPONENT_TEST_WIX_LEVEL 2)

-

-

-#Feature Misc (hidden, installs only if everything is installed)

-SET(CPACK_COMPONENT_GROUP_MISC_HIDDEN 1)

-SET(CPACK_COMPONENT_GROUP_MISC_WIX_LEVEL 100)

-  SET(CPACK_COMPONENT_INIFILES_GROUP "Misc")

-  SET(CPACK_COMPONENT_SERVER_SCRIPTS_GROUP "Misc")

+# Copyright (c) 2010, 2013, 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 as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# 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 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(ESSENTIALS)
+ SET(CPACK_COMPONENTS_USED "Server;Client;DataFiles")
+ SET(CPACK_WIX_UI "WixUI_InstallDir")
+ IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
+  SET(CPACK_PACKAGE_FILE_NAME  "mysql-essential-${VERSION}-winx64")
+ ELSE()
+  SET(CPACK_PACKAGE_FILE_NAME  "mysql-essential-${VERSION}-win32")
+ ENDIF()
+ELSE()
+  SET(CPACK_COMPONENTS_USED 
+    "Server;Client;DataFiles;Development;SharedLibraries;Documentation;IniFiles;Readme;Server_Scripts;DebugBinaries")
+ENDIF()
+
+
+# Some components like Embedded are optional
+# We will build MSI without embedded if it was 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 MySQL Server
+SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DISPLAY_NAME "MySQL Server")
+SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_EXPANDED "1")
+SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DESCRIPTION "Install MySQL Server")
+ # Subfeature "Server" (hidden)
+ SET(CPACK_COMPONENT_SERVER_GROUP "MySQLServer")
+ SET(CPACK_COMPONENT_SERVER_HIDDEN 1)
+ # Subfeature "Client" 
+ SET(CPACK_COMPONENT_CLIENT_GROUP "MySQLServer")
+ SET(CPACK_COMPONENT_CLIENT_DISPLAY_NAME "Client Programs")
+ SET(CPACK_COMPONENT_CLIENT_DESCRIPTION 
+   "Various helpful (commandline) tools including the mysql command line client" )
+ # Subfeature "Debug binaries" 
+ SET(CPACK_COMPONENT_DEBUGBINARIES_GROUP "MySQLServer")
+ SET(CPACK_COMPONENT_DEBUGBINARIES_DISPLAY_NAME "Debug binaries")
+ SET(CPACK_COMPONENT_DEBUGBINARIES_DESCRIPTION 
+   "Debug/trace versions of executables and libraries" )
+ #SET(CPACK_COMPONENT_DEBUGBINARIES_WIX_LEVEL 2)
+  
+   
+ #Subfeature "Data Files" 
+ SET(CPACK_COMPONENT_DATAFILES_GROUP "MySQLServer")
+ SET(CPACK_COMPONENT_DATAFILES_DISPLAY_NAME "Server data files")
+ SET(CPACK_COMPONENT_DATAFILES_DESCRIPTION "Server data files" )
+ SET(CPACK_COMPONENT_DATAFILES_HIDDEN 1)
+ 
+ 
+#Feature "Devel"
+SET(CPACK_COMPONENT_GROUP_DEVEL_DISPLAY_NAME "Development Components")
+SET(CPACK_COMPONENT_GROUP_DEVEL_DESCRIPTION "Installs C/C++ header files and libraries")
+ #Subfeature "Development"
+ SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "Devel")
+ SET(CPACK_COMPONENT_DEVELOPMENT_HIDDEN 1)
+ 
+ #Subfeature "Shared libraries"
+ SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "Devel")
+ SET(CPACK_COMPONENT_SHAREDLIBRARIES_DISPLAY_NAME "Client C API library (shared)")
+ SET(CPACK_COMPONENT_SHAREDLIBRARIES_DESCRIPTION "Installs shared client library")
+ 
+ #Subfeature "Embedded"
+ SET(CPACK_COMPONENT_EMBEDDED_GROUP "Devel")
+ SET(CPACK_COMPONENT_EMBEDDED_DISPLAY_NAME "Embedded server library")
+ SET(CPACK_COMPONENT_EMBEDDED_DESCRIPTION "Installs embedded server library")
+ SET(CPACK_COMPONENT_EMBEDDED_WIX_LEVEL 2)
+
+#Feature Debug Symbols
+SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DISPLAY_NAME "Debug Symbols")
+SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_DESCRIPTION "Installs Debug Symbols")
+SET(CPACK_COMPONENT_GROUP_DEBUGSYMBOLS_WIX_LEVEL 2)
+ SET(CPACK_COMPONENT_DEBUGINFO_GROUP "DebugSymbols")
+ SET(CPACK_COMPONENT_DEBUGINFO_HIDDEN 1)
+
+#Feature Documentation
+SET(CPACK_COMPONENT_DOCUMENTATION_DISPLAY_NAME "Documentation")
+SET(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "Installs documentation")
+SET(CPACK_COMPONENT_DOCUMENTATION_WIX_LEVEL 2)
+
+#Feature tests
+SET(CPACK_COMPONENT_TEST_DISPLAY_NAME "Tests")
+SET(CPACK_COMPONENT_TEST_DESCRIPTION "Installs unittests (requires Perl to run)")
+SET(CPACK_COMPONENT_TEST_WIX_LEVEL 2)
+
+
+#Feature Misc (hidden, installs only if everything is installed)
+SET(CPACK_COMPONENT_GROUP_MISC_HIDDEN 1)
+SET(CPACK_COMPONENT_GROUP_MISC_WIX_LEVEL 100)
+  SET(CPACK_COMPONENT_INIFILES_GROUP "Misc")
+  SET(CPACK_COMPONENT_SERVER_SCRIPTS_GROUP "Misc")
diff --git a/packaging/WiX/create_msi.cmake.in b/packaging/WiX/create_msi.cmake.in
index 8de271fc1cf..d0a8f0046cf 100644
--- a/packaging/WiX/create_msi.cmake.in
+++ b/packaging/WiX/create_msi.cmake.in
@@ -1,398 +1,398 @@
-# Copyright (c) 2010, 2011, 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 as published by

-# the Free Software Foundation; version 2 of the License.

-# 

-# 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 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(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(CMAKE_COMMAND "@CMAKE_COMMAND@")

-SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@")

-SET(VERSION "@VERSION@")

-SET(MAJOR_VERSION "@MAJOR_VERSION@")

-SET(MINOR_VERSION "@MINOR_VERSION@")

-SET(PATCH_VERSION "@PATCH_VERSION@")

-SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@)

-SET(MANUFACTURER "@MANUFACTURER@")

-SET(WIXCA_LOCATION "@WIXCA_LOCATION@")

-SET(COPYING_RTF "@COPYING_RTF@")

-SET(CPACK_WIX_CONFIG "@CPACK_WIX_CONFIG@")

-SET(CPACK_WIX_INCLUDE "@CPACK_WIX_INCLUDE@")

-

-LIST(APPEND EXCLUDE_DIRS

-     bin/debug

-     data/test

-     lib/plugin/debug

-     mysql-test

-     scripts

-     sql-bench

-)

-

-LIST(APPEND EXCLUDE_FILES

-     bin/echo.exe

-     bin/mysql_client_test_embedded.exe

-     bin/mysqld-debug.exe

-     bin/mysqltest_embedded.exe

-     bin/replace.exe

-     lib/debug/mysqlserver.lib

-     lib/libmysqld.dll

-     lib/libmysqld.lib

-     lib/mysqlserver.lib

-     lib/mysqlservices.lib

-)

-

-IF(CMAKE_SIZEOF_VOID_P EQUAL 8)

-  SET(Win64 " Win64='yes'")

-  SET(Platform x64)

-  SET(PlatformProgramFilesFolder ProgramFiles64Folder)

-ELSE()

-  SET(Platform x86)

-  SET(PlatformProgramFilesFolder ProgramFilesFolder)

-  SET(Win64)

-ENDIF()

-

-SET(ENV{VS_UNICODE_OUTPUT})

-

-# Switch off the monolithic install

-EXECUTE_PROCESS(

-  COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=0 ${CMAKE_BINARY_DIR}

-  OUTPUT_QUIET

-)

-

-INCLUDE(${CMAKE_BINARY_DIR}/CPackConfig.cmake)

-

-IF(CPACK_WIX_CONFIG)

-  INCLUDE(${CPACK_WIX_CONFIG})

-ENDIF()

-

-IF(NOT CPACK_WIX_UI)

-  SET(CPACK_WIX_UI "WixUI_Mondo_Custom")

-ENDIF()

-

-SET(WIX_FEATURES)

-FOREACH(comp ${CPACK_COMPONENTS_ALL})

- STRING(TOUPPER "${comp}" comp_upper)

- IF(NOT CPACK_COMPONENT_${comp_upper}_GROUP)

-   SET(WIX_FEATURE_${comp_upper}_COMPONENTS "${comp}")

-   SET(CPACK_COMPONENT_${comp_upper}_HIDDEN 1)

-   SET(CPACK_COMPONENT_GROUP_${comp_upper}_DISPLAY_NAME ${CPACK_COMPONENT_${comp_upper}_DISPLAY_NAME})

-   SET(CPACK_COMPONENT_GROUP_${comp_upper}_DESCRIPTION ${CPACK_COMPONENT_${comp_upper}_DESCRIPTION})

-   SET(CPACK_COMPONENT_GROUP_${comp_upper}_WIX_LEVEL ${CPACK_COMPONENT_${comp_upper}_WIX_LEVEL})

-   SET(WIX_FEATURES ${WIX_FEATURES} WIX_FEATURE_${comp_upper})

- ELSE()

-   SET(FEATURE_NAME WIX_FEATURE_${CPACK_COMPONENT_${comp_upper}_GROUP})

-   SET(WIX_FEATURES ${WIX_FEATURES} ${FEATURE_NAME})

-   LIST(APPEND ${FEATURE_NAME}_COMPONENTS ${comp})

- ENDIF()

-ENDFOREACH()

-

-LIST(REMOVE_DUPLICATES WIX_FEATURES)

-

-SET(CPACK_WIX_FEATURES)

-

-FOREACH(f ${WIX_FEATURES})

- STRING(TOUPPER "${f}" f_upper)

- STRING(REPLACE "WIX_FEATURE_" "" f_upper ${f_upper})

- IF (CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)

-  SET(TITLE ${CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME})

- ELSE()

-  SET(TITLE  CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)

- ENDIF()

-

- IF (CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)

-  SET(DESCRIPTION ${CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION})

- ELSE()

-  SET(DESCRIPTION CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)

- ENDIF()

- IF(CPACK_COMPONENT_${f_upper}_WIX_LEVEL)

-   SET(Level ${CPACK_COMPONENT_${f_upper}_WIX_LEVEL})

- ELSE()

-   SET(Level 1)

- ENDIF()

- IF(CPACK_COMPONENT_GROUP_${f_upper}_HIDDEN)

-   SET(DISPLAY "Display='hidden'")

-   SET(TITLE ${f_upper})

-   SET(DESCRIPTION ${f_upper})

- ELSE()

-   SET(DISPLAY)

-   IF(CPACK_COMPONENT_GROUP_${f_upper}_EXPANDED)

-    SET(DISPLAY "Display='expand'")

-   ENDIF()

-   IF (CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)

-    SET(TITLE ${CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME})

-   ELSE()

-     SET(TITLE  CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)

-   ENDIF()

-   IF (CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)

-     SET(DESCRIPTION ${CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION})

-   ELSE()

-     SET(DESCRIPTION CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)

-   ENDIF()

- ENDIF()

- 

- SET(CPACK_WIX_FEATURES 

- "${CPACK_WIX_FEATURES}

-   <Feature  Id='${f_upper}'

-     Title='${TITLE}'

-     Description='${DESCRIPTION}'

-     ConfigurableDirectory='INSTALLDIR'

-     Level='${Level}' ${DISPLAY} >"

-  )

- FOREACH(c ${${f}_COMPONENTS})

-   STRING(TOUPPER "${c}" c_upper)

-   IF (CPACK_COMPONENT_${c_upper}_DISPLAY_NAME)

-    SET(TITLE ${CPACK_COMPONENT_${c_upper}_DISPLAY_NAME})

-   ELSE()

-    SET(TITLE CPACK_COMPONENT_${c_upper}_DISPLAY_NAME)

-   ENDIF()

-

-   IF (CPACK_COMPONENT_${c_upper}_DESCRIPTION)

-     SET(DESCRIPTION ${CPACK_COMPONENT_${c_upper}_DESCRIPTION})

-   ELSE()

-     SET(DESCRIPTION CPACK_COMPONENT_${c_upper}_DESCRIPTION)

-   ENDIF()

-   IF(CPACK_COMPONENT_${c_upper}_WIX_LEVEL)

-    SET(Level ${CPACK_COMPONENT_${c_upper}_WIX_LEVEL})

-   ELSE()

-    SET(Level 1)

-   ENDIF()

-   IF(CPACK_COMPONENT_${c_upper}_HIDDEN)

-   SET(CPACK_WIX_FEATURES

-   "${CPACK_WIX_FEATURES} 

-     <ComponentGroupRef Id='componentgroup.${c}'/>")

-   ELSE()

-   SET(CPACK_WIX_FEATURES

-   "${CPACK_WIX_FEATURES} 

-    <Feature Id='${c}' 

-       Title='${TITLE}'

-       Description='${DESCRIPTION}'

-       ConfigurableDirectory='INSTALLDIR'

-       Level='${Level}'>

-       <ComponentGroupRef Id='componentgroup.${c}'/>

-    </Feature>")

-  ENDIF()

-  

-  ENDFOREACH()

-   SET(CPACK_WIX_FEATURES

-   "${CPACK_WIX_FEATURES}

-   </Feature>

-   ") 

-ENDFOREACH()

-

-

-IF(CMAKE_INSTALL_CONFIG_NAME)

-  STRING(REPLACE "${CMAKE_CFG_INTDIR}" "${CMAKE_INSTALL_CONFIG_NAME}" 

-    WIXCA_LOCATION "${WIXCA_LOCATION}")

-  SET(CONFIG_PARAM "-DCMAKE_INSTALL_CONFIG_NAME=${CMAKE_INSTALL_CONFIG_NAME}")

-ENDIF()

-

-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in 

- ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs)

- 

-

-FOREACH(comp ${CPACK_COMPONENTS_ALL})

- SET(ENV{DESTDIR} testinstall/${comp})

- SET(DIRS ${DIRS} testinstall/${comp})

- EXECUTE_PROCESS(

-  COMMAND ${CMAKE_COMMAND} ${CONFIG_PARAM} -DCMAKE_INSTALL_COMPONENT=${comp}  

-   -DCMAKE_INSTALL_PREFIX=  -P ${CMAKE_BINARY_DIR}/cmake_install.cmake

-   OUTPUT_QUIET

-  )

-ENDFOREACH()

-

-MACRO(GENERATE_GUID VarName)

- EXECUTE_PROCESS(COMMAND uuidgen -c 

- OUTPUT_VARIABLE ${VarName}

- OUTPUT_STRIP_TRAILING_WHITESPACE)

-ENDMACRO()

-

-SET(INC_VAR 0)

-MACRO(MAKE_WIX_IDENTIFIER str varname)

-  STRING(REPLACE "/" "." ${varname} "${str}")

-  STRING(REGEX REPLACE "[^a-zA-Z_0-9.]" "_" ${varname} "${${varname}}")

-  STRING(LENGTH "${${varname}}" len)

-  # Identifier should be smaller than 72 character

-  # We have to cut down the length to 70 chars, since we add 2 char prefix

-  # pretty often

-  IF(len GREATER 70)

-   STRING(SUBSTRING  "${${varname}}" 0 67 shortstr)

-   MATH(EXPR INC_VAR ${INC_VAR}+1)

-   SET(${varname} "${shortstr}${INC_VAR}")

-  ENDIF()

-ENDMACRO()

-

-

-FUNCTION(TRAVERSE_FILES dir topdir file file_comp  dir_root)

-  FILE(RELATIVE_PATH dir_rel ${topdir} ${dir})

-  IF(dir_rel)

-    LIST(FIND EXCLUDE_DIRS ${dir_rel} TO_EXCLUDE)

-    IF(NOT TO_EXCLUDE EQUAL -1)

-      MESSAGE(STATUS "excluding directory: ${dir_rel}")

-      RETURN()

-    ENDIF()

-  ENDIF()

-  FILE(GLOB all_files ${dir}/*)

-  IF(NOT all_files)

-    RETURN()

-  ENDIF()

-  IF(dir_rel)

-   MAKE_DIRECTORY(${dir_root}/${dir_rel})

-   MAKE_WIX_IDENTIFIER("${dir_rel}" id)

-   SET(DirectoryRefId  "D.${id}")

-  ELSE()

-   SET(DirectoryRefId "INSTALLDIR")

-  ENDIF()

-  FILE(APPEND ${file} "<DirectoryRef Id='${DirectoryRefId}'>\n")

- 

-  SET(NONEXEFILES)

-  FOREACH(f ${all_files})

-    IF(NOT IS_DIRECTORY ${f})

-      FILE(RELATIVE_PATH rel ${topdir} ${f})

-      SET(TO_EXCLUDE)

-      IF(rel MATCHES "\\.pdb$")

-        SET(TO_EXCLUDE TRUE)

-      ELSE()

-        LIST(FIND EXCLUDE_FILES ${rel} RES)

-        IF(NOT RES EQUAL -1)

-          SET(TO_EXCLUDE TRUE)

-        ENDIF()

-      ENDIF()

-      IF(TO_EXCLUDE)

-        MESSAGE(STATUS "excluding file: ${rel}")

-      ELSE()

-	MAKE_WIX_IDENTIFIER("${rel}" id)

-	FILE(TO_NATIVE_PATH ${f} f_native)

-	GET_FILENAME_COMPONENT(f_ext "${f}" EXT)

-	# According to MSDN each DLL or EXE should be in the own component

-	IF(f_ext MATCHES ".exe" OR f_ext MATCHES ".dll")

-

-	  FILE(APPEND ${file} "  <Component Id='C.${id}' Guid='*' ${Win64}>\n")

-	  FILE(APPEND ${file} "    <File Id='F.${id}' KeyPath='yes' Source='${f_native}'/>\n")

-	  FILE(APPEND ${file} "  </Component>\n")

-	  FILE(APPEND ${file_comp} "  <ComponentRef Id='C.${id}'/>\n")

-       ELSE()

-	SET(NONEXEFILES  "${NONEXEFILES}\n<File Id='F.${id}' Source='${f_native}'/>" )

-	ENDIF()

-      ENDIF()

-    ENDIF()

-  ENDFOREACH()

-  FILE(APPEND ${file} "</DirectoryRef>\n")

-  IF(NONEXEFILES)

-    GENERATE_GUID(guid)

-    SET(ComponentId "C._files_${COMP_NAME}.${DirectoryRefId}")

-    FILE(APPEND ${file} 

-    "<DirectoryRef Id='${DirectoryRefId}'>\n<Component Guid='${guid}' Id='${ComponentId}' ${Win64}>${NONEXEFILES}\n</Component></DirectoryRef>\n")

-	FILE(APPEND ${file_comp} "  <ComponentRef Id='${ComponentId}'/>\n")

-  ENDIF()

-  FOREACH(f ${all_files})

-    IF(IS_DIRECTORY ${f})

-      TRAVERSE_FILES(${f} ${topdir} ${file} ${file_comp}  ${dir_root})

-    ENDIF()

-  ENDFOREACH()

-ENDFUNCTION()

-

-FUNCTION(TRAVERSE_DIRECTORIES dir topdir file prefix)

-  FILE(RELATIVE_PATH rel ${topdir} ${dir})

-  IF(rel)

-    MAKE_WIX_IDENTIFIER("${rel}" id)

-    GET_FILENAME_COMPONENT(name ${dir} NAME)

-    FILE(APPEND ${file} "${prefix}<Directory Id='D.${id}' Name='${name}'>\n")

-  ENDIF()

-  FILE(GLOB all_files ${dir}/*)

-  FOREACH(f ${all_files})

-    IF(IS_DIRECTORY ${f})

-      TRAVERSE_DIRECTORIES(${f} ${topdir} ${file} "${prefix}  ")

-    ENDIF()

-  ENDFOREACH()

-  IF(rel)

-    FILE(APPEND ${file} "${prefix}</Directory>\n")

-  ENDIF()

-ENDFUNCTION()

-

-SET(CPACK_WIX_COMPONENTS)

-SET(CPACK_WIX_COMPONENT_GROUPS)

-GET_FILENAME_COMPONENT(abs . ABSOLUTE)

-FOREACH(d ${DIRS})

-  GET_FILENAME_COMPONENT(d ${d} ABSOLUTE)

-  GET_FILENAME_COMPONENT(d_name ${d} NAME)

-  FILE(WRITE ${abs}/${d_name}_component_group.wxs  "<ComponentGroup Id='componentgroup.${d_name}'>")

-  SET(COMP_NAME ${d_name})

-  TRAVERSE_FILES(${d} ${d} ${abs}/${d_name}.wxs ${abs}/${d_name}_component_group.wxs "${abs}/dirs")

-  FILE(APPEND  ${abs}/${d_name}_component_group.wxs   "</ComponentGroup>")

-  IF(EXISTS ${d_name}.wxs)

-    FILE(READ ${d_name}.wxs WIX_TMP)

-    SET(CPACK_WIX_COMPONENTS "${CPACK_WIX_COMPONENTS}\n${WIX_TMP}")

-    FILE(REMOVE ${d_name}.wxs)

-  ENDIF()

-  

-  FILE(READ ${d_name}_component_group.wxs WIX_TMP)

- 

-  SET(CPACK_WIX_COMPONENT_GROUPS "${CPACK_WIX_COMPONENT_GROUPS}\n${WIX_TMP}")

-  FILE(REMOVE ${d_name}_component_group.wxs)

-ENDFOREACH()

-

-FILE(WRITE directories.wxs "<DirectoryRef Id='INSTALLDIR'>\n")

-TRAVERSE_DIRECTORIES(${abs}/dirs ${abs}/dirs directories.wxs "")

-FILE(APPEND directories.wxs "</DirectoryRef>\n")

-

-FILE(READ directories.wxs CPACK_WIX_DIRECTORIES)

-FILE(REMOVE directories.wxs)

-

-

-FOREACH(src ${CPACK_WIX_INCLUDE})

-SET(CPACK_WIX_INCLUDES 

-"${CPACK_WIX_INCLUDES}

- <?include ${src}?>"

-)

-ENDFOREACH()

-

-

-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in 

- ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs)

-

-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")

-ENDIF()

-

-EXECUTE_PROCESS(

- COMMAND ${LIGHT_EXECUTABLE} -ext WixUIExtension -ext WixUtilExtension

-  mysql_server.wixobj  -out  ${CPACK_PACKAGE_FILE_NAME}.msi

-  ${EXTRA_LIGHT_ARGS}

- RESULT_VARIABLE LIGHT_RESULT

-)

-

-IF(LIGHT_RESULT)

-  MESSAGE(FATAL_ERROR "ERROR: can't run light")

-ENDIF()

-

-# Switch monolithic install on again

-EXECUTE_PROCESS(

-  COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=1 ${CMAKE_BINARY_DIR}

-)

+# Copyright (c) 2010, 2011, 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 as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# 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 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(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(CMAKE_COMMAND "@CMAKE_COMMAND@")
+SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@")
+SET(VERSION "@VERSION@")
+SET(MAJOR_VERSION "@MAJOR_VERSION@")
+SET(MINOR_VERSION "@MINOR_VERSION@")
+SET(PATCH_VERSION "@PATCH_VERSION@")
+SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@)
+SET(MANUFACTURER "@MANUFACTURER@")
+SET(WIXCA_LOCATION "@WIXCA_LOCATION@")
+SET(COPYING_RTF "@COPYING_RTF@")
+SET(CPACK_WIX_CONFIG "@CPACK_WIX_CONFIG@")
+SET(CPACK_WIX_INCLUDE "@CPACK_WIX_INCLUDE@")
+
+LIST(APPEND EXCLUDE_DIRS
+     bin/debug
+     data/test
+     lib/plugin/debug
+     mysql-test
+     scripts
+     sql-bench
+)
+
+LIST(APPEND EXCLUDE_FILES
+     bin/echo.exe
+     bin/mysql_client_test_embedded.exe
+     bin/mysqld-debug.exe
+     bin/mysqltest_embedded.exe
+     bin/replace.exe
+     lib/debug/mysqlserver.lib
+     lib/libmysqld.dll
+     lib/libmysqld.lib
+     lib/mysqlserver.lib
+     lib/mysqlservices.lib
+)
+
+IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  SET(Win64 " Win64='yes'")
+  SET(Platform x64)
+  SET(PlatformProgramFilesFolder ProgramFiles64Folder)
+ELSE()
+  SET(Platform x86)
+  SET(PlatformProgramFilesFolder ProgramFilesFolder)
+  SET(Win64)
+ENDIF()
+
+SET(ENV{VS_UNICODE_OUTPUT})
+
+# Switch off the monolithic install
+EXECUTE_PROCESS(
+  COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=0 ${CMAKE_BINARY_DIR}
+  OUTPUT_QUIET
+)
+
+INCLUDE(${CMAKE_BINARY_DIR}/CPackConfig.cmake)
+
+IF(CPACK_WIX_CONFIG)
+  INCLUDE(${CPACK_WIX_CONFIG})
+ENDIF()
+
+IF(NOT CPACK_WIX_UI)
+  SET(CPACK_WIX_UI "WixUI_Mondo_Custom")
+ENDIF()
+
+SET(WIX_FEATURES)
+FOREACH(comp ${CPACK_COMPONENTS_ALL})
+ STRING(TOUPPER "${comp}" comp_upper)
+ IF(NOT CPACK_COMPONENT_${comp_upper}_GROUP)
+   SET(WIX_FEATURE_${comp_upper}_COMPONENTS "${comp}")
+   SET(CPACK_COMPONENT_${comp_upper}_HIDDEN 1)
+   SET(CPACK_COMPONENT_GROUP_${comp_upper}_DISPLAY_NAME ${CPACK_COMPONENT_${comp_upper}_DISPLAY_NAME})
+   SET(CPACK_COMPONENT_GROUP_${comp_upper}_DESCRIPTION ${CPACK_COMPONENT_${comp_upper}_DESCRIPTION})
+   SET(CPACK_COMPONENT_GROUP_${comp_upper}_WIX_LEVEL ${CPACK_COMPONENT_${comp_upper}_WIX_LEVEL})
+   SET(WIX_FEATURES ${WIX_FEATURES} WIX_FEATURE_${comp_upper})
+ ELSE()
+   SET(FEATURE_NAME WIX_FEATURE_${CPACK_COMPONENT_${comp_upper}_GROUP})
+   SET(WIX_FEATURES ${WIX_FEATURES} ${FEATURE_NAME})
+   LIST(APPEND ${FEATURE_NAME}_COMPONENTS ${comp})
+ ENDIF()
+ENDFOREACH()
+
+LIST(REMOVE_DUPLICATES WIX_FEATURES)
+
+SET(CPACK_WIX_FEATURES)
+
+FOREACH(f ${WIX_FEATURES})
+ STRING(TOUPPER "${f}" f_upper)
+ STRING(REPLACE "WIX_FEATURE_" "" f_upper ${f_upper})
+ IF (CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)
+  SET(TITLE ${CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME})
+ ELSE()
+  SET(TITLE  CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)
+ ENDIF()
+
+ IF (CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)
+  SET(DESCRIPTION ${CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION})
+ ELSE()
+  SET(DESCRIPTION CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)
+ ENDIF()
+ IF(CPACK_COMPONENT_${f_upper}_WIX_LEVEL)
+   SET(Level ${CPACK_COMPONENT_${f_upper}_WIX_LEVEL})
+ ELSE()
+   SET(Level 1)
+ ENDIF()
+ IF(CPACK_COMPONENT_GROUP_${f_upper}_HIDDEN)
+   SET(DISPLAY "Display='hidden'")
+   SET(TITLE ${f_upper})
+   SET(DESCRIPTION ${f_upper})
+ ELSE()
+   SET(DISPLAY)
+   IF(CPACK_COMPONENT_GROUP_${f_upper}_EXPANDED)
+    SET(DISPLAY "Display='expand'")
+   ENDIF()
+   IF (CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)
+    SET(TITLE ${CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME})
+   ELSE()
+     SET(TITLE  CPACK_COMPONENT_GROUP_${f_upper}_DISPLAY_NAME)
+   ENDIF()
+   IF (CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)
+     SET(DESCRIPTION ${CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION})
+   ELSE()
+     SET(DESCRIPTION CPACK_COMPONENT_GROUP_${f_upper}_DESCRIPTION)
+   ENDIF()
+ ENDIF()
+ 
+ SET(CPACK_WIX_FEATURES 
+ "${CPACK_WIX_FEATURES}
+   <Feature  Id='${f_upper}'
+     Title='${TITLE}'
+     Description='${DESCRIPTION}'
+     ConfigurableDirectory='INSTALLDIR'
+     Level='${Level}' ${DISPLAY} >"
+  )
+ FOREACH(c ${${f}_COMPONENTS})
+   STRING(TOUPPER "${c}" c_upper)
+   IF (CPACK_COMPONENT_${c_upper}_DISPLAY_NAME)
+    SET(TITLE ${CPACK_COMPONENT_${c_upper}_DISPLAY_NAME})
+   ELSE()
+    SET(TITLE CPACK_COMPONENT_${c_upper}_DISPLAY_NAME)
+   ENDIF()
+
+   IF (CPACK_COMPONENT_${c_upper}_DESCRIPTION)
+     SET(DESCRIPTION ${CPACK_COMPONENT_${c_upper}_DESCRIPTION})
+   ELSE()
+     SET(DESCRIPTION CPACK_COMPONENT_${c_upper}_DESCRIPTION)
+   ENDIF()
+   IF(CPACK_COMPONENT_${c_upper}_WIX_LEVEL)
+    SET(Level ${CPACK_COMPONENT_${c_upper}_WIX_LEVEL})
+   ELSE()
+    SET(Level 1)
+   ENDIF()
+   IF(CPACK_COMPONENT_${c_upper}_HIDDEN)
+   SET(CPACK_WIX_FEATURES
+   "${CPACK_WIX_FEATURES} 
+     <ComponentGroupRef Id='componentgroup.${c}'/>")
+   ELSE()
+   SET(CPACK_WIX_FEATURES
+   "${CPACK_WIX_FEATURES} 
+    <Feature Id='${c}' 
+       Title='${TITLE}'
+       Description='${DESCRIPTION}'
+       ConfigurableDirectory='INSTALLDIR'
+       Level='${Level}'>
+       <ComponentGroupRef Id='componentgroup.${c}'/>
+    </Feature>")
+  ENDIF()
+  
+  ENDFOREACH()
+   SET(CPACK_WIX_FEATURES
+   "${CPACK_WIX_FEATURES}
+   </Feature>
+   ") 
+ENDFOREACH()
+
+
+IF(CMAKE_INSTALL_CONFIG_NAME)
+  STRING(REPLACE "${CMAKE_CFG_INTDIR}" "${CMAKE_INSTALL_CONFIG_NAME}" 
+    WIXCA_LOCATION "${WIXCA_LOCATION}")
+  SET(CONFIG_PARAM "-DCMAKE_INSTALL_CONFIG_NAME=${CMAKE_INSTALL_CONFIG_NAME}")
+ENDIF()
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in 
+ ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs)
+ 
+
+FOREACH(comp ${CPACK_COMPONENTS_ALL})
+ SET(ENV{DESTDIR} testinstall/${comp})
+ SET(DIRS ${DIRS} testinstall/${comp})
+ EXECUTE_PROCESS(
+  COMMAND ${CMAKE_COMMAND} ${CONFIG_PARAM} -DCMAKE_INSTALL_COMPONENT=${comp}  
+   -DCMAKE_INSTALL_PREFIX=  -P ${CMAKE_BINARY_DIR}/cmake_install.cmake
+   OUTPUT_QUIET
+  )
+ENDFOREACH()
+
+MACRO(GENERATE_GUID VarName)
+ EXECUTE_PROCESS(COMMAND uuidgen -c 
+ OUTPUT_VARIABLE ${VarName}
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ENDMACRO()
+
+SET(INC_VAR 0)
+MACRO(MAKE_WIX_IDENTIFIER str varname)
+  STRING(REPLACE "/" "." ${varname} "${str}")
+  STRING(REGEX REPLACE "[^a-zA-Z_0-9.]" "_" ${varname} "${${varname}}")
+  STRING(LENGTH "${${varname}}" len)
+  # Identifier should be smaller than 72 character
+  # We have to cut down the length to 70 chars, since we add 2 char prefix
+  # pretty often
+  IF(len GREATER 70)
+   STRING(SUBSTRING  "${${varname}}" 0 67 shortstr)
+   MATH(EXPR INC_VAR ${INC_VAR}+1)
+   SET(${varname} "${shortstr}${INC_VAR}")
+  ENDIF()
+ENDMACRO()
+
+
+FUNCTION(TRAVERSE_FILES dir topdir file file_comp  dir_root)
+  FILE(RELATIVE_PATH dir_rel ${topdir} ${dir})
+  IF(dir_rel)
+    LIST(FIND EXCLUDE_DIRS ${dir_rel} TO_EXCLUDE)
+    IF(NOT TO_EXCLUDE EQUAL -1)
+      MESSAGE(STATUS "excluding directory: ${dir_rel}")
+      RETURN()
+    ENDIF()
+  ENDIF()
+  FILE(GLOB all_files ${dir}/*)
+  IF(NOT all_files)
+    RETURN()
+  ENDIF()
+  IF(dir_rel)
+   MAKE_DIRECTORY(${dir_root}/${dir_rel})
+   MAKE_WIX_IDENTIFIER("${dir_rel}" id)
+   SET(DirectoryRefId  "D.${id}")
+  ELSE()
+   SET(DirectoryRefId "INSTALLDIR")
+  ENDIF()
+  FILE(APPEND ${file} "<DirectoryRef Id='${DirectoryRefId}'>\n")
+ 
+  SET(NONEXEFILES)
+  FOREACH(f ${all_files})
+    IF(NOT IS_DIRECTORY ${f})
+      FILE(RELATIVE_PATH rel ${topdir} ${f})
+      SET(TO_EXCLUDE)
+      IF(rel MATCHES "\\.pdb$")
+        SET(TO_EXCLUDE TRUE)
+      ELSE()
+        LIST(FIND EXCLUDE_FILES ${rel} RES)
+        IF(NOT RES EQUAL -1)
+          SET(TO_EXCLUDE TRUE)
+        ENDIF()
+      ENDIF()
+      IF(TO_EXCLUDE)
+        MESSAGE(STATUS "excluding file: ${rel}")
+      ELSE()
+	MAKE_WIX_IDENTIFIER("${rel}" id)
+	FILE(TO_NATIVE_PATH ${f} f_native)
+	GET_FILENAME_COMPONENT(f_ext "${f}" EXT)
+	# According to MSDN each DLL or EXE should be in the own component
+	IF(f_ext MATCHES ".exe" OR f_ext MATCHES ".dll")
+
+	  FILE(APPEND ${file} "  <Component Id='C.${id}' Guid='*' ${Win64}>\n")
+	  FILE(APPEND ${file} "    <File Id='F.${id}' KeyPath='yes' Source='${f_native}'/>\n")
+	  FILE(APPEND ${file} "  </Component>\n")
+	  FILE(APPEND ${file_comp} "  <ComponentRef Id='C.${id}'/>\n")
+       ELSE()
+	SET(NONEXEFILES  "${NONEXEFILES}\n<File Id='F.${id}' Source='${f_native}'/>" )
+	ENDIF()
+      ENDIF()
+    ENDIF()
+  ENDFOREACH()
+  FILE(APPEND ${file} "</DirectoryRef>\n")
+  IF(NONEXEFILES)
+    GENERATE_GUID(guid)
+    SET(ComponentId "C._files_${COMP_NAME}.${DirectoryRefId}")
+    FILE(APPEND ${file} 
+    "<DirectoryRef Id='${DirectoryRefId}'>\n<Component Guid='${guid}' Id='${ComponentId}' ${Win64}>${NONEXEFILES}\n</Component></DirectoryRef>\n")
+	FILE(APPEND ${file_comp} "  <ComponentRef Id='${ComponentId}'/>\n")
+  ENDIF()
+  FOREACH(f ${all_files})
+    IF(IS_DIRECTORY ${f})
+      TRAVERSE_FILES(${f} ${topdir} ${file} ${file_comp}  ${dir_root})
+    ENDIF()
+  ENDFOREACH()
+ENDFUNCTION()
+
+FUNCTION(TRAVERSE_DIRECTORIES dir topdir file prefix)
+  FILE(RELATIVE_PATH rel ${topdir} ${dir})
+  IF(rel)
+    MAKE_WIX_IDENTIFIER("${rel}" id)
+    GET_FILENAME_COMPONENT(name ${dir} NAME)
+    FILE(APPEND ${file} "${prefix}<Directory Id='D.${id}' Name='${name}'>\n")
+  ENDIF()
+  FILE(GLOB all_files ${dir}/*)
+  FOREACH(f ${all_files})
+    IF(IS_DIRECTORY ${f})
+      TRAVERSE_DIRECTORIES(${f} ${topdir} ${file} "${prefix}  ")
+    ENDIF()
+  ENDFOREACH()
+  IF(rel)
+    FILE(APPEND ${file} "${prefix}</Directory>\n")
+  ENDIF()
+ENDFUNCTION()
+
+SET(CPACK_WIX_COMPONENTS)
+SET(CPACK_WIX_COMPONENT_GROUPS)
+GET_FILENAME_COMPONENT(abs . ABSOLUTE)
+FOREACH(d ${DIRS})
+  GET_FILENAME_COMPONENT(d ${d} ABSOLUTE)
+  GET_FILENAME_COMPONENT(d_name ${d} NAME)
+  FILE(WRITE ${abs}/${d_name}_component_group.wxs  "<ComponentGroup Id='componentgroup.${d_name}'>")
+  SET(COMP_NAME ${d_name})
+  TRAVERSE_FILES(${d} ${d} ${abs}/${d_name}.wxs ${abs}/${d_name}_component_group.wxs "${abs}/dirs")
+  FILE(APPEND  ${abs}/${d_name}_component_group.wxs   "</ComponentGroup>")
+  IF(EXISTS ${d_name}.wxs)
+    FILE(READ ${d_name}.wxs WIX_TMP)
+    SET(CPACK_WIX_COMPONENTS "${CPACK_WIX_COMPONENTS}\n${WIX_TMP}")
+    FILE(REMOVE ${d_name}.wxs)
+  ENDIF()
+  
+  FILE(READ ${d_name}_component_group.wxs WIX_TMP)
+ 
+  SET(CPACK_WIX_COMPONENT_GROUPS "${CPACK_WIX_COMPONENT_GROUPS}\n${WIX_TMP}")
+  FILE(REMOVE ${d_name}_component_group.wxs)
+ENDFOREACH()
+
+FILE(WRITE directories.wxs "<DirectoryRef Id='INSTALLDIR'>\n")
+TRAVERSE_DIRECTORIES(${abs}/dirs ${abs}/dirs directories.wxs "")
+FILE(APPEND directories.wxs "</DirectoryRef>\n")
+
+FILE(READ directories.wxs CPACK_WIX_DIRECTORIES)
+FILE(REMOVE directories.wxs)
+
+
+FOREACH(src ${CPACK_WIX_INCLUDE})
+SET(CPACK_WIX_INCLUDES 
+"${CPACK_WIX_INCLUDES}
+ <?include ${src}?>"
+)
+ENDFOREACH()
+
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in 
+ ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs)
+
+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")
+ENDIF()
+
+EXECUTE_PROCESS(
+ COMMAND ${LIGHT_EXECUTABLE} -ext WixUIExtension -ext WixUtilExtension
+  mysql_server.wixobj  -out  ${CPACK_PACKAGE_FILE_NAME}.msi
+  ${EXTRA_LIGHT_ARGS}
+ RESULT_VARIABLE LIGHT_RESULT
+)
+
+IF(LIGHT_RESULT)
+  MESSAGE(FATAL_ERROR "ERROR: can't run light")
+ENDIF()
+
+# Switch monolithic install on again
+EXECUTE_PROCESS(
+  COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=1 ${CMAKE_BINARY_DIR}
+)
diff --git a/packaging/WiX/custom_ui.wxs b/packaging/WiX/custom_ui.wxs
index a28c3c9b8a1..0ccd30f6754 100644
--- a/packaging/WiX/custom_ui.wxs
+++ b/packaging/WiX/custom_ui.wxs
@@ -1,115 +1,115 @@
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"

-         xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">

-

-<!--

-   Copyright (c) 2010, 2015, 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 as published by

-   the Free Software Foundation; version 2 of the License.

-   

-   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 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

--->

-

-  <UI Id="WixUI_Mondo_Custom">

-    <Dialog Id="CustomWelcomeDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">

-      <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">

-        <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>

-      </Control>

-      <Control Id="Next" Type="PushButton" X="220" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">

-        <Publish Event="NewDialog" Value="LicenseAgreementDlg">NOT OLDERVERSIONBEINGUPGRADED</Publish>

-        <Publish Event="NewDialog" Value="UpgradeDlg">OLDERVERSIONBEINGUPGRADED</Publish>

-	  </Control>	  

-      <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" Disabled="yes" />

-      <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" />

-      <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />

-      <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved." />

-      <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />

-      <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />

-    </Dialog>

-

-    <Dialog Id="UpgradeDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">

-      <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes"  Text="Upgrade">

-        <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>

-        <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>

-        <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>

-        <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>

-        <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>

-      </Control>

-      <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">

-        <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>

-      </Control>

-      <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)">

-        <Condition Action="default">WixUI_InstallMode = "Remove"</Condition>

-      </Control>

-      <Control Id="InstallTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallTitle)">

-        <Condition Action="show">NOT Installed</Condition>

-      </Control>

-      <Control Id="InstallText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallText)">

-        <Condition Action="show">NOT Installed</Condition>

-      </Control>

-      <Control Id="UpgradeText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="no" NoPrefix="yes"

-      Text="Click Upgrade to upgrade your installation from version [OLDERVERSION] to version [ProductVersion]. Click Cancel to exit the upgrade."/>

-      <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.VerifyReadyDlgBannerBitmap)" />

-      <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />

-      <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />

-    </Dialog>

-

-    <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />

-    <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />

-    <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />

-

-    <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />

-    <Property Id="WixUI_Mode" Value="Mondo" />

-

-    <DialogRef Id="ErrorDlg" />

-    <DialogRef Id="FatalError" />

-    <DialogRef Id="FilesInUse" />

-    <DialogRef Id="MsiRMFilesInUse" />

-    <DialogRef Id="PrepareDlg" />

-    <DialogRef Id="ProgressDlg" />

-    <DialogRef Id="ResumeDlg" />

-    <DialogRef Id="UserExit" />

-

-    <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>

-

-    <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg">1</Publish>

-    <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2">LicenseAccepted = "1"</Publish>

-

-    <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>

-    <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>

-    <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>

-    <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>

-

-    <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish>

-    <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish>

-    <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>

-

-    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish>

-    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>

-    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish>

-    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish>

-

-    <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>

-

-    <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>

-    <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>

-    <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>

-    <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>

-

-    <Publish Dialog="UpgradeDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg">1</Publish>

-	

-    <InstallUISequence>

-      <Show Dialog="CustomWelcomeDlg" Before="ProgressDlg">NOT Installed</Show>

-    </InstallUISequence>

-  </UI>

-

-  <UIRef Id="WixUI_Common" />

-</Include>

+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
+         xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+<!--
+   Copyright (c) 2010, 2015, 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 as published by
+   the Free Software Foundation; version 2 of the License.
+   
+   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 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
+-->
+
+  <UI Id="WixUI_Mondo_Custom">
+    <Dialog Id="CustomWelcomeDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
+      <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+        <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+      </Control>
+      <Control Id="Next" Type="PushButton" X="220" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
+        <Publish Event="NewDialog" Value="LicenseAgreementDlg">NOT OLDERVERSIONBEINGUPGRADED</Publish>
+        <Publish Event="NewDialog" Value="UpgradeDlg">OLDERVERSIONBEINGUPGRADED</Publish>
+	  </Control>	  
+      <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" Disabled="yes" />
+      <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" />
+      <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
+      <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved." />
+      <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
+      <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+    </Dialog>
+
+    <Dialog Id="UpgradeDlg" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes">
+      <Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes"  Text="Upgrade">
+        <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
+        <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>
+        <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+        <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>
+        <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>
+      </Control>
+      <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+        <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+      </Control>
+      <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)">
+        <Condition Action="default">WixUI_InstallMode = "Remove"</Condition>
+      </Control>
+      <Control Id="InstallTitle" Type="Text" X="15" Y="15" Width="300" Height="15" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallTitle)">
+        <Condition Action="show">NOT Installed</Condition>
+      </Control>
+      <Control Id="InstallText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="yes" Text="!(loc.VerifyReadyDlgInstallText)">
+        <Condition Action="show">NOT Installed</Condition>
+      </Control>
+      <Control Id="UpgradeText" Type="Text" X="25" Y="70" Width="320" Height="80" Hidden="no" NoPrefix="yes"
+      Text="Click Upgrade to upgrade your installation from version [OLDERVERSION] to version [ProductVersion]. Click Cancel to exit the upgrade."/>
+      <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.VerifyReadyDlgBannerBitmap)" />
+      <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+      <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+    </Dialog>
+
+    <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+    <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+    <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+    <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+    <Property Id="WixUI_Mode" Value="Mondo" />
+
+    <DialogRef Id="ErrorDlg" />
+    <DialogRef Id="FatalError" />
+    <DialogRef Id="FilesInUse" />
+    <DialogRef Id="MsiRMFilesInUse" />
+    <DialogRef Id="PrepareDlg" />
+    <DialogRef Id="ProgressDlg" />
+    <DialogRef Id="ResumeDlg" />
+    <DialogRef Id="UserExit" />
+
+    <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+    <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg">1</Publish>
+    <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2">LicenseAccepted = "1"</Publish>
+
+    <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+    <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+    <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
+    <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
+    <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish>
+    <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish>
+    <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
+    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish>
+    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish>
+    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish>
+    <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish>
+
+    <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+    <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish>
+    <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+    <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+    <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+
+    <Publish Dialog="UpgradeDlg" Control="Back" Event="NewDialog" Value="CustomWelcomeDlg">1</Publish>
+	
+    <InstallUISequence>
+      <Show Dialog="CustomWelcomeDlg" Before="ProgressDlg">NOT Installed</Show>
+    </InstallUISequence>
+  </UI>
+
+  <UIRef Id="WixUI_Common" />
+</Include>
diff --git a/packaging/WiX/extra.wxs.in b/packaging/WiX/extra.wxs.in
index 91bf3f64b8e..92a79064d54 100644
--- a/packaging/WiX/extra.wxs.in
+++ b/packaging/WiX/extra.wxs.in
@@ -1,81 +1,81 @@
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"

-         xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">

-

-<!--

-   Copyright (c) 2010, 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 as published by

-   the Free Software Foundation; version 2 of the License.

-   

-   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 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

--->

-

-  <!-- Datafiles that installation will copy to CommonAppData (initial database)

-  They are declared Permanent and NeverOverwrite since it is user data -->

-  <DirectoryRef Id='TARGETDIR'>

-    <Directory Id="CommonAppDataFolder">

-      <Directory Id="datadir.mysql" Name="MySQL">

-        <Directory Id="datadir.mysql.mysqlserver"

-          Name="MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@">

-          <Directory Id="DATADIR" Name=".">

-            <Component Id="component.datadir" Guid="d3491319-5dbc-4477-95f3-4f809ef1dd2d">

-              <CreateFolder>

-                <util:PermissionEx User="[LogonUser]" GenericAll="yes" />

-              </CreateFolder>

-            </Component>

-            <Directory Id="datadir.mysql.mysqlserver.data" Name="data">

-              <Directory Id="datadir.mysql.mysqlserver.data.mysql" Name="mysql">

-                <Component Id="component.datadir.mysql"

-                  Guid="19ec0f1f-1a7f-424e-a788-b09346c0a709"

-                  Permanent="yes" NeverOverwrite="yes">

-                  <CreateFolder>

-                    <util:PermissionEx User="[LogonUser]" GenericAll="yes" />

-                  </CreateFolder>

-                  @DATADIR_MYSQL_FILES@

-                </Component>

-              </Directory>

-              <Directory Id="datadir.mysql.mysqlserver.data.performance_schema"

-                 Name="performance_schema">

-                <Component Id="component.datadir.performance_schema"

-                  Guid="af2a6776-2655-431f-a748-9e9f4645acc3"

-                  Permanent="yes" NeverOverwrite="yes">

-                  <CreateFolder>

-                    <util:PermissionEx User="[LogonUser]" GenericAll="yes" />

-                  </CreateFolder>

-                  @DATADIR_PERFORMANCE_SCHEMA_FILES@

-                </Component>

-              </Directory>

-              <Directory Id="datadir.mysql.mysqlserver.data.test" Name="test">

-                <Component Id="component.datadir.test" Guid="52fa9f0a-fcd1-420a-b2ac-95a8f70ad20a">

-                  <CreateFolder/>

-                </Component>

-              </Directory>

-            </Directory>

-          </Directory>

-        </Directory>

-      </Directory>

-    </Directory>

-  </DirectoryRef>

-

-  <Feature Id='UserEditableDataFiles' 

-       Title='Server data files'

-       Description='Server data files'

-       ConfigurableDirectory='DATADIR'

-       Level='1'>

-    <ComponentRef Id="component.datadir"/>

-    <ComponentRef Id="component.datadir.mysql"/>

-    <ComponentRef Id="component.datadir.performance_schema"/>

-    <ComponentRef Id="component.datadir.test"/>

-  </Feature>

-</Include>

-

-

-

+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
+         xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+<!--
+   Copyright (c) 2010, 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 as published by
+   the Free Software Foundation; version 2 of the License.
+   
+   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 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
+-->
+
+  <!-- Datafiles that installation will copy to CommonAppData (initial database)
+  They are declared Permanent and NeverOverwrite since it is user data -->
+  <DirectoryRef Id='TARGETDIR'>
+    <Directory Id="CommonAppDataFolder">
+      <Directory Id="datadir.mysql" Name="MySQL">
+        <Directory Id="datadir.mysql.mysqlserver"
+          Name="MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@">
+          <Directory Id="DATADIR" Name=".">
+            <Component Id="component.datadir" Guid="d3491319-5dbc-4477-95f3-4f809ef1dd2d">
+              <CreateFolder>
+                <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
+              </CreateFolder>
+            </Component>
+            <Directory Id="datadir.mysql.mysqlserver.data" Name="data">
+              <Directory Id="datadir.mysql.mysqlserver.data.mysql" Name="mysql">
+                <Component Id="component.datadir.mysql"
+                  Guid="19ec0f1f-1a7f-424e-a788-b09346c0a709"
+                  Permanent="yes" NeverOverwrite="yes">
+                  <CreateFolder>
+                    <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
+                  </CreateFolder>
+                  @DATADIR_MYSQL_FILES@
+                </Component>
+              </Directory>
+              <Directory Id="datadir.mysql.mysqlserver.data.performance_schema"
+                 Name="performance_schema">
+                <Component Id="component.datadir.performance_schema"
+                  Guid="af2a6776-2655-431f-a748-9e9f4645acc3"
+                  Permanent="yes" NeverOverwrite="yes">
+                  <CreateFolder>
+                    <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
+                  </CreateFolder>
+                  @DATADIR_PERFORMANCE_SCHEMA_FILES@
+                </Component>
+              </Directory>
+              <Directory Id="datadir.mysql.mysqlserver.data.test" Name="test">
+                <Component Id="component.datadir.test" Guid="52fa9f0a-fcd1-420a-b2ac-95a8f70ad20a">
+                  <CreateFolder/>
+                </Component>
+              </Directory>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+  </DirectoryRef>
+
+  <Feature Id='UserEditableDataFiles' 
+       Title='Server data files'
+       Description='Server data files'
+       ConfigurableDirectory='DATADIR'
+       Level='1'>
+    <ComponentRef Id="component.datadir"/>
+    <ComponentRef Id="component.datadir.mysql"/>
+    <ComponentRef Id="component.datadir.performance_schema"/>
+    <ComponentRef Id="component.datadir.test"/>
+  </Feature>
+</Include>
+
+
+
diff --git a/packaging/WiX/mysql_server.wxs.in b/packaging/WiX/mysql_server.wxs.in
index 1802baedf3b..1e7c20468ef 100644
--- a/packaging/WiX/mysql_server.wxs.in
+++ b/packaging/WiX/mysql_server.wxs.in
@@ -1,196 +1,196 @@
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" 

-      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">

-

-<!--

-   Copyright (c) 2010, 2013, 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 as published by

-   the Free Software Foundation; version 2 of the License.

-   

-   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 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

--->

-

-  <Product 

-    Id="*" 

-    UpgradeCode="49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3"

-    Name="MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@" 

-    Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@" 

-    Language="1033" 

-    Manufacturer="@MANUFACTURER@">

-    

-    <Package Id='*'

-       Keywords='Installer'

-       Description="MySQL Database Server"

-       Manufacturer='@MANUFACTURER@'

-       InstallerVersion='200'

-       Languages='1033'

-       Compressed='yes'

-       SummaryCodepage='1252'

-       Platform='@Platform@'

-       InstallScope="perMachine"/>

-  

-    <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />

-

-    <!-- Upgrade -->

-    <Upgrade Id="49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3">

-      <UpgradeVersion 

-        Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0"

-        IncludeMinimum="yes"

-        Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"

-        IncludeMaximum="yes"

-        Property="OLDERVERSIONBEINGUPGRADED"

-        MigrateFeatures="yes"

-        />

-      <UpgradeVersion 

-        Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"

-        IncludeMinimum="no"

-        OnlyDetect="yes"

-        Property="NEWERVERSIONDETECTED" />

-    </Upgrade>

-    <Condition Message="A later version of [ProductName] is already installed. Setup will now exit.">

-      NOT NEWERVERSIONDETECTED OR Installed

-    </Condition>

-    <InstallExecuteSequence>

-      <RemoveExistingProducts After="InstallInitialize"/>

-    </InstallExecuteSequence>

-

-    <!-- Save/restore install location -->

-    <CustomAction Id="SaveTargetDir" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />

-    <InstallExecuteSequence>

-      <Custom Action="SaveTargetDir" After="InstallValidate">

-        NOT

-        Installed

-      </Custom>

-    </InstallExecuteSequence>

-    <InstallUISequence>

-      <!-- App search is what does FindInstallLocation, and it is dependent on FindRelatedProducts -->

-      <AppSearch After="FindRelatedProducts"/>

-    </InstallUISequence>

- 

-    <!-- Find previous installation -->

-    <Property Id="INSTALLDIR">

-      <RegistrySearch Id="FindInstallLocation"

-          Root="HKLM"

-          Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"

-          Name="InstallLocation"

-          Type="raw" />

-    </Property>

-    <?if @Platform@ != "x64" ?>

-        <Property Id="OLDERVERSION"> 

-          <RegistrySearch Id="FindOlderVersion"

-            Root="HKLM"

-            Win64 = "no"

-            Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"

-            Name="DisplayVersion"

-            Type="raw" />

-        </Property>

-    <?else ?>

-        <Property Id="OLDERVERSION"> 

-          <RegistrySearch Id="FindOlderVersion"

-            Root="HKLM"

-            Win64 = "yes"

-            Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"

-            Name="DisplayVersion"

-            Type="raw" />

-        </Property>

-    <?endif ?>

-    <Property Id="DATADIR">

-      <RegistrySearch Id="FindDataDir"

-          Root="HKLM"

-          Key="SOFTWARE\MySQL AB\[ProductName]"

-          Name="DataLocation"

-          Type="raw" />

-    </Property>

-    <Property Id="INSTALLDIR2">

-       <RegistrySearch Id="FindInstallLocation2"

-          Root="HKLM"

-          Key="SOFTWARE\MySQL AB\[ProductName]"

-          Name="Location"

-          Type="raw" />

-    </Property>

-    <CustomAction Id="SetInstallDir2" Property="INSTALLDIR" Value="[INSTALLDIR2]" /> 

-    <InstallUISequence>

-    <Custom Action="SetInstallDir2" After="AppSearch">INSTALLDIR2</Custom> 

-    </InstallUISequence>

-

-

-    <!-- UI -->

-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>

-    <UIRef Id="@CPACK_WIX_UI@" />

-    <UIRef Id="WixUI_ErrorProgressText" />

-    <WixVariable

-      Id="WixUIBannerBmp"

-      Value="@CMAKE_CURRENT_SOURCE_DIR@/AdminHeader.jpg" />

-    <WixVariable

-      Id="WixUIDialogBmp"

-      Value="@CMAKE_CURRENT_SOURCE_DIR@/AdminBackground.jpg" />

-    <Icon

-      Id="icon.ico"

-      SourceFile="@CMAKE_CURRENT_SOURCE_DIR@/MySQLServer.ico"/>

-    <Property

-      Id="ARPPRODUCTICON"

-      Value="icon.ico" />

-    

-    <!-- License -->

-    <WixVariable

-      Id="WixUILicenseRtf"

-      Value="@COPYING_RTF@"/>

-

-    <!-- How to remove the service on uninstall -->

-    <Binary Id='wixca.dll' SourceFile='@WIXCA_LOCATION@' />

-    <CustomAction Id="UnregisterProperty" Property="UnregisterService" Value="[INSTALLDIR]" Return="check" />

-    <CustomAction Id="UnregisterPropertySilent" Property="UnregisterServiceSilently" Value="[INSTALLDIR]" Return="check" />

-    <CustomAction Id="UnregisterService"

-                  BinaryKey="wixca.dll"

-                  DllEntry="RemoveService"

-                  Execute="deferred"

-                  Impersonate="no"

-                  Return="check" />

-    <CustomAction Id="UnregisterServiceSilently"

-                  BinaryKey="wixca.dll"

-                  DllEntry="RemoveServiceNoninteractive"

-                  Execute="deferred"

-                  Impersonate="no"

-                  Return="check" />

-    <InstallExecuteSequence>

-      <Custom Action="UnregisterProperty" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>

-      <Custom Action="UnregisterPropertySilent" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>

-      <Custom Action="UnregisterService" After="UnregisterProperty">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel&gt;4</Custom>

-      <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel&lt;=4</Custom>

-    </InstallExecuteSequence>

-

-    <!-- Installation root-->

-    <Directory Id='TARGETDIR' Name='SourceDir'>

-      <Directory Id='@PlatformProgramFilesFolder@'>

-        <Directory Id='directory.MySQL' Name='MySQL'>

-          <Directory Id='INSTALLDIR' Name='MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@'>

-          </Directory>

-        </Directory>

-      </Directory>

-    </Directory>

-    

-    <!-- CPACK_WIX_FEATURES -->

-    @CPACK_WIX_FEATURES@

-    

-    <!-- CPACK_WIX_DIRECTORIES -->

-    @CPACK_WIX_DIRECTORIES@

-    

-    <!--CPACK_WIX_COMPONENTS-->

-    @CPACK_WIX_COMPONENTS@

-    

-    <!--CPACK_WIX_COMPONENTS_GROUPS -->

-    @CPACK_WIX_COMPONENT_GROUPS@

-    

-    <!--CPACK_WIX_INCLUDES -->

-    @CPACK_WIX_INCLUDES@

-  </Product>

-

-</Wix>

+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" 
+      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+<!--
+   Copyright (c) 2010, 2013, 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 as published by
+   the Free Software Foundation; version 2 of the License.
+   
+   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 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
+-->
+
+  <Product 
+    Id="*" 
+    UpgradeCode="49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3"
+    Name="MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@" 
+    Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@" 
+    Language="1033" 
+    Manufacturer="@MANUFACTURER@">
+    
+    <Package Id='*'
+       Keywords='Installer'
+       Description="MySQL Database Server"
+       Manufacturer='@MANUFACTURER@'
+       InstallerVersion='200'
+       Languages='1033'
+       Compressed='yes'
+       SummaryCodepage='1252'
+       Platform='@Platform@'
+       InstallScope="perMachine"/>
+  
+    <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
+
+    <!-- Upgrade -->
+    <Upgrade Id="49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3">
+      <UpgradeVersion 
+        Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0"
+        IncludeMinimum="yes"
+        Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"
+        IncludeMaximum="yes"
+        Property="OLDERVERSIONBEINGUPGRADED"
+        MigrateFeatures="yes"
+        />
+      <UpgradeVersion 
+        Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"
+        IncludeMinimum="no"
+        OnlyDetect="yes"
+        Property="NEWERVERSIONDETECTED" />
+    </Upgrade>
+    <Condition Message="A later version of [ProductName] is already installed. Setup will now exit.">
+      NOT NEWERVERSIONDETECTED OR Installed
+    </Condition>
+    <InstallExecuteSequence>
+      <RemoveExistingProducts After="InstallInitialize"/>
+    </InstallExecuteSequence>
+
+    <!-- Save/restore install location -->
+    <CustomAction Id="SaveTargetDir" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
+    <InstallExecuteSequence>
+      <Custom Action="SaveTargetDir" After="InstallValidate">
+        NOT
+        Installed
+      </Custom>
+    </InstallExecuteSequence>
+    <InstallUISequence>
+      <!-- App search is what does FindInstallLocation, and it is dependent on FindRelatedProducts -->
+      <AppSearch After="FindRelatedProducts"/>
+    </InstallUISequence>
+ 
+    <!-- Find previous installation -->
+    <Property Id="INSTALLDIR">
+      <RegistrySearch Id="FindInstallLocation"
+          Root="HKLM"
+          Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
+          Name="InstallLocation"
+          Type="raw" />
+    </Property>
+    <?if @Platform@ != "x64" ?>
+        <Property Id="OLDERVERSION"> 
+          <RegistrySearch Id="FindOlderVersion"
+            Root="HKLM"
+            Win64 = "no"
+            Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
+            Name="DisplayVersion"
+            Type="raw" />
+        </Property>
+    <?else ?>
+        <Property Id="OLDERVERSION"> 
+          <RegistrySearch Id="FindOlderVersion"
+            Root="HKLM"
+            Win64 = "yes"
+            Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
+            Name="DisplayVersion"
+            Type="raw" />
+        </Property>
+    <?endif ?>
+    <Property Id="DATADIR">
+      <RegistrySearch Id="FindDataDir"
+          Root="HKLM"
+          Key="SOFTWARE\MySQL AB\[ProductName]"
+          Name="DataLocation"
+          Type="raw" />
+    </Property>
+    <Property Id="INSTALLDIR2">
+       <RegistrySearch Id="FindInstallLocation2"
+          Root="HKLM"
+          Key="SOFTWARE\MySQL AB\[ProductName]"
+          Name="Location"
+          Type="raw" />
+    </Property>
+    <CustomAction Id="SetInstallDir2" Property="INSTALLDIR" Value="[INSTALLDIR2]" /> 
+    <InstallUISequence>
+    <Custom Action="SetInstallDir2" After="AppSearch">INSTALLDIR2</Custom> 
+    </InstallUISequence>
+
+
+    <!-- UI -->
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
+    <UIRef Id="@CPACK_WIX_UI@" />
+    <UIRef Id="WixUI_ErrorProgressText" />
+    <WixVariable
+      Id="WixUIBannerBmp"
+      Value="@CMAKE_CURRENT_SOURCE_DIR@/AdminHeader.jpg" />
+    <WixVariable
+      Id="WixUIDialogBmp"
+      Value="@CMAKE_CURRENT_SOURCE_DIR@/AdminBackground.jpg" />
+    <Icon
+      Id="icon.ico"
+      SourceFile="@CMAKE_CURRENT_SOURCE_DIR@/MySQLServer.ico"/>
+    <Property
+      Id="ARPPRODUCTICON"
+      Value="icon.ico" />
+    
+    <!-- License -->
+    <WixVariable
+      Id="WixUILicenseRtf"
+      Value="@COPYING_RTF@"/>
+
+    <!-- How to remove the service on uninstall -->
+    <Binary Id='wixca.dll' SourceFile='@WIXCA_LOCATION@' />
+    <CustomAction Id="UnregisterProperty" Property="UnregisterService" Value="[INSTALLDIR]" Return="check" />
+    <CustomAction Id="UnregisterPropertySilent" Property="UnregisterServiceSilently" Value="[INSTALLDIR]" Return="check" />
+    <CustomAction Id="UnregisterService"
+                  BinaryKey="wixca.dll"
+                  DllEntry="RemoveService"
+                  Execute="deferred"
+                  Impersonate="no"
+                  Return="check" />
+    <CustomAction Id="UnregisterServiceSilently"
+                  BinaryKey="wixca.dll"
+                  DllEntry="RemoveServiceNoninteractive"
+                  Execute="deferred"
+                  Impersonate="no"
+                  Return="check" />
+    <InstallExecuteSequence>
+      <Custom Action="UnregisterProperty" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
+      <Custom Action="UnregisterPropertySilent" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>
+      <Custom Action="UnregisterService" After="UnregisterProperty">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel&gt;4</Custom>
+      <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel&lt;=4</Custom>
+    </InstallExecuteSequence>
+
+    <!-- Installation root-->
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='@PlatformProgramFilesFolder@'>
+        <Directory Id='directory.MySQL' Name='MySQL'>
+          <Directory Id='INSTALLDIR' Name='MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@'>
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+    
+    <!-- CPACK_WIX_FEATURES -->
+    @CPACK_WIX_FEATURES@
+    
+    <!-- CPACK_WIX_DIRECTORIES -->
+    @CPACK_WIX_DIRECTORIES@
+    
+    <!--CPACK_WIX_COMPONENTS-->
+    @CPACK_WIX_COMPONENTS@
+    
+    <!--CPACK_WIX_COMPONENTS_GROUPS -->
+    @CPACK_WIX_COMPONENT_GROUPS@
+    
+    <!--CPACK_WIX_INCLUDES -->
+    @CPACK_WIX_INCLUDES@
+  </Product>
+
+</Wix>