forked from qt-creator/qt-creator
Move qmake specific part to qmake plugin, generalize android support
- Split up androiddeployqt into two steps: One building the apk, and one deploying it to the device. - The build apk step base class AndroidBuildApkStep is ihneritaged by the qmake specific class QmakeAndroidBuildApkStep. - The deployment step is still called androiddeployqt - Move all qmake specific code to the qmakeprojectmanager plguin - Flip the depencency between the android and qmake plugin, now the qmake plugin depends on the android plugin, implementing a interface the android plugin provides. - Note: This removes the debug deployment for now. Change-Id: I1c386640159ed14b637668abde8eb3b9009ab803 Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
BogDan Vatra
committed by
Daniel Teske
Daniel Teske
parent
4657ac7452
commit
64e5a543a8
238
src/plugins/android/androidbuildapkwidget.cpp
Normal file
238
src/plugins/android/androidbuildapkwidget.cpp
Normal file
@@ -0,0 +1,238 @@
|
||||
/**************************************************************************
|
||||
**
|
||||
** Copyright (c) 2014 BogDan Vatra <bog_dan_ro@yahoo.com>
|
||||
** Copyright (C) 2014 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 "androidbuildapkstep.h"
|
||||
#include "androidbuildapkwidget.h"
|
||||
#include "androidconfigurations.h"
|
||||
#include "androidcreatekeystorecertificate.h"
|
||||
#include "androidmanager.h"
|
||||
#include "ui_androidbuildapkwidget.h"
|
||||
|
||||
#include <projectexplorer/buildconfiguration.h>
|
||||
#include <projectexplorer/project.h>
|
||||
#include <projectexplorer/target.h>
|
||||
#include <qtsupport/qtkitinformation.h>
|
||||
|
||||
#include <utils/fancylineedit.h>
|
||||
#include <utils/pathchooser.h>
|
||||
|
||||
#include <QFileDialog>
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
using namespace Android;
|
||||
using namespace Internal;
|
||||
|
||||
AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step)
|
||||
: ProjectExplorer::BuildStepConfigWidget(),
|
||||
m_ui(new Ui::AndroidBuildApkWidget),
|
||||
m_step(step)
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
// Target sdk combobox
|
||||
int minApiLevel = 9;
|
||||
QStringList targets = AndroidConfig::apiLevelNamesFor(AndroidConfigurations::currentConfig().sdkTargets(minApiLevel));
|
||||
m_ui->targetSDKComboBox->addItems(targets);
|
||||
m_ui->targetSDKComboBox->setCurrentIndex(targets.indexOf(AndroidManager::buildTargetSDK(step->target())));
|
||||
|
||||
// deployment option
|
||||
switch (m_step->deployAction()) {
|
||||
case AndroidBuildApkStep::MinistroDeployment:
|
||||
m_ui->ministroOption->setChecked(true);
|
||||
break;
|
||||
case AndroidBuildApkStep::DebugDeployment:
|
||||
m_ui->temporaryQtOption->setChecked(true);
|
||||
break;
|
||||
case AndroidBuildApkStep::BundleLibrariesDeployment:
|
||||
m_ui->bundleQtOption->setChecked(true);
|
||||
break;
|
||||
default:
|
||||
// can't happen
|
||||
break;
|
||||
}
|
||||
|
||||
// signing
|
||||
m_ui->signPackageCheckBox->setChecked(m_step->signPackage());
|
||||
m_ui->KeystoreLocationPathChooser->setExpectedKind(Utils::PathChooser::File);
|
||||
m_ui->KeystoreLocationPathChooser->lineEdit()->setReadOnly(true);
|
||||
m_ui->KeystoreLocationPathChooser->setPath(m_step->keystorePath().toUserOutput());
|
||||
m_ui->KeystoreLocationPathChooser->setInitialBrowsePathBackup(QDir::homePath());
|
||||
m_ui->KeystoreLocationPathChooser->setPromptDialogFilter(tr("Keystore files (*.keystore *.jks)"));
|
||||
m_ui->KeystoreLocationPathChooser->setPromptDialogTitle(tr("Select Keystore File"));
|
||||
m_ui->signingDebugWarningIcon->hide();
|
||||
m_ui->signingDebugWarningLabel->hide();
|
||||
signPackageCheckBoxToggled(m_step->signPackage());
|
||||
|
||||
m_ui->verboseOutputCheckBox->setChecked(m_step->verboseOutput());
|
||||
m_ui->openPackageLocationCheckBox->setChecked(m_step->openPackageLocation());
|
||||
|
||||
// target sdk
|
||||
connect(m_ui->targetSDKComboBox, SIGNAL(activated(QString)), SLOT(setTargetSdk(QString)));
|
||||
|
||||
// deployment options
|
||||
connect(m_ui->ministroOption, SIGNAL(clicked()), SLOT(setMinistro()));
|
||||
connect(m_ui->temporaryQtOption, SIGNAL(clicked()), SLOT(setDeployLocalQtLibs()));
|
||||
connect(m_ui->bundleQtOption, SIGNAL(clicked()), SLOT(setBundleQtLibs()));
|
||||
|
||||
connect(m_ui->openPackageLocationCheckBox, SIGNAL(toggled(bool)),
|
||||
this, SLOT(openPackageLocationCheckBoxToggled(bool)));
|
||||
connect(m_ui->verboseOutputCheckBox, SIGNAL(toggled(bool)),
|
||||
this, SLOT(verboseOutputCheckBoxToggled(bool)));
|
||||
|
||||
//signing
|
||||
connect(m_ui->signPackageCheckBox, SIGNAL(toggled(bool)),
|
||||
this, SLOT(signPackageCheckBoxToggled(bool)));
|
||||
connect(m_ui->KeystoreCreatePushButton, SIGNAL(clicked()),
|
||||
this, SLOT(createKeyStore()));
|
||||
connect(m_ui->KeystoreLocationPathChooser, SIGNAL(pathChanged(QString)),
|
||||
SLOT(updateKeyStorePath(QString)));
|
||||
connect(m_ui->certificatesAliasComboBox, SIGNAL(activated(QString)),
|
||||
this, SLOT(certificatesAliasComboBoxActivated(QString)));
|
||||
connect(m_ui->certificatesAliasComboBox, SIGNAL(currentIndexChanged(QString)),
|
||||
this, SLOT(certificatesAliasComboBoxCurrentIndexChanged(QString)));
|
||||
|
||||
connect(m_step->buildConfiguration(), SIGNAL(buildTypeChanged()),
|
||||
this, SLOT(updateSigningWarning()));
|
||||
|
||||
updateSigningWarning();
|
||||
QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(step->target()->kit());
|
||||
m_ui->temporaryQtOption->setVisible(qt->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0));
|
||||
}
|
||||
|
||||
AndroidBuildApkWidget::~AndroidBuildApkWidget()
|
||||
{
|
||||
delete m_ui;
|
||||
}
|
||||
|
||||
QString AndroidBuildApkWidget::displayName() const
|
||||
{
|
||||
return tr("<b>Build Android APK</b>");
|
||||
}
|
||||
|
||||
QString AndroidBuildApkWidget::summaryText() const
|
||||
{
|
||||
return displayName();
|
||||
}
|
||||
|
||||
void AndroidBuildApkWidget::setTargetSdk(const QString &sdk)
|
||||
{
|
||||
m_step->setBuildTargetSdk(sdk);
|
||||
}
|
||||
|
||||
void AndroidBuildApkWidget::setMinistro()
|
||||
{
|
||||
m_step->setDeployAction(AndroidBuildApkStep::MinistroDeployment);
|
||||
}
|
||||
|
||||
void AndroidBuildApkWidget::setDeployLocalQtLibs()
|
||||
{
|
||||
m_step->setDeployAction(AndroidBuildApkStep::DebugDeployment);
|
||||
}
|
||||
|
||||
void AndroidBuildApkWidget::setBundleQtLibs()
|
||||
{
|
||||
m_step->setDeployAction(AndroidBuildApkStep::BundleLibrariesDeployment);
|
||||
}
|
||||
|
||||
void AndroidBuildApkWidget::signPackageCheckBoxToggled(bool checked)
|
||||
{
|
||||
m_ui->certificatesAliasComboBox->setEnabled(checked);
|
||||
m_step->setSignPackage(checked);
|
||||
updateSigningWarning();
|
||||
if (!checked)
|
||||
return;
|
||||
if (!m_step->keystorePath().isEmpty())
|
||||
setCertificates();
|
||||
}
|
||||
|
||||
void AndroidBuildApkWidget::createKeyStore()
|
||||
{
|
||||
AndroidCreateKeystoreCertificate d;
|
||||
if (d.exec() != QDialog::Accepted)
|
||||
return;
|
||||
m_ui->KeystoreLocationPathChooser->setPath(d.keystoreFilePath().toUserOutput());
|
||||
m_step->setKeystorePath(d.keystoreFilePath());
|
||||
m_step->setKeystorePassword(d.keystorePassword());
|
||||
m_step->setCertificateAlias(d.certificateAlias());
|
||||
m_step->setCertificatePassword(d.certificatePassword());
|
||||
setCertificates();
|
||||
}
|
||||
|
||||
void AndroidBuildApkWidget::setCertificates()
|
||||
{
|
||||
QAbstractItemModel *certificates = m_step->keystoreCertificates();
|
||||
m_ui->signPackageCheckBox->setChecked(certificates);
|
||||
m_ui->certificatesAliasComboBox->setModel(certificates);
|
||||
}
|
||||
|
||||
void AndroidBuildApkWidget::updateKeyStorePath(const QString &path)
|
||||
{
|
||||
Utils::FileName file = Utils::FileName::fromString(path);
|
||||
m_step->setKeystorePath(file);
|
||||
m_ui->signPackageCheckBox->setChecked(!file.isEmpty());
|
||||
if (!file.isEmpty())
|
||||
setCertificates();
|
||||
}
|
||||
|
||||
void AndroidBuildApkWidget::certificatesAliasComboBoxActivated(const QString &alias)
|
||||
{
|
||||
if (alias.length())
|
||||
m_step->setCertificateAlias(alias);
|
||||
}
|
||||
|
||||
void AndroidBuildApkWidget::certificatesAliasComboBoxCurrentIndexChanged(const QString &alias)
|
||||
{
|
||||
if (alias.length())
|
||||
m_step->setCertificateAlias(alias);
|
||||
}
|
||||
|
||||
void AndroidBuildApkWidget::openPackageLocationCheckBoxToggled(bool checked)
|
||||
{
|
||||
m_step->setOpenPackageLocation(checked);
|
||||
}
|
||||
|
||||
void AndroidBuildApkWidget::verboseOutputCheckBoxToggled(bool checked)
|
||||
{
|
||||
m_step->setVerboseOutput(checked);
|
||||
}
|
||||
|
||||
void AndroidBuildApkWidget::updateSigningWarning()
|
||||
{
|
||||
bool debug = m_step->buildConfiguration()->buildType() == ProjectExplorer::BuildConfiguration::Debug;
|
||||
if (m_step->signPackage() && debug) {
|
||||
m_ui->signingDebugWarningIcon->setVisible(true);
|
||||
m_ui->signingDebugWarningLabel->setVisible(true);
|
||||
} else {
|
||||
m_ui->signingDebugWarningIcon->setVisible(false);
|
||||
m_ui->signingDebugWarningLabel->setVisible(false);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user