mirror of
https://github.com/transmission/transmission
synced 2024-12-25 01:03:01 +00:00
be74cb6356
* Bump minimum Qt version to 5.6
* Switch from QRegExp to QRegularExpression
While still available, QRegExp has been moved to Qt6::Core5Compat module
and is not part of Qt6::Core.
* Use qIsEffectiveTLD instead of QUrl::topLevelDomain
The latter is not part of Qt6::Core. The former is a private utility in
Qt6::Network; using it for now, until (and if) we switch to something
non-Qt-specific.
* Use QStyle::State_Horizontal state when drawing progress bars
Although available for a long time, this state either didn't apply to
progress bars before Qt 6, or was deduced based on bar size. With Qt 6,
failing to specify it results in bad rendering.
* Don't use QStringRef (and associated methods)
While still available, QStringRef has been moved to Qt6::Core5Compat
module and is not part of Qt6::Core. Related method (e.g.
QString::midRef) have been removed in Qt 6.
* Use Qt::ItemIsAutoTristate instead of Qt::ItemIsTristate
The latter was deprecated and replaced with the former in Qt 5.6.
* Don't use QApplication::globalStrut
This property has been deprecated in Qt 5.15 and removed in Qt 6.
* Use QImage::fromHICON instead of QtWin::fromHICON
WinExtras module (providind the latter helper) has been removed in Qt 6.
* Use QStringDecoder instead of QTextCodec
While still available, QTextCodec has been moved to Qt6::Core5Compat
module and is not part of Qt6::Core.
* Don't forward-declare QStringList
Instead of being a standalone class, its definition has changed to
QList<QString> template specialization in Qt 6.
* Use explicit (since Qt 6) QFileInfo constructor
* Use QDateTime's {to,from}SecsSinceEpoch instead of {to,from}Time_t
The latter was deprecated in Qt 5.8 and removed in Qt 6.
* Don't use QFuture<>'s operator==
It has been removed in Qt 6. Since the original issue this code was
solving was caused by future reuse, just don't reuse futures and create
new finished ones when necessary.
* Use std::vector<> instead of QVector<>
The latter has been changed to a typedef for QList<>, which might not be
what one wants, and which also changed behavior a bit leading to
compilation errors.
* Don't use + for flags, cast to int explicitly
Operator+ for enum values has been deleted in Qt 6, so using operator|
instead. Then, there's no conversion from QFlags<> to QVariant, so need
to cast to int.
* Support Qt 6 in CMake and for MSI packaging
* Remove extra (empty) CMake variable use when constructing Qt target names
* Simplify logic in tr_qt_add_translation CMake helper
Co-authored-by: Charles Kerr <charles@charleskerr.com>
118 lines
3.8 KiB
CMake
118 lines
3.8 KiB
CMake
project(tr-dist-msi)
|
|
|
|
include(UtilityFunctions.cmake)
|
|
|
|
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
set(ARCH x64)
|
|
else()
|
|
set(ARCH x86)
|
|
endif()
|
|
|
|
set(VERSION "${TR_USER_AGENT_PREFIX}")
|
|
set(VERSION_MSI "${TR_VERSION_MAJOR}.${TR_VERSION_MINOR}.0")
|
|
set(VERSION_FULL "${TR_USER_AGENT_PREFIX} (${TR_VCS_REVISION})")
|
|
|
|
set(MSI_FILENAME_VERSION "${VERSION}")
|
|
if(TR_NIGHTLY_RELEASE)
|
|
set(MSI_FILENAME_VERSION "${MSI_FILENAME_VERSION}-r${TR_VCS_REVISION}")
|
|
endif()
|
|
|
|
if(NOT TR_THIRD_PARTY_DIR)
|
|
set(TR_THIRD_PARTY_DIR "$<TARGET_FILE_DIR:OpenSSL::SSL>/..")
|
|
endif()
|
|
|
|
if(NOT TR_QT_DIR)
|
|
set(TR_QT_DIR "$<TARGET_FILE_DIR:Qt${Qt_VERSION_MAJOR}::Core>/..")
|
|
endif()
|
|
|
|
find_msvc_crt_msm(TR_MSVC_CRT_MSM_FILE)
|
|
|
|
if(OPENSSL_VERSION MATCHES "^1[.]1[.]")
|
|
set(TR_OPENSSL_ARCH)
|
|
if(ARCH STREQUAL "x64")
|
|
set(TR_OPENSSL_ARCH "-x64")
|
|
endif()
|
|
set(TR_OPENSSL_CRYPTO_NAME "libcrypto-1_1${TR_OPENSSL_ARCH}.dll")
|
|
set(TR_OPENSSL_SSL_NAME "libssl-1_1${TR_OPENSSL_ARCH}.dll")
|
|
else()
|
|
set(TR_OPENSSL_CRYPTO_NAME "libeay32.dll")
|
|
set(TR_OPENSSL_SSL_NAME "ssleay32.dll")
|
|
endif()
|
|
|
|
set(ICONS_DIR "${CMAKE_SOURCE_DIR}/qt/icons/hicolor")
|
|
png2ico(Transmission.ico
|
|
"${ICONS_DIR}/16x16/transmission-qt.png"
|
|
"${ICONS_DIR}/22x22/transmission-qt.png"
|
|
"${ICONS_DIR}/24x24/transmission-qt.png"
|
|
"${ICONS_DIR}/32x32/transmission-qt.png"
|
|
"${ICONS_DIR}/48x48/transmission-qt.png"
|
|
"${ICONS_DIR}/64x64/transmission-qt.png"
|
|
"${ICONS_DIR}/72x72/transmission-qt.png"
|
|
"${ICONS_DIR}/96x96/transmission-qt.png"
|
|
"${ICONS_DIR}/128x128/transmission-qt.png"
|
|
"${ICONS_DIR}/192x192/transmission-qt.png"
|
|
"${ICONS_DIR}/256x256/transmission-qt.png")
|
|
|
|
set(WEBSRCDIR "${CMAKE_INSTALL_PREFIX}/share/transmission/public_html")
|
|
set(TRQMSRCDIR "${CMAKE_INSTALL_PREFIX}/share/transmission/translations")
|
|
set(QTQMSRCDIR "${TR_QT_DIR}/translations")
|
|
|
|
configure_file(TransmissionConfig.wxi.in TransmissionConfig.wxi)
|
|
|
|
wix_heat(WebUi.wxs "${WEBSRCDIR}" WebUiComponents WEBINSTALLDIR var.WebSrcDir)
|
|
wix_heat(QtClientTranslations.wxs "${TRQMSRCDIR}" QtClientTranslationsComponents QMINSTALLDIR var.TrQmSrcDir)
|
|
wix_heat(QtTranslations.wxs "${QTQMSRCDIR}" QtTranslationsComponents QMINSTALLDIR var.QtQmSrcDir XSL_TRANSFORM QtTranslations.xsl)
|
|
|
|
wix_candle(${PROJECT_NAME}_OBJS
|
|
ARCHITECTURE
|
|
${ARCH}
|
|
SOURCES
|
|
components/CliTools.wxs
|
|
components/CommonLibs.wxs
|
|
components/Daemon.wxs
|
|
components/QtClient.wxs
|
|
Transmission.wxs
|
|
"${CMAKE_CURRENT_BINARY_DIR}/WebUi.wxs"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/QtClientTranslations.wxs"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/QtTranslations.wxs"
|
|
EXTENSIONS
|
|
WixUIExtension
|
|
WixUtilExtension
|
|
DEFINITIONS
|
|
"SrcDir=${CMAKE_INSTALL_PREFIX}"
|
|
"ThirdPartyDir=${TR_THIRD_PARTY_DIR}"
|
|
"QtDir=${TR_QT_DIR}"
|
|
"QtMajorVer=${Qt_VERSION_MAJOR}"
|
|
"LicenseFile=${CMAKE_CURRENT_SOURCE_DIR}/GPLv2.rtf"
|
|
"WebSrcDir=${WEBSRCDIR}"
|
|
"TrQmSrcDir=${TRQMSRCDIR}"
|
|
"QtQmSrcDir=${QTQMSRCDIR}"
|
|
"MsvcCrtMsmFile=${TR_MSVC_CRT_MSM_FILE}"
|
|
"OpenSslCryptoName=${TR_OPENSSL_CRYPTO_NAME}"
|
|
"OpenSslSslName=${TR_OPENSSL_SSL_NAME}"
|
|
EXTRA_DEPENDS
|
|
"${CMAKE_CURRENT_BINARY_DIR}/TransmissionConfig.wxi")
|
|
|
|
wix_light(${PROJECT_NAME}_OUTPUT
|
|
NAME
|
|
transmission-${MSI_FILENAME_VERSION}-${ARCH}
|
|
OBJECTS
|
|
${${PROJECT_NAME}_OBJS}
|
|
EXTENSIONS
|
|
WixUIExtension
|
|
WixUtilExtension
|
|
EXTRA_DEPENDS
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/GPLv2.rtf"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/Transmission.ico")
|
|
|
|
add_custom_target(pack-msi
|
|
SOURCES
|
|
components/CliTools.wxs
|
|
components/CommonLibs.wxs
|
|
components/Daemon.wxs
|
|
components/QtClient.wxs
|
|
QtTranslations.xsl
|
|
Transmission.wxs
|
|
TransmissionConfig.wxi.in
|
|
DEPENDS
|
|
"${${PROJECT_NAME}_OUTPUT}")
|