diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-20 12:47:50 -0200 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-20 12:47:50 -0200 |
| commit | f6deb00a56b2e87287d606aba3bcd71290d876ae (patch) | |
| tree | 2d19b102b6c66d0bcf7bb480f2140a6ffc9da7bb /packaging | |
| parent | e1cba38b6cfc4f5bb559ea211f72221e19487940 (diff) | |
| download | mariadb-git-f6deb00a56b2e87287d606aba3bcd71290d876ae.tar.gz | |
WL#5665: Removal of the autotools-based build system
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.
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/Makefile.am | 14 | ||||
| -rw-r--r-- | packaging/WiX/create_msi.cmake.in | 2 | ||||
| -rw-r--r-- | packaging/WiX/mysql_server.wxs.in | 8 |
3 files changed, 5 insertions, 19 deletions
diff --git a/packaging/Makefile.am b/packaging/Makefile.am deleted file mode 100644 index 3e6a79367b6..00000000000 --- a/packaging/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -EXTRA_DIST = \ - WiX/AdminBackground.jpg \ - WiX/AdminHeader.jpg \ - WiX/CMakeLists.txt \ - WiX/extra.wxs.in \ - WiX/CPackWixConfig.cmake \ - WiX/create_msi.cmake.in \ - WiX/custom_ui.wxs \ - WiX/MySQLServer.ico \ - WiX/mysql_server.wxs.in \ - WiX/ca/CMakeLists.txt \ - WiX/ca/CustomAction.cpp \ - WiX/ca/CustomAction.def \ - WiX/ca/CustomAction.rc diff --git a/packaging/WiX/create_msi.cmake.in b/packaging/WiX/create_msi.cmake.in index 404095fb567..a1899b701fd 100644 --- a/packaging/WiX/create_msi.cmake.in +++ b/packaging/WiX/create_msi.cmake.in @@ -7,7 +7,7 @@ SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@") SET(VERSION "@VERSION@")
SET(MAJOR_VERSION "@MAJOR_VERSION@")
SET(MINOR_VERSION "@MINOR_VERSION@")
-SET(PATCH "@PATCH@")
+SET(PATCH_VERSION "@PATCH_VERSION@")
SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@)
SET(MANUFACTURER "@MANUFACTURER@")
SET(WIXCA_LOCATION "@WIXCA_LOCATION@")
diff --git a/packaging/WiX/mysql_server.wxs.in b/packaging/WiX/mysql_server.wxs.in index 59cc817a302..ea2ee1d9aaf 100644 --- a/packaging/WiX/mysql_server.wxs.in +++ b/packaging/WiX/mysql_server.wxs.in @@ -4,7 +4,7 @@ Id="*"
UpgradeCode="49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3"
Name="MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@"
- Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@"
+ Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"
Language="1033"
Manufacturer="@MANUFACTURER@">
@@ -25,12 +25,12 @@ <UpgradeVersion
Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0"
IncludeMinimum="yes"
- Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@"
+ Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"
Property="OLDERVERSIONBEINGUPGRADED"
MigrateFeatures="yes"
/>
<UpgradeVersion
- Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@"
+ Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"
OnlyDetect="yes"
Property="NEWERVERSIONDETECTED" />
</Upgrade>
@@ -160,4 +160,4 @@ @CPACK_WIX_INCLUDES@
</Product>
-</Wix>
\ No newline at end of file +</Wix>
|