| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
| |
- 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
|
| |\ |
|
| | |
| |
| |
| | |
MSI: Only call custom action if REMOVE=ALL is specified, this avoids accidential removing services if feature states are modified (reported by Iggy)
|
| | | |
|
| | |
| |
| |
| |
| |
| | |
accidential removing services if
feature states are modified (reported by Iggy)
|
| |/
|
|
|
|
|
|
| |
The problem was MFC header file includes into the resource definition file (CustomAction.rc)
afxres.h is not available with VS Express.
The fix is to remove resource file from compilation and souce code repository. version of
custom action dll is of no interest for anyone, it is internal dll kept inside the MSI.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The autotools-based build system has been superseded and
is being removed in order to ease the maintenance burden on
developers tweaking and maintaining the build system.
In order to support tools that need to extract the server
version, a new file that (only) contains the server version,
called VERSION, is introduced. The file contents are human
and machine-readable. The format is:
MYSQL_VERSION_MAJOR=5
MYSQL_VERSION_MINOR=5
MYSQL_VERSION_PATCH=8
MYSQL_VERSION_EXTRA=-rc
The CMake based version extraction in cmake/mysql_version.cmake
is changed to extract the version from this file. The configure
to CMake wrapper is retained for backwards compatibility and to
support the BUILD/ scripts. Also, a new a makefile target
show-dist-name that prints the server version is introduced.
VERSION:
Add top-level version file.
cmake/mysql_version.cmake:
Get version information from the top-level VERSION file.
Do not cache the version components (MAJOR_VERSION, etc).
Add MYSQL_RPM_VERSION as a replacement for MYSQL_U_SCORE_VERSION.
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
Problem: with "make package" , many small packages are
generated, one per CMake COMPONENT, instead of expected single
package. This is due to the new (in cmake 2.8.3) component-based
install for archive( e.g ZIP,TGZ ) CPack generators.
See http://public.kitware.com/Bug/view.php?id=11452 for discussion.
Fix: use CPACK_MONOLITHIC_INSTALL=1 to enforce single package.
Reset this variable temporarily to 0 for MSI creation (MSI needs
COMPONENTs)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |\
| |
| |
| |
| | |
Conflicts:
- scripts/CMakeLists.txt
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
| |
so let's reaffirm our intention to do so.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Introduce MANUFACTURER setting to set package manufacturer via CMake.
- Introduce COMMUNITY_BUILD setting to be passed on to packaging
(not used here, but required for our own packages to determine what
added files should be included in the package).
- Create an RTF version of the COPYING text file and use that as the
default license (can be overridden by providing a COPYING.rtf file).
- Allow passing extra arguments to candle and light via environment.
(Need -sval in pushbuild, but want validation elsewhere.)
- Introduce a custom action that stops and uninstalls the service
if the user installed one that points into the MySQL directory
that is being removed.
(Our own packages historically used the instance configuration wizard
for this, but it wouldn't be very nice if MSIs created by our users
couldn't remove it too.)
- Make install location configurable again ("Browse" button in custom
installation was greyed out before).
- Remove registry keys that use "MySQL AB"; they should only be set in
packages provided by us. Users can set their own registry keys if
they want to.
|
| |
|
|
|
| |
Note that a read only copy will still exist in the ProgramFiles directory
(so it can be reused for other instances)
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
