diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-04-06 10:18:01 +0300 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-04-13 11:04:28 +0300 |
| commit | 2d5f0ffaf1278516bbd74e3b60f9849f4c51cffa (patch) | |
| tree | 6a0882c4007a933f40010b167a6abb1be62baca7 /tools | |
| parent | 5dfded3b43b3adfec411c036e5aac97d400f4613 (diff) | |
3rdparty: deprecate usage of LZMA SDK
The 3rd-party sources haven't been updated in a long time, and
is missing some features compared to libarchive (which the
official IFW binaries use), like symbolic link support on Windows.
Add deprecation warning when compiling with LZMA SDK, and make
building the library and related client code conditional behind
a separate config feature.
Update docs to emphasize that libarchive is the recommended build
option for archive handler.
Change-Id: I70ed5f9b5d13e2243778f7c44b4ea833c8092ae0
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/archivegen/archive.cpp | 8 | ||||
| -rw-r--r-- | tools/archivegen/archivegen.pro | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/tools/archivegen/archive.cpp b/tools/archivegen/archive.cpp index 56aae1b21..132c1bcc6 100644 --- a/tools/archivegen/archive.cpp +++ b/tools/archivegen/archive.cpp @@ -28,9 +28,12 @@ #include <errors.h> #include <archivefactory.h> -#include <lib7z_facade.h> #include <utils.h> +#ifdef IFW_LIB7Z +#include <lib7z_facade.h> +#endif + #include <QCoreApplication> #include <QCommandLineParser> #include <QDir> @@ -105,8 +108,9 @@ int main(int argc, char *argv[]) throw QInstaller::Error(QCoreApplication::translate("archivegen", "Unknown compression level \"%1\". See 'archivgen --help'.").arg(value)); } - +#ifdef IFW_LIB7Z Lib7z::initSevenZ(); +#endif QString archiveFilename = args[0]; // Check if filename already has a supported suffix if (!ArchiveFactory::isSupportedType(archiveFilename)) diff --git a/tools/archivegen/archivegen.pro b/tools/archivegen/archivegen.pro index 9e1147d42..fef39ae6f 100644 --- a/tools/archivegen/archivegen.pro +++ b/tools/archivegen/archivegen.pro @@ -8,8 +8,9 @@ QT -= gui QT += qml xml CONFIG -= import_plugins - -LIBS += -l7z +CONFIG(lzmasdk) { + LIBS += -l7z +} CONFIG += console DESTDIR = $$IFW_APP_PATH |