Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/qmakefix into lp:~bzoltan/qtcreator-plugin-ubuntu/support_named_chroots

[Benjamin Zeller]

- Add versioning for UbuntuQtVersion and qmake scripts created in
~/.config/ubuntu-sdk
- Fix qtc_chroot_qmake template
- Automatically recreate QtVersions if they are obsolete

- Add versioning for UbuntuQtVersion and qmake scripts created in
~/.config/ubuntu-sdk
- Fix qtc_chroot_qmake template
- Automatically recreate QtVersions if they are obsolete

=== modified file 'share/qtcreator/ubuntu/scripts/qtc_chroot_qmake'
--- share/qtcreator/ubuntu/scripts/qtc_chroot_qmake	2014-07-29 07:58:30 +0000
+++ share/qtcreator/ubuntu/scripts/qtc_chroot_qmake	2014-09-29 11:30:09 +0000
@@ -18,6 +18,7 @@
 
 CLICK_CHROOT_ARCH="%1"
 CLICK_CHROOT_FW="%2"
+CLICK_CHROOT_NAME="%3"
 
 if [ -z "$CLICK_CHROOT_ARCH" ]; then
     echo "Need to set CLICK_CHROOT_ARCH"
@@ -29,6 +30,11 @@
     exit 1
 fi
 
+if [ -z "$CLICK_CHROOT_NAME" ]; then
+    echo "Need to set CLICK_CHROOT_NAME"
+    exit 1
+fi
+
 if [[ $1 != "-query" ]];
 then
 	exit 1
@@ -43,7 +49,7 @@
     POSTFIX=""
 fi
 
-SYSROOT_PATH="/var/lib/schroot/chroots/click-${CLICK_CHROOT_FW}-${CLICK_CHROOT_ARCH}"
+SYSROOT_PATH="/var/lib/schroot/chroots/${CLICK_CHROOT_NAME}-${CLICK_CHROOT_FW}-${CLICK_CHROOT_ARCH}"
 QMAKE_PATH="${SYSROOT_PATH}/usr/lib/${ARCH_TRIPLET}-linux-gnu${POSTFIX}/qt5/bin/qmake"
 
 
@@ -71,8 +77,8 @@
 STRINGS=${STRINGS/qt_hdatpath=/QT_HOST_DATA:$SYSROOT_PATH}
 STRINGS=${STRINGS/qt_hbinpath=/QT_HOST_BINS:$SYSROOT_PATH}
 STRINGS=${STRINGS/qt_hlibpath=/QT_HOST_LIBS:$SYSROOT_PATH}
-STRINGS=${STRINGS/qt_hostspec=/QMAKE_SPEC:$SYSROOT_PATH}
-STRINGS=${STRINGS/qt_targspec=/QMAKE_XSPEC:$SYSROOT_PATH}
+STRINGS=${STRINGS/qt_hostspec=/QMAKE_SPEC:}
+STRINGS=${STRINGS/qt_targspec=/QMAKE_XSPEC:}
 STRINGS=${STRINGS//# Generated by qmake (/QMAKE_VERSION:}
 STRINGS=${STRINGS//) (Qt /$'\n'QT_VERSION:}
 STRINGS=${STRINGS//)/}

=== modified file 'src/ubuntu/ubuntukitmanager.cpp'
--- src/ubuntu/ubuntukitmanager.cpp	2014-08-01 13:11:09 +0000
+++ src/ubuntu/ubuntukitmanager.cpp	2014-09-29 11:30:09 +0000
@@ -72,10 +72,11 @@
 UbuntuQtVersion *UbuntuKitManager::createOrFindQtVersion(ClickToolChain *tc)
 {
 
-    QString qmakePath = QStringLiteral("%1/.config/ubuntu-sdk/qmake-%2-%3")
+    QString qmakePath = QStringLiteral("%1/.config/ubuntu-sdk/qmake-%2-%3-%4")
             .arg(QDir::homePath())
             .arg(tc->clickTarget().framework)
-            .arg(tc->clickTarget().architecture);
+            .arg(tc->clickTarget().architecture)
+            .arg(UbuntuClickTool::clickChrootSuffix());
 
     if(!QFile::exists(qmakePath)) {
         QFile qmakeTemplate(Constants::UBUNTU_RESOURCE_PATH+QStringLiteral("/ubuntu/scripts/qtc_chroot_qmake"));
@@ -86,7 +87,8 @@
 
             templ = templ
                     .arg(tc->clickTarget().architecture)
-                    .arg(tc->clickTarget().framework);
+                    .arg(tc->clickTarget().framework)
+                    .arg(UbuntuClickTool::clickChrootSuffix());
 
 
             QFile qmakeScript(qmakePath);
@@ -185,6 +187,20 @@
 
 void UbuntuKitManager::autoDetectKits()
 {
+    //destroy all obsolete QtVersions, they are recreated later on in fixKit()
+    foreach (QtSupport::BaseQtVersion *qtVersion, QtSupport::QtVersionManager::versions()) {
+        if (qtVersion->type() != QLatin1String(Constants::UBUNTU_QTVERSION_TYPE))
+            continue;
+
+        UbuntuQtVersion* ver = static_cast<UbuntuQtVersion*> (qtVersion);
+        if(ver->scriptVersion() < UbuntuQtVersion::minimalScriptVersion()) {
+            //we need to remove that QtVersion
+            QFile::remove(ver->qmakeCommand().toString());
+            QtSupport::QtVersionManager::removeVersion(ver);
+
+        }
+    }
+
     // having a empty toolchains list will remove all autodetected kits for android
     // exactly what we want in that case
     QList<ClickToolChain *> toolchains = clickToolChains();

=== modified file 'src/ubuntu/ubuntuqtversion.cpp'
--- src/ubuntu/ubuntuqtversion.cpp	2014-07-29 07:48:09 +0000
+++ src/ubuntu/ubuntuqtversion.cpp	2014-09-29 11:30:09 +0000
@@ -9,12 +9,23 @@
 namespace Ubuntu {
 namespace Internal {
 
+const char SCRIPT_VERSION_KEY[] = "UbuntuQtVersion.ScriptVersion";
+
+/*!
+ * \brief MIN_SCRIPT_VERSION
+ * Increment this version if all qmake scripts in ~/.config/ubuntu-sdk
+ * need to be recreated
+ */
+const int  MIN_SCRIPT_VERSION   = 1;
+
 UbuntuQtVersion::UbuntuQtVersion()
-    : BaseQtVersion()
+    : BaseQtVersion(),
+      m_scriptVersion(MIN_SCRIPT_VERSION)
 { }
 
 UbuntuQtVersion::UbuntuQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource)
-    : BaseQtVersion(path, isAutodetected, autodetectionSource)
+    : BaseQtVersion(path, isAutodetected, autodetectionSource),
+      m_scriptVersion(MIN_SCRIPT_VERSION)
 {
     setDisplayName(defaultDisplayName(qtVersionString(), path, false));
 }
@@ -22,6 +33,19 @@
 UbuntuQtVersion::~UbuntuQtVersion()
 { }
 
+void UbuntuQtVersion::fromMap(const QVariantMap &map)
+{
+    BaseQtVersion::fromMap(map);
+    m_scriptVersion = map.value(QLatin1String(SCRIPT_VERSION_KEY),0).toInt();
+}
+
+QVariantMap UbuntuQtVersion::toMap() const
+{
+    QVariantMap map = BaseQtVersion::toMap();
+    map.insert(QLatin1String(SCRIPT_VERSION_KEY),m_scriptVersion);
+    return map;
+}
+
 UbuntuQtVersion *UbuntuQtVersion::clone() const
 {
     return new UbuntuQtVersion(*this);
@@ -51,6 +75,21 @@
 {
     return QLatin1String(Constants::UBUNTU_PLATFORM_NAME_TR);
 }
+int UbuntuQtVersion::scriptVersion() const
+{
+    return m_scriptVersion;
+}
+
+void UbuntuQtVersion::setScriptVersion(int scriptVersion)
+{
+    m_scriptVersion = scriptVersion;
+}
+
+int UbuntuQtVersion::minimalScriptVersion()
+{
+    return MIN_SCRIPT_VERSION;
+}
+
 
 bool UbuntuQtVersionFactory::canRestore(const QString &type)
 {

=== modified file 'src/ubuntu/ubuntuqtversion.h'
--- src/ubuntu/ubuntuqtversion.h	2014-07-29 07:48:09 +0000
+++ src/ubuntu/ubuntuqtversion.h	2014-09-29 11:30:09 +0000
@@ -13,6 +13,11 @@
     UbuntuQtVersion();
     UbuntuQtVersion(const Utils::FileName &path, bool isAutodetected = false, const QString &autodetectionSource = QString());
     ~UbuntuQtVersion() override;
+
+    // BaseQtVersion interface
+    virtual void fromMap(const QVariantMap &map) override;
+    virtual QVariantMap toMap() const override;
+
     UbuntuQtVersion *clone() const override;
 
     QString type() const override;
@@ -23,6 +28,14 @@
 
     QString platformName() const override;
     QString platformDisplayName() const override;
+
+    int scriptVersion() const;
+    void setScriptVersion(int scriptVersion);
+
+    static int minimalScriptVersion ();
+
+private:
+    int m_scriptVersion;
 };
 
 class UbuntuQtVersionFactory : public QtSupport::QtVersionFactory