Introduce the concept of a "device process".

Provide a QProcess-like abstraction that can be used
to implement processes running locally or on a remote
device. Objects of a concrete class implementing the functionality
are created by IDevice objects.
Current implementations are:
     - Local execution (QProcess-based), provided via the DesktopDevice.
     - Remote execution via SSH.
     - A specialized case of the former for remote Linux systems (provided by
       LinuxDevice).
The latter is already being used in a number of places. As a result, lots of
code dealing with details such as setting the remote environment could be
moved to a central location. These things are no longer the concern of whoever
is wishing to run a remote process.

Change-Id: I919260ee6e77a020ca47226a4a534e7b8398106f
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Christian Kandeler
2013-08-08 14:05:11 +02:00
parent dc07796c23
commit 22599094b0
48 changed files with 1214 additions and 208 deletions

View File

@@ -0,0 +1,84 @@
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#include "linuxdeviceprocess.h"
#include <utils/environment.h>
#include <utils/qtcprocess.h>
namespace RemoteLinux {
static QString quote(const QString &s) { return Utils::QtcProcess::quoteArgUnix(s); }
LinuxDeviceProcess::LinuxDeviceProcess(const QSharedPointer<const ProjectExplorer::IDevice> &device,
QObject *parent)
: ProjectExplorer::SshDeviceProcess(device, parent)
{
setEnvironment(Utils::Environment(Utils::OsTypeLinux));
}
void LinuxDeviceProcess::setRcFilesToSource(const QStringList &filePaths)
{
m_rcFilesToSource = filePaths;
}
void LinuxDeviceProcess::setWorkingDirectory(const QString &directory)
{
m_workingDir = directory;
}
QString LinuxDeviceProcess::fullCommandLine() const
{
QString fullCommandLine;
foreach (const QString &filePath, rcFilesToSource())
fullCommandLine += QString::fromLatin1("test -f %1 && source %1;").arg(filePath);
if (!m_workingDir.isEmpty()) {
fullCommandLine.append(QLatin1String("cd ")).append(quote(m_workingDir))
.append(QLatin1String(" && "));
}
const QString envString = environment().toStringList().join(QLatin1String(" "));
if (!envString.isEmpty())
fullCommandLine.append(QLatin1Char(' ')).append(envString);
if (!fullCommandLine.isEmpty())
fullCommandLine += QLatin1Char(' ');
fullCommandLine.append(quote(executable()));
if (!arguments().isEmpty()) {
fullCommandLine.append(QLatin1Char(' '));
fullCommandLine.append(Utils::QtcProcess::joinArgsUnix(arguments()));
}
return fullCommandLine;
}
QStringList LinuxDeviceProcess::rcFilesToSource() const
{
if (!m_rcFilesToSource.isEmpty())
return m_rcFilesToSource;
return QStringList() << QLatin1String("/etc/profile") << QLatin1String("$HOME/.profile");
}
} // namespace RemoteLinux