From 20f354b38b83e4aab107b388fe3c5e2ccd878946 Mon Sep 17 00:00:00 2001
From: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Date: Tue, 1 Dec 2020 13:00:15 +0200
Subject: Add support for generating offline installer from online

Task-number: QTIFW-1945
Change-Id: Ic8a076a28385e99ad09cfbccd07c7012d6570639
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
---
 src/libs/ifwtools/binarycreator.cpp | 25 ++++++++++++++++++++-----
 src/libs/ifwtools/repositorygen.cpp | 11 +++++++++--
 2 files changed, 29 insertions(+), 7 deletions(-)

(limited to 'src/libs/ifwtools')

diff --git a/src/libs/ifwtools/binarycreator.cpp b/src/libs/ifwtools/binarycreator.cpp
index 8fcc14ca3..deea01ed7 100644
--- a/src/libs/ifwtools/binarycreator.cpp
+++ b/src/libs/ifwtools/binarycreator.cpp
@@ -37,6 +37,7 @@
 #include "repository.h"
 #include "settings.h"
 #include "utils.h"
+#include "fileutils.h"
 
 #include <QDateTime>
 #include <QDirIterator>
@@ -433,8 +434,13 @@ static int assemble(Input input, const QInstaller::Settings &settings, const QSt
         return EXIT_FAILURE;
     }
 
+#ifdef Q_OS_MACOS
+    // installer executable
+    chmod755(input.outputPath);
+#endif
 #ifndef Q_OS_WIN
-    chmod755(out.fileName());
+    // installer executable on linux, installer.dat on macOS
+    chmod755(targetName);
 #endif
     QFile::remove(tempFile);
 
@@ -580,6 +586,9 @@ void QInstallerTools::copyConfigData(const QString &configFile, const QString &t
     const QString targetConfigFile = targetDir + QLatin1String("/config.xml");
     QInstallerTools::copyWithException(sourceConfigFile, targetConfigFile, QLatin1String("configuration"));
 
+    // Permissions might be set to bogus values
+    QInstaller::setDefaultFilePermissions(targetConfigFile, DefaultFilePermissions::NonExecutable);
+
     QFile configXml(targetConfigFile);
     QInstaller::openForRead(&configXml);
 
@@ -699,13 +708,19 @@ int QInstallerTools::createBinary(BinaryCreatorArgs args, QString &argumentError
             "contain any components apart from the root component.");
         return EXIT_FAILURE;
     }
-#ifdef Q_OS_WIN
-    if (!args.templateBinary.endsWith(suffix))
-        args.templateBinary = args.templateBinary + suffix;
-#endif
     if (!QFileInfo(args.templateBinary).exists()) {
+#ifdef Q_OS_WIN
+        if (!args.templateBinary.endsWith(suffix))
+            args.templateBinary = args.templateBinary + suffix;
+        // Try again with added executable suffix
+        if (!QFileInfo(args.templateBinary).exists()) {
+            argumentError = QString::fromLatin1("Error: Template base binary not found at the specified location.");
+            return EXIT_FAILURE;
+        }
+#else
         argumentError = QString::fromLatin1("Error: Template not found at the specified location.");
         return EXIT_FAILURE;
+#endif
     }
     const QFileInfo fi(args.configFile);
     if (!fi.exists()) {
diff --git a/src/libs/ifwtools/repositorygen.cpp b/src/libs/ifwtools/repositorygen.cpp
index e30234f52..fbcf7b9f3 100644
--- a/src/libs/ifwtools/repositorygen.cpp
+++ b/src/libs/ifwtools/repositorygen.cpp
@@ -609,12 +609,19 @@ PackageInfoVector QInstallerTools::createListOfRepositoryPackages(const QStringL
                 if (!hasUnifiedMetaFile) {
                     const QDomElement sha1 = el.firstChildElement(QInstaller::scSHA1);
                     if (!sha1.isNull()) {
+                        // 1. First, try with normal repository structure
                         QString metaFile = QString::fromLatin1("%1/%3%2").arg(info.directory,
                             QString::fromLatin1("meta.7z"), info.version);
 
                         if (!QFileInfo(metaFile).exists()) {
-                            throw QInstaller::Error(QString::fromLatin1("Could not find meta archive for component "
-                                "%1 %2 in repository %3.").arg(info.name, info.version, it->filePath()));
+                            // 2. If that does not work, check for fetched temporary repository structure
+                            metaFile = QString::fromLatin1("%1/%2-%3-%4").arg(it->filePath(),
+                                info.name, info.version, QString::fromLatin1("meta.7z"));
+
+                            if (!QFileInfo(metaFile).exists()) {
+                                throw QInstaller::Error(QString::fromLatin1("Could not find meta archive for component "
+                                    "%1 %2 in repository %3.").arg(info.name, info.version, it->filePath()));
+                            }
                         }
                         info.metaFile = metaFile;
                     }
-- 
cgit v1.2.3