1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make resolution of default spec less inefficient

Browse Source 
resolve only once, in particular on unix.

Change-Id: I090698fc6029322a3a16d179d461af3e8336f6ad
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-02-01 22:25:04 +01:00 committed by Qt by Nokia
parent 3cf6521f54
commit a0da58b5dd
2 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
qmake/project.cpp
View File

@ -1512,6 +1512,33 @@ void QMakeProject::validateModes()
} }
} }
void
QMakeProject::resolveSpec(QString *spec, const QString &qmakespec)
{
if (spec->isEmpty()) {
*spec = QFileInfo(qmakespec).fileName();
if (*spec == "default") {
#ifdef Q_OS_UNIX
char buffer[1024];
int l = readlink(qmakespec.toLatin1(), buffer, 1023);
if (l != -1) {
buffer[l] = '\0';
*spec = QString::fromLatin1(buffer);
#else
// We can't resolve symlinks as they do on Unix, so configure.exe puts the source of the
// qmake.conf at the end of the default/qmake.conf in the QMAKESPEC_ORG variable.
const QStringList &spec_org = base_vars["QMAKESPEC_ORIGINAL"];
if (!spec_org.isEmpty()) {
*spec = spec_org.at(0);
#endif
int lastSlash = spec->lastIndexOf(QLatin1Char('/'));
if (lastSlash != -1)
spec->remove(lastSlash + 1);
}
}
}
}
bool bool
QMakeProject::isActiveConfig(const QString &x, bool regex, QHash<QString, QStringList> *place) QMakeProject::isActiveConfig(const QString &x, bool regex, QHash<QString, QStringList> *place)
{ {
@ -1538,44 +1565,10 @@ QMakeProject::isActiveConfig(const QString &x, bool regex, QHash<QString, QStrin
//mkspecs //mkspecs
static QString spec; static QString spec;
if(spec.isEmpty()) resolveSpec(&spec, Option::mkfile::qmakespec);
spec = QFileInfo(Option::mkfile::qmakespec).fileName();
QRegExp re(x, Qt::CaseSensitive, QRegExp::Wildcard); QRegExp re(x, Qt::CaseSensitive, QRegExp::Wildcard);
if((regex && re.exactMatch(spec)) || (!regex && spec == x)) if((regex && re.exactMatch(spec)) || (!regex && spec == x))
return true; return true;
#ifdef Q_OS_UNIX
else if(spec == "default") {
static char *buffer = NULL;
if(!buffer) {
buffer = (char *)malloc(1024);
qmakeAddCacheClear(qmakeFreeCacheClear, (void**)&buffer);
}
int l = readlink(Option::mkfile::qmakespec.toLatin1(), buffer, 1024);
if(l != -1) {
buffer[l] = '\0';
QString r = buffer;
if(r.lastIndexOf('/') != -1)
r = r.mid(r.lastIndexOf('/') + 1);
if((regex && re.exactMatch(r)) || (!regex && r == x))
return true;
}
}
#elif defined(Q_OS_WIN)
else if(spec == "default") {
// We can't resolve symlinks as they do on Unix, so configure.exe puts the source of the
// qmake.conf at the end of the default/qmake.conf in the QMAKESPEC_ORG variable.
const QStringList &spec_org = (place ? (*place)["QMAKESPEC_ORIGINAL"]
: vars["QMAKESPEC_ORIGINAL"]);
if (!spec_org.isEmpty()) {
spec = spec_org.at(0);
int lastSlash = spec.lastIndexOf('/');
if(lastSlash != -1)
spec = spec.mid(lastSlash + 1);
if((regex && re.exactMatch(spec)) || (!regex && spec == x))
return true;
}
}
#endif
//simple matching //simple matching
const QStringList &configs = (place ? (*place)["CONFIG"] : vars["CONFIG"]); const QStringList &configs = (place ? (*place)["CONFIG"] : vars["CONFIG"]);

1
qmake/project.h
View File

@ -108,6 +108,7 @@ class QMakeProject
void init(QMakeProperty *, const QHash<QString, QStringList> *); void init(QMakeProperty *, const QHash<QString, QStringList> *);
QStringList &values(const QString &v, QHash<QString, QStringList> &place); QStringList &values(const QString &v, QHash<QString, QStringList> &place);
void validateModes(); void validateModes();
void resolveSpec(QString *spec, const QString &qmakespec);
public: public:
QMakeProject() { init(0, 0); } QMakeProject() { init(0, 0); }