Commit 4154f815 authored by Pawel Polanski's avatar Pawel Polanski Committed by Paweł Polański

Publish to OVi: Freeze performed only for dynamic libs

An extra effort is added when one of the
projects is a dll project. Then additional
cleans, freezes and builds are started

Change-Id: Ice8fe7e9c3f9e236f816c11b0cfdb0a98b396056
Reviewed-on: http://codereview.qt.nokia.com/114Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
Reviewed-by: default avatarPaweł Polański <jaggernod@gmail.com>
parent 0d612fc5
......@@ -167,24 +167,25 @@ void S60PublisherOvi::completeCreation()
m_publishSteps.append(new S60CommandPublishStep(*m_qt4bc,
makepp->effectiveCommand() + ' ' + makepp->arguments(),
tr("Build")));
const QString freezeArg = QLatin1String("freeze-") + makepp->arguments();
m_publishSteps.append(new S60CommandPublishStep(*m_qt4bc,
makepp->effectiveCommand() + ' ' + freezeArg,
tr("Freeze")));
m_publishSteps.append(new S60CommandPublishStep(*m_qt4bc,
makepp->effectiveCommand() + ' ' + QLatin1String("clean -w"),
tr("Secondary Clean"),
false));
m_publishSteps.append(new S60CommandPublishStep(*m_qt4bc,
qmakepp->effectiveCommand() + ' ' + qmakepp->arguments(),
tr("Secondary QMake")));
m_publishSteps.append(new S60CommandPublishStep(*m_qt4bc,
makepp->effectiveCommand() + ' ' + makepp->arguments(),
tr("Secondary Build")));
if (isDynamicLibrary(*m_qt4project)) {
const QString freezeArg = QLatin1String("freeze-") + makepp->arguments();
m_publishSteps.append(new S60CommandPublishStep(*m_qt4bc,
makepp->effectiveCommand() + ' ' + freezeArg,
tr("Freeze")));
m_publishSteps.append(new S60CommandPublishStep(*m_qt4bc,
makepp->effectiveCommand() + ' ' + QLatin1String("clean -w"),
tr("Secondary Clean"),
false));
m_publishSteps.append(new S60CommandPublishStep(*m_qt4bc,
qmakepp->effectiveCommand() + ' ' + qmakepp->arguments(),
tr("Secondary QMake")));
m_publishSteps.append(new S60CommandPublishStep(*m_qt4bc,
makepp->effectiveCommand() + ' ' + makepp->arguments(),
tr("Secondary Build")));
}
QString signArg = QLatin1String("unsigned_installer_sis");
if (m_qt4bc->qtVersion()->qtVersion() == QtSupport::QtVersionNumber(4,6,3) )
......@@ -212,6 +213,17 @@ void S60PublisherOvi::completeCreation()
}
}
bool S60PublisherOvi::isDynamicLibrary(const Qt4Project &project) const
{
Qt4ProFileNode *proFile = project.rootProjectNode();
if (proFile->projectType() == LibraryTemplate) {
const QStringList &config(proFile->variableValue(ConfigVar));
if (!config.contains(QLatin1String("static")) && !config.contains(QLatin1String("staticlib")))
return true;
}
return false;
}
QString S60PublisherOvi::nameFromTarget() const
{
QString target = m_reader->value(QLatin1String("TARGET"));
......
......@@ -153,6 +153,7 @@ private:
bool runStep();
bool sisExists(QString &sisFile);
bool isDynamicLibrary(const Qt4Project &project) const;
private:
QColor m_errorColor;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment