diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-07-24 17:26:45 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-07-24 17:26:45 +0200 |
| commit | 212b26d1089cfb491f62cae68097d5cc66e97b65 (patch) | |
| tree | 3f86f4baf9024c187d54d445e23a487653a5ca0a /configure.in | |
| parent | 8011a429b55106bc904a78ff352d5bab73afd745 (diff) | |
| download | mariadb-git-212b26d1089cfb491f62cae68097d5cc66e97b65.tar.gz | |
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.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index f90a68b241d..345c616cf67 100644 --- a/configure.in +++ b/configure.in @@ -3059,7 +3059,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl libmysqld/Makefile libmysqld/examples/Makefile dnl mysql-test/Makefile mysql-test/lib/My/SafeProcess/Makefile dnl sql-bench/Makefile include/mysql_version.h plugin/Makefile win/Makefile dnl - cmake/Makefile + cmake/Makefile packaging/Makefile ) AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) |