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

fix misnomer: $$resolve_depends() => $$sort_depends()

Browse Source 
... and re-add a real $$resolve_depends(), just in case.

Change-Id: I489d6056546340ce95280fe7fd571e30c14470e7
Reviewed-on: http://codereview.qt.nokia.com/1455
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2011-07-11 17:17:18 +02:00 committed by Qt by Nokia
parent fc42ffa15a
commit 1aa9affcf1
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/qt.prf
View File

@ -130,7 +130,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT
# Topological ordering of modules based on their QT.<module>.depends variable # Topological ordering of modules based on their QT.<module>.depends variable
QT = $$resolve_depends(QT, "QT.") QT = $$sort_depends(QT, "QT.")
QT_DEPENDS= QT_DEPENDS=

23
qmake/project.cpp
View File

@ -81,7 +81,7 @@ enum ExpandFunc { E_MEMBER=1, E_FIRST, E_LAST, E_CAT, E_FROMFILE, E_EVAL, E_LIST
E_SPRINTF, E_JOIN, E_SPLIT, E_BASENAME, E_DIRNAME, E_SECTION, E_SPRINTF, E_JOIN, E_SPLIT, E_BASENAME, E_DIRNAME, E_SECTION,
E_FIND, E_SYSTEM, E_UNIQUE, E_QUOTE, E_ESCAPE_EXPAND, E_FIND, E_SYSTEM, E_UNIQUE, E_QUOTE, E_ESCAPE_EXPAND,
E_UPPER, E_LOWER, E_FILES, E_PROMPT, E_RE_ESCAPE, E_REPLACE, E_UPPER, E_LOWER, E_FILES, E_PROMPT, E_RE_ESCAPE, E_REPLACE,
E_SIZE, E_GENERATE_UID, E_RESOLVE_DEPENDS }; E_SIZE, E_GENERATE_UID, E_SORT_DEPENDS, E_RESOLVE_DEPENDS };
QMap<QString, ExpandFunc> qmake_expandFunctions() QMap<QString, ExpandFunc> qmake_expandFunctions()
{ {
static QMap<QString, ExpandFunc> *qmake_expand_functions = 0; static QMap<QString, ExpandFunc> *qmake_expand_functions = 0;
@ -114,6 +114,7 @@ QMap<QString, ExpandFunc> qmake_expandFunctions()
qmake_expand_functions->insert("replace", E_REPLACE); qmake_expand_functions->insert("replace", E_REPLACE);
qmake_expand_functions->insert("size", E_SIZE); qmake_expand_functions->insert("size", E_SIZE);
qmake_expand_functions->insert("generate_uid", E_GENERATE_UID); qmake_expand_functions->insert("generate_uid", E_GENERATE_UID);
qmake_expand_functions->insert("sort_depends", E_SORT_DEPENDS);
qmake_expand_functions->insert("resolve_depends", E_RESOLVE_DEPENDS); qmake_expand_functions->insert("resolve_depends", E_RESOLVE_DEPENDS);
} }
return *qmake_expand_functions; return *qmake_expand_functions;
@ -1803,32 +1804,32 @@ extern QString generate_test_uid(const QString& target);
void calculateDeps(QStringList &sortedList, const QString &item, const QString &prefix, void calculateDeps(QStringList &sortedList, const QString &item, const QString &prefix,
QStringList &org, QMap<QString, QStringList> &place) QStringList &org, bool resolve, QMap<QString, QStringList> &place)
{ {
if (sortedList.contains(item)) if (sortedList.contains(item))
return; return;
foreach(QString dep, place.value(prefix + item + ".depends")) { foreach(QString dep, place.value(prefix + item + ".depends")) {
calculateDeps(sortedList, dep, prefix, org, place); calculateDeps(sortedList, dep, prefix, org, resolve, place);
if (org.isEmpty()) if (!resolve && org.isEmpty())
break; break;
} }
if (org.contains(item)) { if (resolve || org.contains(item)) {
sortedList.prepend(item); sortedList.prepend(item);
org.removeAll(item); org.removeAll(item);
} }
} }
QStringList QStringList
QMakeProject::resolveDepends(const QStringList &deps, const QString &prefix, QMakeProject::resolveDepends(const QStringList &deps, const QString &prefix, bool resolve,
QMap<QString, QStringList> &place) QMap<QString, QStringList> &place)
{ {
QStringList sortedList; QStringList sortedList;
QStringList org = deps; QStringList org = deps;
foreach(QString item, deps) { foreach(QString item, deps) {
calculateDeps(sortedList, item, prefix, org, place); calculateDeps(sortedList, item, prefix, org, resolve, place);
if (org.isEmpty()) if (!resolve && org.isEmpty())
break; break;
} }
return sortedList; return sortedList;
@ -2280,13 +2281,15 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
ret += generate_test_uid(args.first()); ret += generate_test_uid(args.first());
} }
break; break;
case E_SORT_DEPENDS:
case E_RESOLVE_DEPENDS: { case E_RESOLVE_DEPENDS: {
if(args.count() < 1 || args.count() > 2) { if(args.count() < 1 || args.count() > 2) {
fprintf(stderr, "%s:%d: resolve_depends(var, prefix) requires one or two arguments.\n", fprintf(stderr, "%s:%d: %s(var, prefix) requires one or two arguments.\n",
parser.file.toLatin1().constData(), parser.line_no); parser.file.toLatin1().constData(), parser.line_no, func.toLatin1().constData());
} else { } else {
ret += resolveDepends(values(args[0], place), ret += resolveDepends(values(args[0], place),
(args.count() != 2 ? QString() : args[1]), (args.count() != 2 ? QString() : args[1]),
(func_t == E_RESOLVE_DEPENDS),
place); place);
} }
break; } break; }

3
qmake/project.h
View File

@ -107,7 +107,8 @@ class QMakeProject
QStringList doVariableReplaceExpand(const QString &str, QMap<QString, QStringList> &place, bool *ok=0); QStringList doVariableReplaceExpand(const QString &str, QMap<QString, QStringList> &place, bool *ok=0);
void init(QMakeProperty *, const QMap<QString, QStringList> *); void init(QMakeProperty *, const QMap<QString, QStringList> *);
QStringList &values(const QString &v, QMap<QString, QStringList> &place); QStringList &values(const QString &v, QMap<QString, QStringList> &place);
QStringList resolveDepends(const QStringList &deps, const QString &prefix, QMap<QString, QStringList> &place); QStringList resolveDepends(const QStringList &deps, const QString &prefix, bool resolve,
QMap<QString, QStringList> &place);
void validateModes(); void validateModes();
public: public: