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

revamp handling of qmake target mode

Browse Source 
the project evaluator becomes oblivious of the target mode.
the mode is set up in spec_post.prf according to the spec.
$$QMAKE_TARGET contains the feature suffixes to search, and is also
contained in $$CONFIG.
the target_mode variable itself becomes private to the Makefile class.

Change-Id: I3c06d9dab536b753343cec6c5c491d3203e50bd8
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
This commit is contained in:
Oswald Buddenhagen 2012-04-17 12:15:39 +02:00
parent 777fa561ab
commit 4753958db7
10 changed files with 57 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mkspecs/features/spec_post.prf Normal file
View File

@ -0,0 +1,31 @@
isEmpty(MAKEFILE_GENERATOR):error("Qmake spec does not set MAKEFILE_GENERATOR.")
isEmpty(QMAKE_PLATFORM) {
isEmpty(TARGET_PLATFORM) {
equals(MAKEFILE_GENERATOR, UNIX) {
equals(QMAKE_HOST.os, Darwin): \
TARGET_PLATFORM = macx
else: \
TARGET_PLATFORM = unix
} else:if(equals(MAKEFILE_GENERATOR, MSVC.NET) \
|equals(MAKEFILE_GENERATOR, BMAKE) \
|equals(MAKEFILE_GENERATOR, MSBUILD) \
|equals(MAKEFILE_GENERATOR, MINGW)) {
TARGET_PLATFORM = win32
} else:if(equals(MAKEFILE_GENERATOR, PROJECTBUILDER) \
|equals(MAKEFILE_GENERATOR, XCODE)) {
} else:equals(MAKEFILE_GENERATOR, GBUILD) {
TARGET_PLATFORM = unix
} else {
error("Qmake spec sets an invalid MAKEFILE_GENERATOR.")
}
}
equals(TARGET_PLATFORM, unix): \
QMAKE_PLATFORM = unix
else:equals(TARGET_PLATFORM, macx): \
QMAKE_PLATFORM = mac macx unix
else:equals(TARGET_PLATFORM, win32): \
QMAKE_PLATFORM = win32
else: \
error("Qmake spec sets an invalid TARGET_PLATFORM.")
}
CONFIG += $$QMAKE_PLATFORM

8
qmake/generators/makefile.cpp
View File

@ -300,6 +300,12 @@ MakefileGenerator::setProjectFile(QMakeProject *p)
if(project) if(project)
return; return;
project = p; project = p;
if (project->isActiveConfig("win32"))
target_mode = TARG_WIN_MODE;
else if (project->isActiveConfig("macx"))
target_mode = TARG_MACX_MODE;
else
target_mode = TARG_UNIX_MODE;
init(); init();
findLibraries(); findLibraries();
if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE && if(Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE &&
@ -3253,7 +3259,7 @@ MakefileGenerator::writePkgConfigFile()
t << "Libs: "; t << "Libs: ";
QString pkgConfiglibDir; QString pkgConfiglibDir;
QString pkgConfiglibName; QString pkgConfiglibName;
if (Option::target_mode == Option::TARG_MACX_MODE && project->isActiveConfig("lib_bundle")) { if (target_mode == TARG_MACX_MODE && project->isActiveConfig("lib_bundle")) {
pkgConfiglibDir = "-F${libdir}"; pkgConfiglibDir = "-F${libdir}";
QString bundle; QString bundle;
if (!project->isEmpty("QMAKE_FRAMEWORK_BUNDLE_NAME")) if (!project->isEmpty("QMAKE_FRAMEWORK_BUNDLE_NAME"))

2
qmake/generators/makefile.h
View File

@ -91,6 +91,8 @@ class MakefileGenerator : protected QMakeSourceFileInfo
mutable QHash<ReplaceExtraCompilerCacheKey, QString> extraCompilerVariablesCache; mutable QHash<ReplaceExtraCompilerCacheKey, QString> extraCompilerVariablesCache;
protected: protected:
enum TARG_MODE { TARG_UNIX_MODE, TARG_MACX_MODE, TARG_WIN_MODE } target_mode;
QStringList createObjectList(const QStringList &sources); QStringList createObjectList(const QStringList &sources);
//makefile style generator functions //makefile style generator functions

23
qmake/generators/metamakefile.cpp
View File

@ -514,28 +514,5 @@ MetaMakefileGenerator::createMetaGenerator(QMakeProject *proj, const QString &na
#endif // QT_QMAKE_PARSER_ONLY #endif // QT_QMAKE_PARSER_ONLY
bool
MetaMakefileGenerator::modeForGenerator(const QString &gen, Option::TARG_MODE *target_mode)
{
if (gen == "UNIX") {
#ifdef Q_OS_MAC
*target_mode = Option::TARG_MACX_MODE;
#else
*target_mode = Option::TARG_UNIX_MODE;
#endif
} else if (gen == "MSVC.NET" || gen == "BMAKE" || gen == "MSBUILD") {
*target_mode = Option::TARG_WIN_MODE;
} else if (gen == "MINGW") {
*target_mode = Option::TARG_WIN_MODE;
} else if (gen == "PROJECTBUILDER" || gen == "XCODE") {
*target_mode = Option::TARG_MACX_MODE;
} else if (gen == "GBUILD") {
*target_mode = Option::TARG_UNIX_MODE;
} else {
fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData());
return false;
}
return true;
}
QT_END_NAMESPACE QT_END_NAMESPACE

4
qmake/generators/metamakefile.h
View File

@ -42,8 +42,6 @@
#ifndef METAMAKEFILE_H #ifndef METAMAKEFILE_H
#define METAMAKEFILE_H #define METAMAKEFILE_H
#include <option.h>
#include <qlist.h> #include <qlist.h>
#include <qstring.h> #include <qstring.h>
@ -67,8 +65,6 @@ public:
static MetaMakefileGenerator *createMetaGenerator(QMakeProject *proj, const QString &name, bool op=true, bool *success = 0); static MetaMakefileGenerator *createMetaGenerator(QMakeProject *proj, const QString &name, bool op=true, bool *success = 0);
static MakefileGenerator *createMakefileGenerator(QMakeProject *proj, bool noIO = false); static MakefileGenerator *createMakefileGenerator(QMakeProject *proj, bool noIO = false);
static bool modeForGenerator(const QString &generator, Option::TARG_MODE *target_mode);
inline QMakeProject *projectFile() const { return project; } inline QMakeProject *projectFile() const { return project; }
virtual bool init() = 0; virtual bool init() = 0;

19
qmake/generators/unix/unixmake.cpp
View File

@ -491,9 +491,9 @@ UnixMakefileGenerator::findLibraries()
} else { } else {
stub = opt.mid(2); stub = opt.mid(2);
} }
} else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-F")) { } else if (target_mode == TARG_MACX_MODE && opt.startsWith("-F")) {
frameworkdirs.append(QMakeLocalFileName(opt.right(opt.length()-2))); frameworkdirs.append(QMakeLocalFileName(opt.right(opt.length()-2)));
} else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-framework")) { } else if (target_mode == TARG_MACX_MODE && opt.startsWith("-framework")) {
if(opt.length() > 11) { if(opt.length() > 11) {
opt = opt.mid(11); opt = opt.mid(11);
} else { } else {
@ -612,11 +612,11 @@ UnixMakefileGenerator::processPrlFiles()
break; break;
} }
} }
} else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-F")) { } else if (target_mode == TARG_MACX_MODE && opt.startsWith("-F")) {
QMakeLocalFileName f(opt.right(opt.length()-2)); QMakeLocalFileName f(opt.right(opt.length()-2));
if(!frameworkdirs.contains(f)) if(!frameworkdirs.contains(f))
frameworkdirs.append(f); frameworkdirs.append(f);
} else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-framework")) { } else if (target_mode == TARG_MACX_MODE && opt.startsWith("-framework")) {
if(opt.length() > 11) if(opt.length() > 11)
opt = opt.mid(11); opt = opt.mid(11);
else else
@ -655,7 +655,7 @@ UnixMakefileGenerator::processPrlFiles()
QString arch("default"); QString arch("default");
QString opt = l.at(lit).trimmed(); QString opt = l.at(lit).trimmed();
if(opt.startsWith("-")) { if(opt.startsWith("-")) {
if (Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-Xarch")) { if (target_mode == TARG_MACX_MODE && opt.startsWith("-Xarch")) {
if (opt.length() > 7) { if (opt.length() > 7) {
arch = opt.mid(7); arch = opt.mid(7);
opt = l.at(++lit); opt = l.at(++lit);
@ -663,7 +663,7 @@ UnixMakefileGenerator::processPrlFiles()
} }
if(opt.startsWith("-L") || if(opt.startsWith("-L") ||
(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-F"))) { (target_mode == TARG_MACX_MODE && opt.startsWith("-F"))) {
if(!lflags[arch].contains(opt)) if(!lflags[arch].contains(opt))
lflags[arch].append(opt); lflags[arch].append(opt);
} else if(opt.startsWith("-l") || opt == "-pthread") { } else if(opt.startsWith("-l") || opt == "-pthread") {
@ -671,12 +671,12 @@ UnixMakefileGenerator::processPrlFiles()
if (lflags[arch].contains(opt)) if (lflags[arch].contains(opt))
lflags[arch].removeAll(opt); lflags[arch].removeAll(opt);
lflags[arch].append(opt); lflags[arch].append(opt);
} else if(Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-framework")) { } else if (target_mode == TARG_MACX_MODE && opt.startsWith("-framework")) {
if(opt.length() > 11) if(opt.length() > 11)
opt = opt.mid(11); opt = opt.mid(11);
else { else {
opt = l.at(++lit); opt = l.at(++lit);
if (Option::target_mode == Option::TARG_MACX_MODE && opt.startsWith("-Xarch")) if (target_mode == TARG_MACX_MODE && opt.startsWith("-Xarch"))
opt = l.at(++lit); // The user has done the right thing and prefixed each part opt = l.at(++lit); // The user has done the right thing and prefixed each part
} }
bool found = false; bool found = false;
@ -838,8 +838,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
uninst.append("-$(DEL_FILE) \"" + dst_targ + "\""); uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");
if(!links.isEmpty()) { if(!links.isEmpty()) {
for(int i = 0; i < links.size(); ++i) { for(int i = 0; i < links.size(); ++i) {
if(Option::target_mode == Option::TARG_UNIX_MODE || if (target_mode == TARG_UNIX_MODE || target_mode == TARG_MACX_MODE) {
Option::target_mode == Option::TARG_MACX_MODE) {
QString link = Option::fixPathToTargetOS(destdir + links[i], false); QString link = Option::fixPathToTargetOS(destdir + links[i], false);
int lslash = link.lastIndexOf(Option::dir_sep); int lslash = link.lastIndexOf(Option::dir_sep);
if(lslash != -1) if(lslash != -1)

9
qmake/option.cpp
View File

@ -93,7 +93,6 @@ QString Option::user_template;
QString Option::user_template_prefix; QString Option::user_template_prefix;
QStringList Option::shellPath; QStringList Option::shellPath;
Option::HOST_MODE Option::host_mode = Option::HOST_UNKNOWN_MODE; Option::HOST_MODE Option::host_mode = Option::HOST_UNKNOWN_MODE;
Option::TARG_MODE Option::target_mode = Option::TARG_UNKNOWN_MODE;
//QMAKE_*_PROPERTY stuff //QMAKE_*_PROPERTY stuff
QStringList Option::prop::properties; QStringList Option::prop::properties;
@ -557,14 +556,6 @@ Option::init(int argc, char **argv)
} }
#endif #endif
} }
} else if (Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT) {
#if defined(Q_OS_MAC)
Option::target_mode = Option::TARG_MACX_MODE;
#elif defined(Q_OS_UNIX)
Option::target_mode = Option::TARG_UNIX_MODE;
#else
Option::target_mode = Option::TARG_WIN_MODE;
#endif
} }
//defaults for globals //defaults for globals

2
qmake/option.h
View File

@ -173,8 +173,6 @@ struct Option
static QStringList before_user_vars, after_user_vars; static QStringList before_user_vars, after_user_vars;
enum HOST_MODE { HOST_UNKNOWN_MODE, HOST_UNIX_MODE, HOST_WIN_MODE, HOST_MACX_MODE }; enum HOST_MODE { HOST_UNKNOWN_MODE, HOST_UNIX_MODE, HOST_WIN_MODE, HOST_MACX_MODE };
static HOST_MODE host_mode; static HOST_MODE host_mode;
enum TARG_MODE { TARG_UNKNOWN_MODE, TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE };
static TARG_MODE target_mode;
static QString user_template, user_template_prefix; static QString user_template, user_template_prefix;
static QStringList shellPath; static QStringList shellPath;

67
qmake/project.cpp
View File

@ -565,28 +565,14 @@ static void qmake_error_msg(const QString &msg)
1) features/(unix|win32|macx)/ 1) features/(unix|win32|macx)/
2) features/ 2) features/
*/ */
QStringList qmake_feature_paths(QMakeProperty *prop, bool host_build) QStringList QMakeProject::qmakeFeaturePaths()
{ {
const QString mkspecs_concat = QLatin1String("/mkspecs"); const QString mkspecs_concat = QLatin1String("/mkspecs");
const QString base_concat = QLatin1String("/features"); const QString base_concat = QLatin1String("/features");
QStringList concat; QStringList concat;
{ foreach (const QString &sfx, values("QMAKE_PLATFORM"))
switch(Option::target_mode) { concat << base_concat + QLatin1Char('/') + sfx;
case Option::TARG_MACX_MODE: //also a unix concat << base_concat;
concat << base_concat + QLatin1String("/mac");
concat << base_concat + QLatin1String("/macx");
concat << base_concat + QLatin1String("/unix");
break;
default: // Can't happen, just make the compiler shut up
case Option::TARG_UNIX_MODE:
concat << base_concat + QLatin1String("/unix");
break;
case Option::TARG_WIN_MODE:
concat << base_concat + QLatin1String("/win32");
break;
}
concat << base_concat;
}
QStringList feature_roots = splitPathList(QString::fromLocal8Bit(qgetenv("QMAKEFEATURES"))); QStringList feature_roots = splitPathList(QString::fromLocal8Bit(qgetenv("QMAKEFEATURES")));
feature_roots += cached_qmakefeatures; feature_roots += cached_qmakefeatures;
@ -1489,7 +1475,8 @@ QMakeProject::read(uchar cmd)
return false; return false;
} }
doProjectInclude("spec_post", IncludeFlagFeature, vars); doProjectInclude("spec_post", IncludeFlagFeature, vars);
validateModes(); // The spec extends the feature search path, so invalidate the cache.
invalidateFeatureRoots();
if (!conffile.isEmpty()) { if (!conffile.isEmpty()) {
debug_msg(1, "Project config file: reading %s", conffile.toLatin1().constData()); debug_msg(1, "Project config file: reading %s", conffile.toLatin1().constData());
@ -1607,34 +1594,6 @@ QMakeProject::read(uchar cmd)
return true; return true;
} }
void QMakeProject::validateModes()
{
if (Option::target_mode == Option::TARG_UNKNOWN_MODE) {
Option::TARG_MODE target_mode;
const QStringList &gen = vars.value("MAKEFILE_GENERATOR");
if (gen.isEmpty()) {
fprintf(stderr, "%s:%d: Using OS scope before setting MAKEFILE_GENERATOR\n",
parser.file.toLatin1().constData(), parser.line_no);
} else if (MetaMakefileGenerator::modeForGenerator(gen.first(), &target_mode)) {
const QStringList &tgt = vars.value("TARGET_PLATFORM");
if (!tgt.isEmpty()) {
const QString &os = tgt.first();
if (os == "unix")
Option::target_mode = Option::TARG_UNIX_MODE;
else if (os == "macx")
Option::target_mode = Option::TARG_MACX_MODE;
else if (os == "win32")
Option::target_mode = Option::TARG_WIN_MODE;
else
fprintf(stderr, "Unknown target platform specified: %s\n",
os.toLatin1().constData());
} else {
Option::target_mode = target_mode;
}
}
}
}
void void
QMakeProject::resolveSpec(QString *spec, const QString &qmakespec) QMakeProject::resolveSpec(QString *spec, const QString &qmakespec)
{ {
@ -1677,18 +1636,6 @@ QMakeProject::isActiveConfig(const QString &x, bool regex, QHash<QString, QStrin
else if(x == "false") else if(x == "false")
return false; return false;
if (x == "unix") {
validateModes();
return Option::target_mode == Option::TARG_UNIX_MODE
|| Option::target_mode == Option::TARG_MACX_MODE;
} else if (x == "macx" || x == "mac") {
validateModes();
return Option::target_mode == Option::TARG_MACX_MODE;
} else if (x == "win32") {
validateModes();
return Option::target_mode == Option::TARG_WIN_MODE;
}
if (x == "host_build") if (x == "host_build")
return host_build; return host_build;
@ -1758,7 +1705,7 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QHash<QString, QString
qmakeAddCacheClear(qmakeDeleteCacheClear<QStringList>, (void**)&feature_roots); qmakeAddCacheClear(qmakeDeleteCacheClear<QStringList>, (void**)&feature_roots);
} }
if (feature_roots->isEmpty()) if (feature_roots->isEmpty())
*feature_roots = qmake_feature_paths(prop, host_build); *feature_roots = qmakeFeaturePaths();
debug_msg(2, "Looking for feature '%s' in (%s)", file.toLatin1().constData(), debug_msg(2, "Looking for feature '%s' in (%s)", file.toLatin1().constData(),
feature_roots->join("::").toLatin1().constData()); feature_roots->join("::").toLatin1().constData());
int start_root = 0; int start_root = 0;

2
qmake/project.h
View File

@ -114,8 +114,8 @@ class QMakeProject
void init(QMakeProperty *); void init(QMakeProperty *);
void cleanup(); void cleanup();
QStringList &values(const QString &v, QHash<QString, QStringList> &place); QStringList &values(const QString &v, QHash<QString, QStringList> &place);
void validateModes();
void resolveSpec(QString *spec, const QString &qmakespec); void resolveSpec(QString *spec, const QString &qmakespec);
QStringList qmakeFeaturePaths();
public: public:
QMakeProject(QMakeProperty *p = 0) { init(p); } QMakeProject(QMakeProperty *p = 0) { init(p); }