Merge lp:~zeller-benjamin/ubuntu-sdk-ide/snapcraft-devmode into lp:ubuntu-sdk-ide

[Benjamin Zeller]

add a devmode switch

add a devmode switch

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

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

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

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

review: Approve

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

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

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

review: Approve (continuous-integration)

=== modified file 'dist/qtcreator/src/plugins/ubuntu/share/qtcreator/ubuntu/scripts/qtc_desktop_snaprunner.py'
--- dist/qtcreator/src/plugins/ubuntu/share/qtcreator/ubuntu/scripts/qtc_desktop_snaprunner.py	2016-11-07 10:48:52 +0000
+++ dist/qtcreator/src/plugins/ubuntu/share/qtcreator/ubuntu/scripts/qtc_desktop_snaprunner.py	2016-11-08 12:28:00 +0000
@@ -30,6 +30,7 @@
 parser = argparse.ArgumentParser(description="SDK snap launcher")
 parser.add_argument('snap_package',action="store")
 parser.add_argument('snap_command',action='store')
+parser.add_argument('--devmode'   ,action='store_true')
 
 options, args = parser.parse_known_args()
 
@@ -48,7 +49,11 @@
 sys.stderr.flush()
 
 #ok lets install the snap package
-ret = subprocess.call(["snap", "install", options.snap_package, "--dangerous"], stdout=sys.stdout, stderr=sys.stderr)
+snaparg = ["snap", "install", options.snap_package, "--dangerous"]
+if options.devmode:
+    print("Enabling devmode\n")
+    snaparg += ["--devmode"]
+ret = subprocess.call(snaparg, stdout=sys.stdout, stderr=sys.stderr)
 if ret != 0:
     sys.exit(ret)
 
@@ -71,6 +76,7 @@
 signal.signal(signal.SIGHUP,  signalHandler)
 
 #start the actual app
+print("Command args are: "+str(args)+"\n")
 if not stopped:
     proc = subprocess.Popen(["snap", "run", app_info[0]+"."+options.snap_command]+args, stdout=sys.stdout, stderr=sys.stderr)
     ret = proc.wait()

=== modified file 'dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snaprunconfiguration.cpp'
--- dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snaprunconfiguration.cpp	2016-11-07 10:48:52 +0000
+++ dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snaprunconfiguration.cpp	2016-11-08 12:28:00 +0000
@@ -18,17 +18,20 @@
 #include <QFileInfo>
 #include <QFormLayout>
 #include <QComboBox>
+#include <QCheckBox>
 
 namespace Ubuntu {
 namespace Internal {
 
 const QString COMMAND_KEY = QStringLiteral("SnapProjectManager.SnapRunConfiguration.SnapCommand");
+const QString DEVMODE_KEY = QStringLiteral("SnapProjectManager.SnapRunConfiguration.SnapDevMode");
 const QString WORKINGDIRECTORYASPECT_ID = QStringLiteral("SnapProjectManager.SnapRunConfiguration.WorkingDirectoryAspect");
 const QString ARGUMENTASPECT_ID = QStringLiteral("SnapProjectManager.SnapRunConfiguration.ArgumentAspect");
 const QString TERMINALASPECT_ID = QStringLiteral("SnapProjectManager.SnapRunConfiguration.TerminalAspect");
 
 SnapRunConfiguration::SnapRunConfiguration(ProjectExplorer::Target *parent)
     : ProjectExplorer::RunConfiguration(parent, Constants::SNAP_RUNCONFIGURATION_ID)
+    , m_useDevMode(true)
     , m_workingDirectoryAspect(new ProjectExplorer::WorkingDirectoryAspect(this, WORKINGDIRECTORYASPECT_ID))
     , m_argumentAspect(new ProjectExplorer::ArgumentsAspect(this, ARGUMENTASPECT_ID))
     , m_terminalAspect(new ProjectExplorer::TerminalAspect(this, TERMINALASPECT_ID))
@@ -87,6 +90,7 @@
         return false;
 
     m_command = map.value(COMMAND_KEY, QString()).toString();
+    m_useDevMode = map.value(DEVMODE_KEY, true).toBool();
     return true;
 }
 
@@ -94,6 +98,7 @@
 {
     QVariantMap map = ProjectExplorer::RunConfiguration::toMap();
     map.insert(COMMAND_KEY, m_command);
+    map.insert(DEVMODE_KEY, m_useDevMode);
     return map;
 }
 
@@ -131,6 +136,9 @@
         m_command
     };
 
+    if (m_useDevMode)
+        args.prepend(QStringLiteral("--devmode"));
+
     ProjectExplorer::StandardRunnable r;
     r.executable = Utils::FileName::fromString(Constants::UBUNTU_SCRIPTPATH).appendPath(QStringLiteral("qtc_desktop_snaprunner.py")).toString();;
     r.workingDirectory = m_workingDirectoryAspect->workingDirectory().toString();
@@ -167,6 +175,16 @@
 
 }
 
+bool SnapRunConfiguration::useDevMode() const
+{
+    return m_useDevMode;
+}
+
+void SnapRunConfiguration::setUseDevMode(bool useDevMode)
+{
+    m_useDevMode = useDevMode;
+}
+
 SnapRunConfigurationWidget::SnapRunConfigurationWidget(SnapRunConfiguration *config)
     : QWidget (nullptr),
       m_rc(config),
@@ -188,10 +206,16 @@
     if (idx >= 0)
         m_commandsBox->setCurrentIndex(idx);
 
+    m_devmodeCheckBox = new QCheckBox(tr("Use devmode"), this);
+    m_devmodeCheckBox->setChecked(config->useDevMode());
+    connect(m_devmodeCheckBox, &QCheckBox::stateChanged,
+            this, &SnapRunConfigurationWidget::devModeStateChanged);
+
     layout->addRow(tr("Command:"), m_commandsBox);
     config->extraAspect<ProjectExplorer::ArgumentsAspect>()->addToMainConfigurationWidget(this, layout);
     config->extraAspect<ProjectExplorer::WorkingDirectoryAspect>()->addToMainConfigurationWidget(this,layout);
     config->extraAspect<ProjectExplorer::TerminalAspect>()->addToMainConfigurationWidget(this,layout);
+    layout->addRow(QStringLiteral(""), m_devmodeCheckBox);
 
     if(config->target()) {
         connect(qobject_cast<SnapcraftProject*>(config->target()->project()), &SnapcraftProject::commandListChanged,
@@ -226,6 +250,14 @@
         m_commandsBox->setCurrentIndex(0);
 }
 
+void SnapRunConfigurationWidget::devModeStateChanged(int state)
+{
+    if (state == Qt::Checked)
+        m_rc->setUseDevMode(true);
+    else
+        m_rc->setUseDevMode(false);
+}
+
 void SnapRunConfigurationWidget::commandSelected(const int index)
 {
     if(m_updating)

=== modified file 'dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snaprunconfiguration.h'
--- dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snaprunconfiguration.h	2016-11-07 10:48:52 +0000
+++ dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snaprunconfiguration.h	2016-11-08 12:28:00 +0000
@@ -9,6 +9,7 @@
 #include <QStringList>
 
 class QComboBox;
+class QCheckBox;
 
 namespace Utils {
     class PathChooser;
@@ -49,6 +50,9 @@
     virtual QWidget *createConfigurationWidget() override;
     virtual ProjectExplorer::Runnable runnable() const override;
 
+    bool useDevMode() const;
+    void setUseDevMode(bool useDevMode);
+
 private:
     SnapcraftStep *activeSnapcraftStep() const;
     void updateCommandList(const QStringList &commands);
@@ -56,6 +60,7 @@
 
 private:
     QString m_command;
+    bool m_useDevMode;
     QMetaObject::Connection m_currBuildConfConn;
     ProjectExplorer::WorkingDirectoryAspect* m_workingDirectoryAspect;
     ProjectExplorer::ArgumentsAspect* m_argumentAspect;
@@ -71,6 +76,7 @@
 
 protected:
     void updateComboBox ();
+    void devModeStateChanged (int state);
 
 protected slots:
     void commandSelected (const int index);
@@ -78,6 +84,7 @@
 private:
     SnapRunConfiguration *m_rc;
     QComboBox *m_commandsBox;
+    QCheckBox *m_devmodeCheckBox;
     bool m_updating;
 };