mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-22 08:15:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

support same version upgrade for MSI

Browse source
This commit is contained in:
Vladislav Vaintroub 2012-05-04 03:51:30 +02:00
commit e3ffaed147
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmake/mysql_version.cmake
View file

@ -126,10 +126,12 @@ ENDIF()
IF(MSVC) IF(MSVC)
# Tiny version is used to identify the build, it can be set with cmake -DTINY_VERSION=<number> # Tiny version is used to identify the build, it can be set with cmake -DTINY_VERSION=<number>
# to bzr revno for example (in the CI builds) # to bzr revno for example (in the CI builds)
SET(TINY_VERSION "0" CACHE INTERNAL "") IF(NOT TINY_VERSION)
SET(TINY_VERSION "0")
ENDIF()
GET_FILENAME_COMPONENT(MYSQL_CMAKE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) GET_FILENAME_COMPONENT(MYSQL_CMAKE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
SET(FILETYPE VFT_APP) SET(FILETYPE VFT_APP)
CONFIGURE_FILE(${MYSQL_CMAKE_SCRIPT_DIR}/versioninfo.rc.in CONFIGURE_FILE(${MYSQL_CMAKE_SCRIPT_DIR}/versioninfo.rc.in
${CMAKE_BINARY_DIR}/versioninfo_exe.rc) ${CMAKE_BINARY_DIR}/versioninfo_exe.rc)
@ -137,7 +139,7 @@ IF(MSVC)
SET(FILETYPE VFT_DLL) SET(FILETYPE VFT_DLL)
CONFIGURE_FILE(${MYSQL_CMAKE_SCRIPT_DIR}/versioninfo.rc.in CONFIGURE_FILE(${MYSQL_CMAKE_SCRIPT_DIR}/versioninfo.rc.in
${CMAKE_BINARY_DIR}/versioninfo_dll.rc) ${CMAKE_BINARY_DIR}/versioninfo_dll.rc)
FUNCTION(ADD_VERSION_INFO target target_type sources_var) FUNCTION(ADD_VERSION_INFO target target_type sources_var)
IF("${target_type}" MATCHES "SHARED" OR "${target_type}" MATCHES "MODULE") IF("${target_type}" MATCHES "SHARED" OR "${target_type}" MATCHES "MODULE")
SET(rcfile ${CMAKE_BINARY_DIR}/versioninfo_dll.rc) SET(rcfile ${CMAKE_BINARY_DIR}/versioninfo_dll.rc)

3
win/packaging/create_msi.cmake.in
View file

@ -8,6 +8,7 @@ SET(VERSION "@VERSION@")
SET(MAJOR_VERSION "@MAJOR_VERSION@") SET(MAJOR_VERSION "@MAJOR_VERSION@")
SET(MINOR_VERSION "@MINOR_VERSION@") SET(MINOR_VERSION "@MINOR_VERSION@")
SET(PATCH_VERSION "@PATCH_VERSION@") SET(PATCH_VERSION "@PATCH_VERSION@")
SET(TINY_VERSION "@TINY_VERSION@")
SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@) SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@)
SET(MANUFACTURER "@MANUFACTURER@") SET(MANUFACTURER "@MANUFACTURER@")
SET(WIXCA_LOCATION "@WIXCA_LOCATION@") SET(WIXCA_LOCATION "@WIXCA_LOCATION@")
@ -421,7 +422,7 @@ EXECUTE_PROCESS(
EXECUTE_PROCESS( EXECUTE_PROCESS(
COMMAND ${LIGHT_EXECUTABLE} -ext WixUIExtension -ext WixUtilExtension COMMAND ${LIGHT_EXECUTABLE} -ext WixUIExtension -ext WixUtilExtension
-ext WixFirewallExtension -ext WixFirewallExtension -sice:ICE61
mysql_server.wixobj extra.wixobj -out ${CPACK_PACKAGE_FILE_NAME}.msi mysql_server.wixobj extra.wixobj -out ${CPACK_PACKAGE_FILE_NAME}.msi
${EXTRA_LIGHT_ARGS} ${EXTRA_LIGHT_ARGS}
) )

8
win/packaging/mysql_server.wxs.in
View file

@ -4,7 +4,7 @@
Id="*" Id="*"
UpgradeCode="@CPACK_WIX_UPGRADE_CODE@" UpgradeCode="@CPACK_WIX_UPGRADE_CODE@"
Name="@CPACK_WIX_PACKAGE_NAME@" Name="@CPACK_WIX_PACKAGE_NAME@"
Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@" Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@"
Language="1033" Language="1033"
Manufacturer="@MANUFACTURER@"> Manufacturer="@MANUFACTURER@">
@ -26,14 +26,16 @@
<UpgradeVersion <UpgradeVersion
Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0" Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0"
IncludeMinimum="yes" IncludeMinimum="yes"
Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@" Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@"
IncludeMaximum="yes"
Property="OLDERVERSIONBEINGUPGRADED" Property="OLDERVERSIONBEINGUPGRADED"
MigrateFeatures="yes" MigrateFeatures="yes"
/> />
<?endif?> <?endif?>
<UpgradeVersion <UpgradeVersion
Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@" Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@.@TINY_VERSION@"
Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.999" Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.999"
IncludeMinimum="no"
OnlyDetect="yes" OnlyDetect="yes"
Property="NEWERVERSIONDETECTED" /> Property="NEWERVERSIONDETECTED" />
</Upgrade> </Upgrade>