Minor Krazy cleanup in autotools.

Change-Id: I1d955f2b2d6f6f2668156e0f211df37616cfc3e7
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2011-11-30 15:54:22 +01:00
committed by hjk
parent 653eaa2f75
commit 27211de083
6 changed files with 5 additions and 6 deletions

View File

@@ -179,7 +179,7 @@ void AutogenStep::run(QFutureInterface<bool> &interface)
{ {
AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration(); AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration();
// Check wether we need to run autogen.sh // Check whether we need to run autogen.sh
const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure")); const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure"));
const QFileInfo configureAcInfo(bc->buildDirectory() + QLatin1String("/configure.ac")); const QFileInfo configureAcInfo(bc->buildDirectory() + QLatin1String("/configure.ac"));
const QFileInfo makefileAmInfo(bc->buildDirectory() + QLatin1String("/Makefile.am")); const QFileInfo makefileAmInfo(bc->buildDirectory() + QLatin1String("/Makefile.am"));

View File

@@ -178,7 +178,7 @@ void AutoreconfStep::run(QFutureInterface<bool> &interface)
{ {
AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration(); AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration();
// Check wether we need to run autoreconf // Check whether we need to run autoreconf
const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure")); const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure"));
if (!configureInfo.exists()) if (!configureInfo.exists())

View File

@@ -37,7 +37,6 @@
#include "autotoolsproject.h" #include "autotoolsproject.h"
#include "autotoolstarget.h" #include "autotoolstarget.h"
#include "autotoolsprojectconstants.h" #include "autotoolsprojectconstants.h"
#include "makestep.h"
#include "autogenstep.h" #include "autogenstep.h"
#include "autoreconfstep.h" #include "autoreconfstep.h"
#include "configurestep.h" #include "configurestep.h"

View File

@@ -179,7 +179,7 @@ void ConfigureStep::run(QFutureInterface<bool>& interface)
{ {
AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration(); AutotoolsBuildConfiguration *bc = autotoolsBuildConfiguration();
//Check wether we need to run configure //Check whether we need to run configure
const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure")); const QFileInfo configureInfo(bc->buildDirectory() + QLatin1String("/configure"));
const QFileInfo configStatusInfo(bc->buildDirectory() + QLatin1String("/config.status")); const QFileInfo configStatusInfo(bc->buildDirectory() + QLatin1String("/config.status"));

View File

@@ -136,7 +136,7 @@ MakefileParser::TopTarget MakefileParser::topTarget() const
const QString line = m_line.simplified(); const QString line = m_line.simplified();
if (!line.isEmpty() && !line.startsWith(QChar('#'))) { if (!line.isEmpty() && !line.startsWith(QChar('#'))) {
// TODO: Check how many fixed strings like AM_DEFAULT_SOURCE_EXT will // TODO: Check how many fixed strings like AM_DEFAULT_SOURCE_EXT will
// be needed vs. variable strings like _SOURCES. Dependend on this a // be needed vs. variable strings like _SOURCES. Dependent on this a
// more clever way than this (expensive) if-cascading might be done. // more clever way than this (expensive) if-cascading might be done.
if (line.startsWith(QLatin1String("AM_DEFAULT_SOURCE_EXT ="))) if (line.startsWith(QLatin1String("AM_DEFAULT_SOURCE_EXT =")))
topTarget = AmDefaultSourceExt; topTarget = AmDefaultSourceExt;

View File

@@ -90,7 +90,7 @@ public:
QStringList includePaths() const; QStringList includePaths() const;
/** /**
* @return True, if an error occured during the parsing. Should be invoked, * @return True, if an error occurred during the parsing. Should be invoked,
* after the signal finished() has been emitted. * after the signal finished() has been emitted.
*/ */
bool hasError() const; bool hasError() const;