From 09faf55f703f7e5ba88ebc4ca3d850e3a8736a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20N=C3=A4tterlund?= <tobias.naetterlund.qnx@kdab.com>
Date: Tue, 16 Oct 2012 13:09:37 +0200
Subject: [PATCH] QNX: Fix environment file parser for newer BB NDK

The newer NDK specifies the QNX_HOST_VERSION and QNX_TARGET_VERSION
separately, extend the parser to support assignments such as
QNX_HOST_VERSION=${QNX_HOST_VERSION:=10_0_9_52} and the Windows equivalent

Change-Id: I728fa0f6a4f0bd3b435d408794da1a6c8a93bd37
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
---
 src/plugins/qnx/blackberryqtversion.cpp | 38 ++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qnx/blackberryqtversion.cpp b/src/plugins/qnx/blackberryqtversion.cpp
index 70eb76c91ad..efa8614abfa 100644
--- a/src/plugins/qnx/blackberryqtversion.cpp
+++ b/src/plugins/qnx/blackberryqtversion.cpp
@@ -33,6 +33,7 @@
 
 #include "qnxconstants.h"
 
+#include <utils/environment.h>
 #include <utils/qtcassert.h>
 
 #include <QTextStream>
@@ -56,12 +57,41 @@ QMultiMap<QString, QString> parseEnvironmentFile(const QString &fileName)
         if (!line.contains(QLatin1Char('=')))
             continue;
 
-        const QStringList lineContent = line.split(QLatin1Char('='));
-        QString var = lineContent.value(0);
+        int equalIndex = line.indexOf(QLatin1Char('='));
+        QString var = line.left(equalIndex);
         //Remove set in front
         if (var.startsWith(QLatin1String("set ")))
             var = var.right(var.size() - 4);
-        QString value = lineContent.value(1).section(QLatin1Char('"'), 0, -1, QString::SectionSkipEmpty);
+
+        QString value = line.mid(equalIndex + 1);
+
+#if defined Q_OS_WIN
+        QRegExp systemVarRegExp(QLatin1String("IF NOT DEFINED ([\\w\\d]+)\\s+set ([\\w\\d]+)=([\\w\\d]+)"));
+        if (line.contains(systemVarRegExp)) {
+            var = systemVarRegExp.cap(2);
+            Utils::Environment sysEnv = Utils::Environment::systemEnvironment();
+            QString sysVar = systemVarRegExp.cap(1);
+            if (sysEnv.hasKey(sysVar))
+                value = sysEnv.value(sysVar);
+            else
+                value = systemVarRegExp.cap(3);
+        }
+#elif defined Q_OS_UNIX
+        QRegExp systemVarRegExp(QLatin1String("\\$\\{([\\w\\d]+):=([\\w\\d]+)\\}")); // to match e.g. "${QNX_HOST_VERSION:=10_0_9_52}"
+        if (value.contains(systemVarRegExp)) {
+            Utils::Environment sysEnv = Utils::Environment::systemEnvironment();
+            QString sysVar = systemVarRegExp.cap(1);
+            if (sysEnv.hasKey(sysVar))
+                value = sysEnv.value(sysVar);
+            else
+                value = systemVarRegExp.cap(2);
+        }
+#endif
+
+        if (value.startsWith(QLatin1Char('"')))
+            value = value.mid(1);
+        if (value.endsWith(QLatin1Char('"')))
+            value = value.left(value.size() - 1);
 
         fileContent[var] = value;
     }
@@ -79,7 +109,7 @@ QMultiMap<QString, QString> parseEnvironmentFile(const QString &fileName)
         foreach (const QString &value, values) {
             const QString ownKeyAsWindowsVar = QLatin1Char('%') + key + QLatin1Char('%');
             const QString ownKeyAsUnixVar = QLatin1Char('$') + key;
-            if (!value.contains(ownKeyAsWindowsVar) && !value.contains(ownKeyAsUnixVar)) {
+            if (value != ownKeyAsUnixVar && value != ownKeyAsWindowsVar) { // to ignore e.g. PATH=$PATH
                 QString val = value;
                 if (val.contains(QLatin1Char('%')) || val.contains(QLatin1Char('$'))) {
                     QMapIterator<QString, QString> replaceIt(fileContent);