bzr commit into mysql-trunk branch (jonathan.perkin:3083)

[Jonathan Perkin]

#At file:///Users/jonathan/bzr2/mysql-5.5.5-m3-release/ based on revid:jonathan.perkin@stripped

 3083 Jonathan Perkin	2010-06-29
      Fix x64 package name.

    modified:
      packaging/WiX/CPackWixConfig.cmake
=== modified file 'packaging/WiX/CPackWixConfig.cmake'
--- a/packaging/WiX/CPackWixConfig.cmake	2010-06-28 15:47:57 +0000
+++ b/packaging/WiX/CPackWixConfig.cmake	2010-06-29 13:18:34 +0000
@@ -4,7 +4,11 @@ IF(ESSENTIALS)
  SET(CPACK_COMPONENTS_USED "Server;Client;DataFiles")
  SET(CPACK_WIX_UI "WixUI_InstallDir")
  MATH(EXPR bits ${CMAKE_SIZEOF_VOID_P}*8)
- SET(CPACK_PACKAGE_FILE_NAME  "mysql-essential-${VERSION}-win${bits}")
+ IF(64BIT)
+  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;Embedded;Debuginfo;Documentation;IniFiles;Readme;Server_Scripts")


Attachment: [text/bzr-bundle] bzr/[e-mail]