ba6952b28d
Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
191 lines
5.3 KiB
C++
191 lines
5.3 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/
|
|
**
|
|
** This file is part of the tools applications of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:LGPL$
|
|
** GNU Lesser General Public License Usage
|
|
** This file may be used under the terms of the GNU Lesser General Public
|
|
** License version 2.1 as published by the Free Software Foundation and
|
|
** appearing in the file LICENSE.LGPL included in the packaging of this
|
|
** file. Please review the following information to ensure the GNU Lesser
|
|
** General Public License version 2.1 requirements will be met:
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Nokia gives you certain additional
|
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU General
|
|
** Public License version 3.0 as published by the Free Software Foundation
|
|
** and appearing in the file LICENSE.GPL included in the packaging of this
|
|
** file. Please review the following information to ensure the GNU General
|
|
** Public License version 3.0 requirements will be met:
|
|
** http://www.gnu.org/copyleft/gpl.html.
|
|
**
|
|
** Other Usage
|
|
** Alternatively, this file may be used in accordance with the terms and
|
|
** conditions contained in a signed written agreement between you and Nokia.
|
|
**
|
|
**
|
|
**
|
|
**
|
|
**
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <qmap.h>
|
|
#include <qstring.h>
|
|
#include <qstringlist.h>
|
|
#include <qlist.h>
|
|
#include <qtextstream.h>
|
|
#include <qdir.h>
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
class MakeItem;
|
|
|
|
class Configure
|
|
{
|
|
public:
|
|
Configure( int& argc, char** argv );
|
|
~Configure();
|
|
|
|
void parseCmdLine();
|
|
#if !defined(EVAL)
|
|
void validateArgs();
|
|
#endif
|
|
bool displayHelp();
|
|
|
|
QString defaultTo(const QString &option);
|
|
bool checkAvailability(const QString &part);
|
|
void autoDetection();
|
|
bool verifyConfiguration();
|
|
|
|
void generateOutputVars();
|
|
#if !defined(EVAL)
|
|
void generateHeaders();
|
|
void generateBuildKey();
|
|
void generateCachefile();
|
|
void displayConfig();
|
|
void buildQmake();
|
|
void buildHostTools();
|
|
#endif
|
|
void generateMakefiles();
|
|
void appendMakeItem(int inList, const QString &item);
|
|
#if !defined(EVAL)
|
|
bool copySpec(const char *name, const char *pfx, const QString &spec);
|
|
void generateConfigfiles();
|
|
void detectArch();
|
|
void generateQConfigPri();
|
|
#endif
|
|
void showSummary();
|
|
void findProjects( const QString& dirName );
|
|
QString firstLicensePath();
|
|
|
|
#if !defined(EVAL)
|
|
bool showLicense(QString licenseFile);
|
|
void readLicense();
|
|
#endif
|
|
|
|
QString addDefine(QString def);
|
|
|
|
enum ProjectType {
|
|
App,
|
|
Lib,
|
|
Subdirs
|
|
};
|
|
|
|
ProjectType projectType( const QString& proFileName );
|
|
bool isDone();
|
|
bool isOk();
|
|
private:
|
|
// Our variable dictionaries
|
|
QMap<QString,QString> dictionary;
|
|
QStringList licensedModules;
|
|
QStringList allSqlDrivers;
|
|
QStringList allConfigs;
|
|
QStringList disabledModules;
|
|
QStringList enabledModules;
|
|
QStringList modules;
|
|
QStringList disabledBuildParts;
|
|
// QStringList sqlDrivers;
|
|
QStringList configCmdLine;
|
|
QStringList qmakeConfig;
|
|
QStringList qtConfig;
|
|
|
|
QStringList qmakeSql;
|
|
QStringList qmakeSqlPlugins;
|
|
|
|
QStringList qmakeStyles;
|
|
QStringList qmakeStylePlugins;
|
|
|
|
QStringList qmakeVars;
|
|
QStringList qmakeDefines;
|
|
// makeList[0] for qt and qtmain
|
|
// makeList[1] for subdirs and libs
|
|
// makeList[2] for the rest
|
|
QList<MakeItem*> makeList[3];
|
|
QStringList qmakeIncludes;
|
|
QStringList qmakeLibs;
|
|
QString opensslLibs;
|
|
QString psqlLibs;
|
|
QString sybase;
|
|
QString sybaseLibs;
|
|
|
|
QMap<QString,QString> licenseInfo;
|
|
QString outputLine;
|
|
|
|
QTextStream outStream;
|
|
QString sourcePath, buildPath;
|
|
QDir sourceDir, buildDir;
|
|
|
|
// Variables for usage output
|
|
int optionIndent;
|
|
int descIndent;
|
|
int outputWidth;
|
|
|
|
bool useUnixSeparators;
|
|
QString fixSeparators(const QString &somePath, bool escape = false);
|
|
QString escapeSeparators(const QString &somePath);
|
|
bool filesDiffer(const QString &file1, const QString &file2);
|
|
|
|
bool findFile(const QString &fileName);
|
|
static QString findFileInPaths(const QString &fileName, const QString &paths);
|
|
#if !defined(EVAL)
|
|
void reloadCmdLine();
|
|
void saveCmdLine();
|
|
#endif
|
|
|
|
void desc(const char *description, int startingAt = 0, int wrapIndent = 0);
|
|
void desc(const char *option, const char *description, bool skipIndent = false, char fillChar = '.');
|
|
void desc(const char *mark_option, const char *mark, const char *option, const char *description, char fillChar = '.');
|
|
void applySpecSpecifics();
|
|
static QString locateFile(const QString &fileName);
|
|
static QString locateFileInPaths(const QString &fileName, const QStringList &paths);
|
|
};
|
|
|
|
class MakeItem
|
|
{
|
|
public:
|
|
MakeItem( const QString &d, const QString &p, const QString &t, Configure::ProjectType qt )
|
|
: directory( d ),
|
|
proFile( p ),
|
|
target( t ),
|
|
qmakeTemplate( qt )
|
|
{ }
|
|
|
|
QString directory;
|
|
QString proFile;
|
|
QString target;
|
|
Configure::ProjectType qmakeTemplate;
|
|
};
|
|
|
|
|
|
QT_END_NAMESPACE
|