Merge pull request #195 from QuasarApp/v1.3.1

[WIP] Version 1.3.1 fixes]
QuasarApp · Oct 17, 2019 · fa62f06 · fa62f06
2 parents d5f8b00 + f2d43df
commit fa62f06
Show file tree

Hide file tree

Showing 13 changed files with 240 additions and 34 deletions.
diff --git a/Deploy/Deploy.pro b/Deploy/Deploy.pro
@@ -19,7 +19,7 @@ TEMPLATE = lib
 
 DEFINES += DEPLOY_LIBRARY
 
-VERSION = 1.3.0.8
+VERSION = 1.3.1.0
 
 DEFINES += APP_VERSION='\\"$$VERSION\\"'
 

diff --git a/Deploy/configparser.cpp b/Deploy/configparser.cpp
@@ -18,7 +18,7 @@
 bool ConfigParser::parseParams() {
 
     auto path = QuasarAppUtils::Params::getStrArg("confFile");
-    bool createFile = !path.isEmpty();
+    bool createFile = !(path.isEmpty() || QFile::exists(path));
     if (path.isEmpty()) {
         path = QFileInfo("./").absoluteFilePath();
     }
@@ -65,8 +65,9 @@ bool ConfigParser::parseParams() {
 
     }
 
-    if (createFile) {
-        createFromDeploy(path);
+    if (createFile && !createFromDeploy(path)) {
+        QuasarAppUtils::Params::verboseLog("Do not create a deploy config file in " + path,
+                                           QuasarAppUtils::Error);
     }
 
     return true;
@@ -129,8 +130,15 @@ void ConfigParser::readKey(const QString& key, const QJsonObject& obj,
 
                  if (!val.isEmpty()) {
                      if (PathUtils::isPath(val)) {
-                         list.push_back(
-                                     QFileInfo(confFileDir + '/' + val).absoluteFilePath());
+                         QString path;
+
+                         if (PathUtils::isAbsalutPath(val)) {
+                             path = QFileInfo(val).absoluteFilePath();
+                         } else {
+                             path = QFileInfo(confFileDir + '/' + val).absoluteFilePath();
+                         }
+
+                         list.push_back(path);
 
                      } else {
                          list.push_back(val);
@@ -145,7 +153,12 @@ void ConfigParser::readKey(const QString& key, const QJsonObject& obj,
              if (!val.isEmpty()) {
 
                  if (PathUtils::isPath(val)) {
-                     val = QFileInfo(confFileDir + '/' + val).absoluteFilePath();
+
+                     if (PathUtils::isAbsalutPath(val)) {
+                         val = QFileInfo(val).absoluteFilePath();
+                     } else {
+                         val = QFileInfo(confFileDir + '/' + val).absoluteFilePath();
+                     }
                  }
 
                  QuasarAppUtils::Params::setArg(key, val);
@@ -161,8 +174,15 @@ void ConfigParser::readKey(const QString& key, const QJsonObject& obj,
 bool ConfigParser::createFromDeploy(const QString& confFile) const {
     QJsonObject obj;
 
+    auto info = QFileInfo(confFile);
+
     for (auto &key :DeployCore::helpKeys()) {
-        writeKey(key, obj, QFileInfo(confFile).absolutePath());
+        writeKey(key, obj, info.absolutePath());
+    }
+
+    if (!QFile::exists(info.absolutePath()) &&
+            !QDir("/").mkpath(info.absolutePath())) {
+        return false;
     }
 
     QJsonDocument doc(obj);

diff --git a/Deploy/deploycore.h b/Deploy/deploycore.h
@@ -36,13 +36,15 @@ enum Platform {
     Win32           = 0x1,
     Win64           = 0x2,
     Unix32          = 0x4,
-    Unix64          = 0x8
+    Unix64          = 0x8,
+    GeneralFile     = 0xf
 };
 
 enum LibPriority : int {
     QtLib = 0x0,
     ExtraLib,
     SystemLib,
+    ExtraFile,
     NotFile = 0xF,
 };
 

diff --git a/Deploy/extracter.cpp b/Deploy/extracter.cpp
@@ -103,7 +103,7 @@ void Extracter::copyExtraPlugins() {
 }
 
 void Extracter::copyPlugins(const QStringList &list) {
-    for (auto plugin : list) {
+    for (auto plugin : list) {        
         if (!copyPlugin(plugin)) {
             qWarning() << plugin << " not copied!";
         }
@@ -292,7 +292,7 @@ bool Extracter::extractQmlAll() {
 
     if (!_fileManager->copyFolder(DeployCore::_config->qmlDir,
                                  DeployCore::_config->targetDir + DeployCore::_config->distroStruct.getQmlOutDir(),
-                    QStringList() << ".so.debug" << "d.dll",
+                    QStringList() << ".so.debug" << "d.dll" << ".pdb",
                     &listItems)) {
         return false;
     }

diff --git a/Deploy/filemanager.cpp b/Deploy/filemanager.cpp
@@ -258,6 +258,20 @@ bool FileManager::copyFolder(const QString &from, const QString &to, const QStri
                             QuasarAppUtils::VerboseLvl::Info);
                 continue;
             }
+            auto config = DeployCore::_config;
+
+            LibInfo info;
+            info.setName(item.fileName());
+            info.setPath(item.absolutePath());
+            info.setPlatform(GeneralFile);
+
+            if (config)
+                if (auto rule = config->ignoreList.isIgnore(info)) {
+                    QuasarAppUtils::Params::verboseLog(
+                                item.absoluteFilePath() + " ignored by rule " + rule->label,
+                                QuasarAppUtils::VerboseLvl::Info);
+                    continue;
+                }
 
             if (!copyFile(item.absoluteFilePath(), to , mask)) {
                 QuasarAppUtils::Params::verboseLog(

diff --git a/Deploy/ignorerule.cpp b/Deploy/ignorerule.cpp
@@ -35,7 +35,7 @@ bool IgnoreRule::check(const LibInfo &info, const QString& ignoreLabel) const {
     return false;
 }
 
-bool IgnoreRule::isIgnore(const LibInfo &info) const {
+const IgnoreData* IgnoreRule::isIgnore(const LibInfo &info) const {
 
     for (auto &ignore : _data) {
 
@@ -44,12 +44,12 @@ bool IgnoreRule::isIgnore(const LibInfo &info) const {
         bool checkEnvirement = !ignore.enfirement.size() || ignore.enfirement.inThisEnvirement(info.fullPath());
 
         if (checkPlatform && checkPriority && checkEnvirement && check(info, ignore.label)) {
-            return true;
+            return &ignore;
         }
 
     }
 
-    return false;
+    return nullptr;
 }
 
 IgnoreData::IgnoreData(const QString &label) {

diff --git a/Deploy/ignorerule.h b/Deploy/ignorerule.h
@@ -40,7 +40,13 @@ class IgnoreRule
 public:
     IgnoreRule();
     void addRule(const IgnoreData& rule);
-    bool isIgnore(const LibInfo& info) const;
+
+    /**
+     * @brief isIgnore
+     * @param info
+     * @return const ptr to ignore data
+     */
+    const IgnoreData *isIgnore(const LibInfo& info) const;
 };
 
 #endif // IGNORERULE_H
diff --git a/Deploy/pathutils.cpp b/Deploy/pathutils.cpp
@@ -35,6 +35,12 @@ QString PathUtils::toFullPath(QString path) {
 
 QString PathUtils::getRelativeLink(QString from, QString to) {
 
+    auto mainDrive = getDrive(from);
+
+    if (mainDrive != getDrive(to) && !mainDrive.isNull()) {
+        return to;
+    }
+
     bool isFile = QFileInfo(to).isFile();
     from = toFullPath(from);
     to = toFullPath(to);
@@ -63,6 +69,25 @@ bool PathUtils::isPath(const QString &path) {
     return path.contains('/') || path.contains('\\') || path == ".";
 }
 
+QChar PathUtils::getDrive(QString path) {
+
+    path = stripPath(path);
+
+    if (path.size() > 1 && path[1] == ':') {
+        return path[0];
+    }
+
+    return 0;
+}
+
+bool PathUtils::isAbsalutPath(const QString &path) {
+    if (getDrive(path).isNull()) {
+        return path.size() && (path.at(0) == "/" ||  path.at(0) == "\\");
+    }
+
+    return true;
+}
+
 QString PathUtils::getReleativePath(QString path) {
     path = toFullPath(path);
 
@@ -81,19 +106,13 @@ QString PathUtils::getReleativePath(QString path) {
 }
 
 QString PathUtils::stripPath(QString path) {
-    path.replace('\\', '/');
-
-    int index = -1;
-    do {
-        path.replace("//", "/");
-    } while ((index = path.indexOf("//")) >= 0);
-
+    path = toFullPath(path);
     if (path.left(1) == '/') {
-        path = path.right(path.size() - 1);
+        path.remove(0, 1);
     }
 
     if (path.right(1) == '/') {
-        path = path.left(path.size() - 1);
+        return path.remove(path.size() - 1, 1);
     }
 
     return path;

diff --git a/Deploy/pathutils.h b/Deploy/pathutils.h
@@ -19,11 +19,56 @@ class DEPLOYSHARED_EXPORT PathUtils
 {
 public:
     PathUtils();
+    /**
+     * @brief toFullPath remove all dublicate separators and insert separators into begin and end
+     * @param path
+     * @return return full path
+     */
     static QString toFullPath(QString path);
+
+    /**
+     * @brief getReleativePath
+     * @param path
+     * @return return releative path from "path" to root dir
+     */
     static QString getReleativePath(QString path);
-    static QString stripPath(QString path) ;
+
+    /**
+     * @brief stripPath remove all dublicate separators and remove separators from begin and end
+     * @param path
+     * @return return strip patth
+     */
+    static QString stripPath(QString path);
+
+    /**
+     * @brief getRelativeLink return releative path
+     * @param from
+     * @param to
+     * @return releative path
+     */
     static QString getRelativeLink(QString from, QString to);
+
+    /**
+     * @brief isPath
+     * @param path
+     * @return return true if imput value is path
+     */
     static bool isPath(const QString &path);
+
+    /**
+     * @brief getDrive
+     * @param path
+     * @return char of drive in windows systems
+     */
+    static QChar getDrive(QString path);
+
+    /**
+     * @brief isAbsalutPath
+     * @param path
+     * @return return true if path is absolute
+     */
+    static bool isAbsalutPath(const QString &path);
+
 };
 
 #endif // PATHUTILS_H
diff --git a/UnitTests/modules.cpp b/UnitTests/modules.cpp
@@ -228,8 +228,6 @@ QSet<QString> Modules::qmlLibs() {
                     "./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll",
                     "./" + DISTRO_DIR + "/Qt5WebSockets.dll",
                     "./" + DISTRO_DIR + "/Qt5Widgets.dll",
-                    "./" + DISTRO_DIR + "/QtWidgetsProject.exe",
-                    "./" + DISTRO_DIR + "/TestOnlyC.exe",
                     "./" + DISTRO_DIR + "/TestQMLWidgets.exe",
                     "./" + DISTRO_DIR + "/libgcc_s_seh-1.dll",
                     "./" + DISTRO_DIR + "/libstdc++-6.dll",