Update source tree with version 9.38.beta of LZMA SDK.

- Remove unused files.
- Split in .pri files.
- Add HEADERS section.
- Adjust lib7z_facade.

Change-Id: I31e7bafbfe1a9346364bd58c391601955f98ad3a
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

3 files changed, 8 insertions, 18 deletions

diff --git a/tools/archivegen/archive.cpp b/tools/archivegen/archive.cpp
index 88f2f6c73..c94c767c4 100644
--- a/tools/archivegen/archive.cpp
+++ b/tools/archivegen/archive.cpp
@@ -38,9 +38,8 @@
 #include <lib7z_facade.h>
 #include <utils.h>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFileInfo>
-#include <QtCore/QStringList>
+#include <QCoreApplication>
+#include <QFileInfo>
 
 #include <iostream>
 
@@ -66,12 +65,10 @@ int main(int argc, char *argv[])
         QInstaller::init();
         QInstaller::setVerbose(true);
         const QStringList sourceDirectories = app.arguments().mid(2);
-        QInstallerTools::compressPaths(sourceDirectories, app.arguments().at(1));
+        Lib7z::createArchive(app.arguments().at(1), sourceDirectories, Lib7z::QTmpFile::No);
         return EXIT_SUCCESS;
-    } catch (const Lib7z::SevenZipException &e) {
-        std::cerr << "caught 7zip exception: " << e.message() << std::endl;
     } catch (const QInstaller::Error &e) {
-        std::cerr << "caught exception: " << e.message() << std::endl;
+        std::cerr << "Caught exception: " << e.message() << std::endl;
     }
     return EXIT_FAILURE;
 }
diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp
index b7a6aa151..0e3658e9e 100644
--- a/tools/common/repositorygen.cpp
+++ b/tools/common/repositorygen.cpp
@@ -93,13 +93,6 @@ void QInstallerTools::copyWithException(const QString &source, const QString &ta
     qDebug() << "done.\n";
 }
 
-void QInstallerTools::compressPaths(const QStringList &paths, const QString &archivePath)
-{
-    QFile archive(archivePath);
-    QInstaller::openForWrite(&archive);
-    Lib7z::createArchive(&archive, paths);
-}
-
 static QStringList copyFilesFromNode(const QString &parentNode, const QString &childNode, const QString &attr,
     const QString &kind, const QDomNode &package, const PackageInfo &info, const QString &targetDir)
 {
@@ -533,7 +526,7 @@ void QInstallerTools::compressMetaDirectories(const QString &repoDir, const QStr
         const QString absPath = sd.absolutePath();
         const QString fn = QLatin1String(versionPrefix.toLatin1() + "meta.7z");
         const QString tmpTarget = repoDir + QLatin1String("/") +fn;
-        compressPaths(QStringList() << absPath, tmpTarget);
+        Lib7z::createArchive(tmpTarget, QStringList() << absPath, Lib7z::QTmpFile::No);
 
         // remove the files that got compressed
         QInstaller::removeFiles(absPath, true);
@@ -592,7 +585,8 @@ void QInstallerTools::copyComponentData(const QStringList &packageDirs, const QS
                 } else if (fileInfo.isDir()) {
                     qDebug() << "Compressing data directory" << entry;
                     QString target = QString::fromLatin1("%1/%3%2.7z").arg(namedRepoDir, entry, info.version);
-                    QInstallerTools::compressPaths(QStringList() << dataDir.absoluteFilePath(entry), target);
+                    Lib7z::createArchive(target, QStringList() << dataDir.absoluteFilePath(entry),
+                        Lib7z::QTmpFile::No);
                     compressedFiles.append(target);
                 } else if (fileInfo.isSymLink()) {
                     filesToCompress.append(dataDir.absoluteFilePath(entry));
@@ -604,7 +598,7 @@ void QInstallerTools::copyComponentData(const QStringList &packageDirs, const QS
             qDebug() << "Compressing files found in data directory:" << filesToCompress;
             QString target = QString::fromLatin1("%1/%3%2").arg(namedRepoDir, QLatin1String("content.7z"),
                 info.version);
-            QInstallerTools::compressPaths(filesToCompress, target);
+            Lib7z::createArchive(target, filesToCompress, Lib7z::QTmpFile::No);
             compressedFiles.append(target);
         }
 
diff --git a/tools/common/repositorygen.h b/tools/common/repositorygen.h
index c63b35a9e..782b712a0 100644
--- a/tools/common/repositorygen.h
+++ b/tools/common/repositorygen.h
@@ -66,7 +66,6 @@ PackageInfoVector createListOfPackages(const QStringList &packagesDirectories, Q
     FilterType ftype);
 QHash<QString, QString> buildPathToVersionMapping(const PackageInfoVector &info);
 
-void compressPaths(const QStringList &paths, const QString &archivePath);
 void compressMetaDirectories(const QString &repoDir, const QString &baseDir,
     const QHash<QString, QString> &versionMapping);