Commit graph

7 commits

Author SHA1 Message Date
Vladislav Vaintroub
212b26d108 Bug#55169: Installer does not preserve user's settings in custom mode
Fix some issues with WiX packaging, particularly 
major upgrade and change scenarios.

* remember binary location and data location
(for major upgrade)

* use custom UI, which is WiX Mondo extended 
for major upgrade dialog (no feature selection
screen shown on major upgrade, only upgrade
confirmation). This is necessary to prevent
changing installation path during upgrade
(services are not reregistered, so they would 
have invalid binary path is it is changed)

* Hide datafiles that are installed into 
ProgramFiles, show ones that are installed
in ProgramData

* Make MSI buildable with nmake

* Fix autotools "make dist"




Makefile.am:
  Fix autotools "make dist"
configure.in:
  Fix autotools "make dist"
packaging/Makefile.am:
  Fix autotools "make dist"
packaging/WiX/CMakeLists.txt:
  Use custom UI, for major upgrades
packaging/WiX/CPackWixConfig.cmake:
  Show user editable datafiles in feature selection dialog, 
  not datafiles installed into ProgramFiles directory
packaging/WiX/create_msi.cmake.in:
  Use custom UI, fix nmake build for installer
packaging/WiX/custom_ui.wxs:
  Use custom UI
packaging/WiX/extra.wxs.in:
  Show user editable datafiles in feature selection dialog, 
  not datafiles installed into ProgramFiles directory
packaging/WiX/mysql_server.wxs.in:
  Remember install locations of binaries and 
  user editable datafiles.
2010-07-24 17:26:45 +02:00
Alexander Nozdrin
b5eac2b2ce Manual merge from mysql-trunk.
Conflicts:
  - scripts/CMakeLists.txt
2010-07-19 18:00:29 +04:00
Jonathan Perkin
79c56a01a1 Can't use 64BIT test here, use CMAKE_SIZEOF_VOID_P instead. 2010-07-01 14:54:39 +01:00
Vladislav Vaintroub
1134fe2fdb Bug #52850: mysqld-debug.pdb doesn't match
mysqld-debug.exe in 5.5.3 on windows

Fix:

- Do not rename PDB, install mysqld.pdb matching 
mysqld-debug.exe into bin\debug subdirectory

- Stack tracing code will now additionally look in 
debug subdirectory of the application directory 
for debug symbols.

- Small cleanup in stacktracing code: link with 
dbghelp rather than load functions dynamically 
at runtime, since dbghelp.dll is always present.

- Install debug binaries with WiX

cmake/install_macros.cmake:
  Add optional COMPONENT and PDB_DESTINATION 
  to INSTALL_DEBUG_TARGET
mysys/stacktrace.c:
  If binary is build with DBUG, also look in debug subdirectory
  of  executable directory. Packaging will put some PDBs there
  (e.g bin\mysqld-debug.exe will have corresponding pdb in 
  bin\debug)
  
  Also some cleanup: do not load dbghelp dynamically, instead
  link with it. dbghelp is present on all Windows starting with 
  XP.
packaging/WiX/CPackWixConfig.cmake:
  Install debug binaries
sql/CMakeLists.txt:
  Do not rename PDB for mysqld-debug.exe, install it in debug subdirectory
2010-06-30 14:10:29 +02:00
Jonathan Perkin
855beb8bf3 Fix x64 package name. 2010-06-29 14:18:34 +01:00
Jonathan Perkin
43e41d45e5 Fix essential MSI naming. 2010-06-28 16:47:57 +01:00
Vladislav Vaintroub
b852bf835a adding CPackWixConfig 2010-02-16 16:17:10 +01:00