From: Kent Boortz Date: May 16 2011 6:27pm Subject: bzr commit into mysql-5.5 branch (kent.boortz:3387) Bug#59512 Bug#59805 Bug#60029 List-Archive: http://lists.mysql.com/commits/137470 X-Bug: 59512,59805,60029 Message-Id: <20110516182705.22525.qmail@helheim> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1970591893==" --===============1970591893== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///net/helheim/store/bteam/bzr/kent/wix-5.6/mysql-5.5/ based on revid:andrei.elkin@stripped 3387 Kent Boortz 2011-05-16 - Changes needed to use newer WiX version (Bug#60029) - Added an alterantive search path for WiX components - Added a custom welcome dialog to include the copyright line (Bug#59805 and Bug#59512) - Excluded some binaries to make package smaller, in effect makig the "essentials" package obsolete - Added a bit more error checking when running the WiX tools WiX XML changes done by Johannes Taxacher modified: packaging/WiX/ca/CMakeLists.txt packaging/WiX/create_msi.cmake.in packaging/WiX/custom_ui.wxs === modified file 'packaging/WiX/ca/CMakeLists.txt' --- a/packaging/WiX/ca/CMakeLists.txt 2010-11-24 20:23:41 +0000 +++ b/packaging/WiX/ca/CMakeLists.txt 2011-05-16 18:26:55 +0000 @@ -13,15 +13,43 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -INCLUDE_DIRECTORIES(${WIX_DIR}/../SDK/inc) -LINK_DIRECTORIES(${WIX_DIR}/../SDK/lib) +INCLUDE_DIRECTORIES(${WIX_DIR}/../SDK/inc ${WIX_DIR}/SDK/inc) +LINK_DIRECTORIES(${WIX_DIR}/../SDK/lib ${WIX_DIR}/SDK/lib) SET(WIXCA_SOURCES CustomAction.cpp CustomAction.def) IF(CMAKE_SIZEOF_VOID_P EQUAL 8) - LINK_LIBRARIES(wcautil_x64 dutil_x64 msi version) + SET(WIX_ARCH_SUFFIX "_x64") ELSE() - LINK_LIBRARIES(wcautil dutil msi version) + SET(WIX_ARCH_SUFFIX) ENDIF() - -ADD_LIBRARY(wixca SHARED ${WIXCA_SOURCES}) + +IF(MSVC_VERSION EQUAL 1400) + SET(WIX35_MSVC_SUFFIX "_2005") +ELSEIF(MSVC_VERSION EQUAL 1500) + SET(WIX35_MSVC_SUFFIX "_2008") +ELSEIF(MSVC_VERSION EQUAL 1600) + SET(WIX35_MSVC_SUFFIX "_2010") +ELSE() + # When next VS is out, add the correct version here + MESSAGE(FATAL_ERROR "Unknown VS version") +ENDIF() + +MESSAGE(STATUS "Searching for wcautil${WIX_ARCH_SUFFIX} or wcautil${WIX35_MSVC_SUFFIX}${WIX_ARCH_SUFFIX} in ${WIX_DIR}/../SDK/lib ${WIX_DIR}/SDK/lib") +MESSAGE(STATUS "Searching for dutil${WIX_ARCH_SUFFIX} or dutil${WIX35_MSVC_SUFFIX}${WIX_ARCH_SUFFIX} in ${WIX_DIR}/../SDK/lib ${WIX_DIR}/SDK/lib") + +FIND_LIBRARY(WIX_WCAUTIL_LIBRARY + NAMES wcautil${WIX_ARCH_SUFFIX} wcautil${WIX35_MSVC_SUFFIX}${WIX_ARCH_SUFFIX} + HINTS ${WIX_DIR}/../SDK/lib ${WIX_DIR}/SDK/lib) + +FIND_LIBRARY(WIX_DUTIL_LIBRARY + NAMES dutil${WIX_ARCH_SUFFIX} dutil${WIX35_MSVC_SUFFIX}${WIX_ARCH_SUFFIX} + PATHS ${WIX_DIR}/../SDK/lib ${WIX_DIR}/SDK/lib) + +MESSAGE(STATUS "Found: ${WIX_WCAUTIL_LIBRARY}") +MESSAGE(STATUS "Found: ${WIX_DUTIL_LIBRARY}") + +ADD_VERSION_INFO(wixca SHARED WIXCA_SOURCES) +ADD_LIBRARY(wixca SHARED EXCLUDE_FROM_ALL ${WIXCA_SOURCES}) +TARGET_LINK_LIBRARIES(wixca ${WIX_WCAUTIL_LIBRARY} ${WIX_DUTIL_LIBRARY} + msi version ) === modified file 'packaging/WiX/create_msi.cmake.in' --- a/packaging/WiX/create_msi.cmake.in 2010-11-20 14:47:50 +0000 +++ b/packaging/WiX/create_msi.cmake.in 2011-05-16 18:26:55 +0000 @@ -15,6 +15,28 @@ 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) @@ -197,11 +219,18 @@ 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() - FILE(RELATIVE_PATH dir_rel ${topdir} ${dir}) IF(dir_rel) MAKE_DIRECTORY(${dir_root}/${dir_rel}) MAKE_WIX_IDENTIFIER("${dir_rel}" id) @@ -215,18 +244,31 @@ FUNCTION(TRAVERSE_FILES dir topdir file FOREACH(f ${all_files}) IF(NOT IS_DIRECTORY ${f}) FILE(RELATIVE_PATH rel ${topdir} ${f}) - 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" ) + 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() @@ -247,18 +289,18 @@ ENDFUNCTION() FUNCTION(TRAVERSE_DIRECTORIES dir topdir file prefix) FILE(RELATIVE_PATH rel ${topdir} ${dir}) - IF(rel AND IS_DIRECTORY "${f}") + 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}) + FOREACH(f ${all_files}) IF(IS_DIRECTORY ${f}) TRAVERSE_DIRECTORIES(${f} ${topdir} ${file} "${prefix} ") ENDIF() ENDFOREACH() - IF(rel AND IS_DIRECTORY "${f}") + IF(rel) FILE(APPEND ${file} "${prefix}\n") ENDIF() ENDFUNCTION() @@ -317,16 +359,25 @@ 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} - OUTPUT_QUIET ) - === modified file 'packaging/WiX/custom_ui.wxs' --- a/packaging/WiX/custom_ui.wxs 2010-07-24 15:26:45 +0000 +++ b/packaging/WiX/custom_ui.wxs 2011-05-16 18:26:55 +0000 @@ -1,7 +1,22 @@ - + + + 1 + + + NOT OLDERVERSIONBEINGUPGRADED + OLDERVERSIONBEINGUPGRADED + + + + + + + + + 1]]> @@ -47,10 +62,7 @@ 1 - NOT OLDERVERSIONBEINGUPGRADED - OLDERVERSIONBEINGUPGRADED - - 1 + 1 LicenseAccepted = "1" 1 @@ -74,7 +86,11 @@ 1 1 - 1 + 1 + + + NOT Installed + --===============1970591893== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/kent.boortz@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kent.boortz@stripped # target_branch: file:///net/helheim/store/bteam/bzr/kent/wix-\ # 5.6/mysql-5.5/ # testament_sha1: dbf5107367cb1438b3dc2fda72ae8708e62f7c98 # timestamp: 2011-05-16 20:27:05 +0200 # base_revision_id: andrei.elkin@stripped\ # rjsc2wd5p083ctqs # # Begin bundle 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 --===============1970591893==--