From 8e7d6652adda0eaa0ce095b5c2258d5be61487fd Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 2 Jun 2015 22:07:47 +0200 Subject: CRLF->LF --- packaging/WiX/CPackWixConfig.cmake | 238 +++++------ packaging/WiX/create_msi.cmake.in | 796 ++++++++++++++++++------------------- packaging/WiX/custom_ui.wxs | 230 +++++------ packaging/WiX/extra.wxs.in | 162 ++++---- packaging/WiX/mysql_server.wxs.in | 392 +++++++++--------- 5 files changed, 909 insertions(+), 909 deletions(-) (limited to 'packaging/WiX') 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} - " - ) - 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} - ") - ELSE() - SET(CPACK_WIX_FEATURES - "${CPACK_WIX_FEATURES} - - - ") - ENDIF() - - ENDFOREACH() - SET(CPACK_WIX_FEATURES - "${CPACK_WIX_FEATURES} - - ") -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} "\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} " \n") - FILE(APPEND ${file} " \n") - FILE(APPEND ${file} " \n") - FILE(APPEND ${file_comp} " \n") - ELSE() - SET(NONEXEFILES "${NONEXEFILES}\n" ) - ENDIF() - ENDIF() - ENDIF() - ENDFOREACH() - FILE(APPEND ${file} "\n") - IF(NONEXEFILES) - GENERATE_GUID(guid) - SET(ComponentId "C._files_${COMP_NAME}.${DirectoryRefId}") - FILE(APPEND ${file} - "\n${NONEXEFILES}\n\n") - FILE(APPEND ${file_comp} " \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}\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}\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 "") - 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 "") - 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 "\n") -TRAVERSE_DIRECTORIES(${abs}/dirs ${abs}/dirs directories.wxs "") -FILE(APPEND directories.wxs "\n") - -FILE(READ directories.wxs CPACK_WIX_DIRECTORIES) -FILE(REMOVE directories.wxs) - - -FOREACH(src ${CPACK_WIX_INCLUDE}) -SET(CPACK_WIX_INCLUDES -"${CPACK_WIX_INCLUDES} - " -) -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} + " + ) + 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} + ") + ELSE() + SET(CPACK_WIX_FEATURES + "${CPACK_WIX_FEATURES} + + + ") + ENDIF() + + ENDFOREACH() + SET(CPACK_WIX_FEATURES + "${CPACK_WIX_FEATURES} + + ") +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} "\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} " \n") + FILE(APPEND ${file} " \n") + FILE(APPEND ${file} " \n") + FILE(APPEND ${file_comp} " \n") + ELSE() + SET(NONEXEFILES "${NONEXEFILES}\n" ) + ENDIF() + ENDIF() + ENDIF() + ENDFOREACH() + FILE(APPEND ${file} "\n") + IF(NONEXEFILES) + GENERATE_GUID(guid) + SET(ComponentId "C._files_${COMP_NAME}.${DirectoryRefId}") + FILE(APPEND ${file} + "\n${NONEXEFILES}\n\n") + FILE(APPEND ${file_comp} " \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}\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}\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 "") + 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 "") + 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 "\n") +TRAVERSE_DIRECTORIES(${abs}/dirs ${abs}/dirs directories.wxs "") +FILE(APPEND directories.wxs "\n") + +FILE(READ directories.wxs CPACK_WIX_DIRECTORIES) +FILE(REMOVE directories.wxs) + + +FOREACH(src ${CPACK_WIX_INCLUDE}) +SET(CPACK_WIX_INCLUDES +"${CPACK_WIX_INCLUDES} + " +) +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 @@ - - - - - - - - 1 - - - NOT OLDERVERSIONBEINGUPGRADED - OLDERVERSIONBEINGUPGRADED - - - - - - - - - - - - 1]]> - OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST) - OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D" - OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D" - (OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F") - - - 1 - - - WixUI_InstallMode = "Remove" - - - - - - - - - - - - - - - - - - - - - - 1 - - 1 - LicenseAccepted = "1" - - 1 - 1 - 1 - 1 - - WixUI_InstallMode = "Change" - WixUI_InstallMode = "InstallCustom" - 1 - - WixUI_InstallMode = "InstallCustom" - WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete" - WixUI_InstallMode = "Change" - WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove" - - 1 - - 1 - 1 - 1 - 1 - - 1 - - - NOT Installed - - - - - + + + + + + + + 1 + + + NOT OLDERVERSIONBEINGUPGRADED + OLDERVERSIONBEINGUPGRADED + + + + + + + + + + + + 1]]> + OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST) + OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D" + OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D" + (OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F") + + + 1 + + + WixUI_InstallMode = "Remove" + + + + + + + + + + + + + + + + + + + + + + 1 + + 1 + LicenseAccepted = "1" + + 1 + 1 + 1 + 1 + + WixUI_InstallMode = "Change" + WixUI_InstallMode = "InstallCustom" + 1 + + WixUI_InstallMode = "InstallCustom" + WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete" + WixUI_InstallMode = "Change" + WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove" + + 1 + + 1 + 1 + 1 + 1 + + 1 + + + NOT Installed + + + + + 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 @@ - - - - - - - - - - - - - - - - - - - - - - @DATADIR_MYSQL_FILES@ - - - - - - - - @DATADIR_PERFORMANCE_SCHEMA_FILES@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @DATADIR_MYSQL_FILES@ + + + + + + + + @DATADIR_PERFORMANCE_SCHEMA_FILES@ + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - - - - - - - - - - - - - - - - - NOT NEWERVERSIONDETECTED OR Installed - - - - - - - - - - NOT - Installed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSTALLDIR2 - - - - - - - - - - - - - - - - - - - - - - - Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" - Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" - Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel>4 - Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel<=4 - - - - - - - - - - - - - - @CPACK_WIX_FEATURES@ - - - @CPACK_WIX_DIRECTORIES@ - - - @CPACK_WIX_COMPONENTS@ - - - @CPACK_WIX_COMPONENT_GROUPS@ - - - @CPACK_WIX_INCLUDES@ - - - + + + + + + + + + + + + + + + + + NOT NEWERVERSIONDETECTED OR Installed + + + + + + + + + + NOT + Installed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + INSTALLDIR2 + + + + + + + + + + + + + + + + + + + + + + + Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" + Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" + Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel>4 + Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel<=4 + + + + + + + + + + + + + + @CPACK_WIX_FEATURES@ + + + @CPACK_WIX_DIRECTORIES@ + + + @CPACK_WIX_COMPONENTS@ + + + @CPACK_WIX_COMPONENT_GROUPS@ + + + @CPACK_WIX_INCLUDES@ + + + -- cgit v1.2.1