Merge lp:~bzoltan/qtcreator-plugin-ubuntu/Remove_emulator_installation_stuff into lp:qtcreator-plugin-ubuntu

[Zoltan Balogh]

Remove emulator installation or package chekcing functions.

Remove emulator installation or package chekcing functions.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:447
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/28/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1980/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/28/rebuild

review: Approve (continuous-integration)

Unmerged revisions

447. By Zoltan Balogh on 2016-03-22

Remove emulator installation or package chekcing functions.

=== modified file 'share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml'
--- share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml	2015-11-24 11:14:08 +0000
+++ share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml	2016-03-22 19:37:10 +0000
@@ -192,10 +192,6 @@
                         width: height
                         anchors.verticalCenter: parent.verticalCenter
                         onClicked: {
-                            if(!devicesModel.emulatorInstalled){
-                                PopupUtils.open(resourceRoot+"/DevicesPage/EmulatorNotInstalled.qml",devicePage);
-                                return;
-                            }
                             PopupUtils.open(resourceRoot+"/DevicesPage/NewEmulatorDialog.qml",devicePage);
                         }
                     }

=== removed file 'share/qtcreator/ubuntu/qml/DevicesPage/EmulatorNotInstalled.qml'
--- share/qtcreator/ubuntu/qml/DevicesPage/EmulatorNotInstalled.qml	2015-11-23 10:34:50 +0000
+++ share/qtcreator/ubuntu/qml/DevicesPage/EmulatorNotInstalled.qml	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
-import Ubuntu.Components.Popups 1.0
-
-import "../Components"
-
-Popover {
-    id: popover
-    height: containerLayout.childrenRect.height
-    Column {
-        id: containerLayout
-        anchors {
-            left: parent.left
-            top: parent.top
-            right: parent.right
-        }
-        ListItem.Header {
-            text: "Ubuntu Emulator is not installed"
-            __foregroundColor: UbuntuColors.orange
-
-        }
-        ListItem.Empty {
-            showDivider: false
-            Label {
-                anchors.fill: parent
-                anchors.margins: units.gu(2)
-                text: "Install the emulator package \"ubuntu-emulator\" in order to create emulator instances."
-                wrapMode: Text.Wrap
-            }
-        }
-        //add a spacer item
-        Item {
-            height: units.gu(2)
-            width:  units.gu(1)
-        }
-        ListItem.SingleControl {
-            highlightWhenPressed: false
-            control: Button {
-                text: "Close"
-                anchors {
-                    margins: units.gu(1)
-                }
-                onClicked: PopupUtils.close(popover)
-            }
-        }
-    }
-}

=== removed file 'share/qtcreator/ubuntu/scripts/local_install_emulator'
--- share/qtcreator/ubuntu/scripts/local_install_emulator	2013-11-29 12:07:35 +0000
+++ share/qtcreator/ubuntu/scripts/local_install_emulator	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-#!/bin/bash
-# Copyright 2013 Canonical Ltd.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; version 2.1.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Zoltán Balogh <[e-mail]>
-
-set -e
-EMULATOR_PACKAGE=$1
-pkexec sh -c "apt-get -y -f install ${EMULATOR_PACKAGE}"

=== modified file 'share/qtcreator/ubuntu/scripts/local_package_installed'
--- share/qtcreator/ubuntu/scripts/local_package_installed	2014-01-21 11:07:59 +0000
+++ share/qtcreator/ubuntu/scripts/local_package_installed	2016-03-22 19:37:10 +0000
@@ -15,6 +15,6 @@
 #
 # Author: Zoltán Balogh <[e-mail]>
 set -e
-EMULATOR_PACKAGE=$1
+PACKAGE=$1
 
-dpkg -l ${EMULATOR_PACKAGE} 2>&1 |egrep -v "no packages found matching"|  awk '{print $1 " " $2 " " $3}' | grep "ii" || echo "The package is not installed."
+dpkg -l ${PACKAGE} 2>&1 |egrep -v "no packages found matching"|  awk '{print $1 " " $2 " " $3}' | grep "ii" || echo "The package is not installed."

=== modified file 'src/ubuntu/ubuntuconstants.h'
--- src/ubuntu/ubuntuconstants.h	2015-11-24 15:37:59 +0000
+++ src/ubuntu/ubuntuconstants.h	2016-03-22 19:37:10 +0000
@@ -41,7 +41,7 @@
 const char UBUNTUDEVICESWIDGET_ONERROR[] = "<p style=\"color: red\">%0</p>";
 const char UBUNTUDEVICESWIDGET_ACTION_BEGIN[] = "<p style=\"color: #888\">%0</p>";
 const char UBUNTUDEVICESWIDGET_ACTION_END[] = "<p style=\"color: #888\">%0</p>";
-const char UBUNTUDEVICESWIDGET_ONFINISHED_LOCAL_NO_EMULATOR_INSTALLED[] = "The package is not installed.";
+const char UBUNTUDEVICESWIDGET_ONFINISHED_LOCAL_NOT_INSTALLED[] = "The package is not installed.";
 const char UBUNTUDEVICESWIDGET_ONFINISHED_ADB_REGEX[] = "(\\S+)\\s+(.*)";
 const char UBUNTUDEVICESWIDGET_ONFINISHED_ADB_NOACCESS[] = "???";
 const char UBUNTUDEVICESWIDGET_ONFINISHED_SSH_WAS_STARTED[] = "..openssh-server was started.";
@@ -52,7 +52,6 @@
 const char UBUNTUDEVICESWIDGET_ONFINISHED_UNABLE_TO_FETCH[] = "E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?";
 
 const char UBUNTUWIDGETS_ONFINISHED_SCRIPT_LOCAL_PACKAGE_INSTALLED[] = "%0/local_package_installed";  
-const char UBUNTUDEVICESWIDGET_ONFINISHED_SCRIPT_LOCAL_INSTALL_EMULATOR[] = "%0/local_install_emulator";
 
 const char UBUNTUDEVICESWIDGET_ONFINISHED_WRITABLE_ENABLED[] = "..writable image has been enabled, device is rebooting.";
 const char UBUNTUDEVICESWIDGET_ONFINISHED_WRITABLE_DISABLED[] = "..writable image has been disabled, device is rebooting.";
@@ -72,13 +71,9 @@
 const char UBUNTUDEVICESWIDGET_ONFINISHED_PUBLICKEY_AUTH_SET[] = "..public key authentication is now set.";
 const char UBUNTUDEVICESWIDGET_ONFINISHED_NETWORK_CONF_COPIED[] = "..network configuration copied.";
 
-const char EMULATOR_PACKAGE_NAME[] = "ubuntu-emulator";
 const char DEFAULT_EMULATOR_PATH[] = "ubuntu-emulator";
 const char REVIEWER_PACKAGE_NAME[] = "click-reviewers-tools";
 
-const char UBUNTUDEVICESWIDGET_LOCAL_EMULATOR_INSTALLED[] = "Checking installed emulator package.";
-const char UBUNTUDEVICESWIDGET_INSTALL_EMULATOR_PACKAGE[] = "Install the emulator package on the system..";
-const char UBUNTUDEVICESWIDGET_INSTALL_EMULATOR_PACKAGE_SCRIPT[] = "%0/local_install_emulator %1";
 const char UBUNTUDEVICESWIDGET_LOCAL_SEARCH_IMAGES_SCRIPT[] = "%0/local_search_images";
 const char UBUNTUDEVICESWIDGET_LOCAL_SEARCH_IMAGES[] = "Search configured emulator instances.";
 const char UBUNTUDEVICESWIDGET_LOCAL_CREATE_EMULATOR[] = "Creating new emulator instance.";

=== modified file 'src/ubuntu/ubuntudevicesmodel.cpp'
--- src/ubuntu/ubuntudevicesmodel.cpp	2015-11-11 14:50:13 +0000
+++ src/ubuntu/ubuntudevicesmodel.cpp	2016-03-22 19:37:10 +0000
@@ -361,7 +361,6 @@
 void UbuntuDevicesModel::refresh()
 {
     readDevicesFromSettings();
-    checkEmulatorInstalled();
 }
 
 void UbuntuDevicesModel::clear()
@@ -619,19 +618,6 @@
     ProjectExplorer::DeviceManager::instance()->addDevice(dev);
 }
 
-bool UbuntuDevicesModel::emulatorInstalled() const
-{
-    return m_emulatorInstalled;
-}
-
-void UbuntuDevicesModel::setEmulatorInstalled(bool arg)
-{
-    if (m_emulatorInstalled != arg) {
-        m_emulatorInstalled = arg;
-        emit emulatorInstalledChanged(arg);
-    }
-}
-
 bool UbuntuDevicesModel::busy() const
 {
     return m_busy;
@@ -648,14 +634,6 @@
 QString UbuntuDevicesModel::state() const
 {
     switch(m_state) {
-        case CheckEmulatorInstalled: {
-            return tr("Checking if emulator tool is installed");
-            break;
-        }
-        case InstallEmulator: {
-            return tr("Installing emulator tool");
-            break;
-        }
         case CreateEmulatorImage: {
             return tr("Creating emulator image");
             break;
@@ -713,22 +691,6 @@
     emit logMessage(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_ACTION_END).arg(msg));
 }
 
-void UbuntuDevicesModel::checkEmulatorInstalled()
-{
-    setState(CheckEmulatorInstalled);
-    setCancellable(false);
-    m_emulatorInstalled = false;
-
-    beginAction(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_LOCAL_EMULATOR_INSTALLED));
-    m_process->stop();
-    QString sEmulatorPackageName = QLatin1String(Ubuntu::Constants::EMULATOR_PACKAGE_NAME);
-    m_process->append(QStringList()
-                      << QString::fromLatin1(Constants::UBUNTUWIDGETS_LOCAL_PACKAGE_INSTALLED_SCRIPT).arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(sEmulatorPackageName)
-                      << QCoreApplication::applicationDirPath());
-    m_process->start(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_LOCAL_EMULATOR_INSTALLED));
-
-}
-
 void UbuntuDevicesModel::findEmulatorImages()
 {
     setState(FindImages);
@@ -742,23 +704,6 @@
     m_process->start(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_LOCAL_SEARCH_IMAGES));
 }
 
-void UbuntuDevicesModel::installEmulator()
-{
-    if(m_emulatorInstalled)
-        return;
-
-    setState(InstallEmulator);
-    setCancellable(false);
-
-    beginAction(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_INSTALL_EMULATOR_PACKAGE));
-    QString sEmulatorPackageName = QLatin1String(Ubuntu::Constants::EMULATOR_PACKAGE_NAME);
-    m_process->stop();
-    m_process->append(QStringList()
-                      << QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_INSTALL_EMULATOR_PACKAGE_SCRIPT).arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(sEmulatorPackageName)
-                      << QCoreApplication::applicationDirPath());
-    m_process->start(QString::fromLatin1(Constants::UBUNTUDEVICESWIDGET_INSTALL_EMULATOR_PACKAGE));
-}
-
 void UbuntuDevicesModel::doCreateEmulatorImage(UbuntuProcess *process, const QString &name, const QString &arch, const QString &channel, const QString &passwd)
 {
     process->stop();
@@ -894,9 +839,6 @@
 
 void UbuntuDevicesModel::onMessage(const QString &msg)
 {
-    if (msg.startsWith(QLatin1String(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_UNABLE_TO_FETCH))) {
-        setEmulatorInstalled(false);
-    }
     m_reply.append(msg);
 }
 
@@ -911,54 +853,6 @@
     };
 
     switch(lastState) {
-        case CheckEmulatorInstalled: {
-            QStringList lines = m_reply.trimmed().split(QLatin1String(Constants::LINEFEED));
-            foreach(QString line, lines) {
-                line = line.trimmed();
-                if (line.isEmpty()) {
-                    continue;
-                }
-                if (line.startsWith(QLatin1String(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_LOCAL_NO_EMULATOR_INSTALLED))) {
-                    setEmulatorInstalled(false);
-                    queryAdb();
-                } else {
-                    QStringList lineData = line.split(QLatin1String(Constants::SPACE));
-                    QString sEmulatorPackageStatus = lineData.takeFirst();
-                    //QString sEmulatorPackageName = lineData.takeFirst();
-                    //QString sEmulatorPackageVersion = lineData.takeFirst();
-                    if (sEmulatorPackageStatus.startsWith(QLatin1String(Constants::INSTALLED))) {
-                        setEmulatorInstalled(true);
-                        findEmulatorImages();
-                    }
-                }
-            }
-            break;
-        }
-        case InstallEmulator: {
-            QStringList lines = m_reply.trimmed().split(QLatin1String(Constants::LINEFEED));
-            foreach(QString line, lines) {
-                line = line.trimmed();
-                if (line.isEmpty()) {
-                    continue;
-                }
-                if (line.startsWith(QLatin1String(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_LOCAL_NO_EMULATOR_INSTALLED))) {
-                    setEmulatorInstalled(false);
-                    queryAdb();
-                    break;
-                } else {
-                    QStringList lineData = line.split(QLatin1String(Constants::SPACE));
-                    QString sEmulatorPackageStatus = lineData.takeFirst();
-                    //QString sEmulatorPackageName = lineData.takeFirst();
-                    //QString sEmulatorPackageVersion = lineData.takeFirst();
-                    if (sEmulatorPackageStatus.startsWith(QLatin1String(Constants::INSTALLED))) {
-                        setEmulatorInstalled(true);
-                        findEmulatorImages();
-                        break;
-                    }
-                }
-            }
-            break;
-        }
         case CreateEmulatorImage: {
             findEmulatorImages();
             break;

=== modified file 'src/ubuntu/ubuntudevicesmodel.h'
--- src/ubuntu/ubuntudevicesmodel.h	2015-05-05 09:38:13 +0000
+++ src/ubuntu/ubuntudevicesmodel.h	2016-03-22 19:37:10 +0000
@@ -69,8 +69,6 @@
 
     enum State {
         Initial,
-        CheckEmulatorInstalled,
-        InstallEmulator,
         CreateEmulatorImage,
         ReadFromSettings,
         FindImages,
@@ -78,7 +76,6 @@
         Idle
     };
 
-    Q_PROPERTY(bool emulatorInstalled READ emulatorInstalled WRITE setEmulatorInstalled NOTIFY emulatorInstalledChanged)
     Q_PROPERTY(bool busy READ busy NOTIFY busyChanged)
     Q_PROPERTY(bool cancellable READ cancellable NOTIFY cancellableChanged)
     Q_PROPERTY(QString state READ state NOTIFY stateChanged)
@@ -101,7 +98,6 @@
     bool cancellable() const;
     QString state() const;
     bool busy() const;
-    bool emulatorInstalled() const;
 
     static void doCreateEmulatorImage ( UbuntuProcess *process, const QString &name, const QString &arch, const QString &channel, const QString &passwd );
 signals:
@@ -110,7 +106,6 @@
     void stdErrMessage (const QString &str);
 
     void busyChanged(bool arg);
-    void emulatorInstalledChanged(bool arg);
     void cancellableChanged(bool arg);
     void stateChanged(QString arg);
 
@@ -139,14 +134,11 @@
 
     void setState(UbuntuDevicesModel::State newState);
     void setBusy(bool arg);
-    void setEmulatorInstalled(bool arg);
     void setCancellable(bool arg);
 
     void beginAction(const QString &msg);
     void endAction(const QString &msg);
-    void checkEmulatorInstalled();
     void findEmulatorImages();
-    void installEmulator();
     void queryAdb();
 
 protected slots:
@@ -167,7 +159,6 @@
     QList<UbuntuDevicesItem*> m_knownDevices;
     UbuntuDeviceNotifier *m_deviceNotifier;
     bool      m_busy;
-    bool      m_emulatorInstalled;
     bool      m_cancellable;
     State     m_state;
 

=== modified file 'src/ubuntu/ubuntupackagingmodel.cpp'
--- src/ubuntu/ubuntupackagingmodel.cpp	2016-02-09 12:06:50 +0000
+++ src/ubuntu/ubuntupackagingmodel.cpp	2016-03-22 19:37:10 +0000
@@ -185,7 +185,7 @@
             if (line.isEmpty()) {
                 continue;
             }
-            if (line.startsWith(QLatin1String(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_LOCAL_NO_EMULATOR_INSTALLED))) {
+            if (line.startsWith(QLatin1String(Constants::UBUNTUDEVICESWIDGET_ONFINISHED_LOCAL_NOT_INSTALLED))) {
                 // There is no click reviewer tool installed
                 m_reviewToolsInstalled = false;
                 setShowValidationUi(false);

=== modified file 'ubuntu.pro'
--- ubuntu.pro	2015-11-23 10:36:16 +0000
+++ ubuntu.pro	2016-03-22 19:37:10 +0000
@@ -16,7 +16,6 @@
     $$QML_ROOT/qml/DevicesPage/DevicePage.qml  \
     $$QML_ROOT/qml/DevicesPage/NewEmulatorDialog.qml \
     $$QML_ROOT/qml/DevicesPage/DeleteDeviceDialog.qml \
-    $$QML_ROOT/qml/DevicesPage/EmulatorNotInstalled.qml \
     $$QML_ROOT/qml/welcome.qml \
     $$QML_ROOT/qml/publishpage.qml \
     $$QML_ROOT/qml/devicespage.qml