60e5a1c8ef
This change implements the required infrastructure to modularize the new configuration system. This requires a hierarchy of configuration files, both for handling multiple repositories and for individual modules inside the same repository. When configuring, they all need to get loaded first, as command line processing needs to know about all possible command line options. When the command line has been processed, the individual configuration files need to get processed one after the other and independently from each other. Configure is now automatically invoked when building the a project tree's "root" project; this works with both modular and top-level builds of Qt (the latter with an according change in the super repo). As an immediate consequence, the -skip option moves to the super repo with a different implementation, as configuration is now done after the repo list is determined. The option belongs there anyway. This commit also adds an optional testDir entry to the json file. Like this, we can still have all configure tests in qtbase/config.tests and the configuration file in, e.g., corelib can reference those. The files section can now be left out as long as a 'module' entry is present, specifying the module name. The names of the files to generate can then be deduced from that name. We still need to be able to specify names directly for the global configuration files. qtConfig() now also queries features which are module-specific. As it is sometimes necessary to query the configuration of modules which should not be actually linked (and cannot in the case of subdirs projects), the new variable QT_FOR_CONFIG which allows specifying configuration-only dependencies is introduced. Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Change-Id: Id1b518a3aa34044748b87fb8fac14d79653f6b18 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
93 lines
2.5 KiB
C++
93 lines
2.5 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the tools applications of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
/*
|
|
** Configure tool
|
|
**
|
|
*/
|
|
|
|
#include "configureapp.h"
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
int runConfigure( int argc, char** argv )
|
|
{
|
|
Configure app( argc, argv );
|
|
if (!app.isOk())
|
|
return 3;
|
|
|
|
app.parseCmdLine();
|
|
if (!app.isOk())
|
|
return 3;
|
|
|
|
// Read license now, and exit if it doesn't pass.
|
|
// This lets the user see the command-line options of configure
|
|
// without having to load and parse the license file.
|
|
app.readLicense();
|
|
if (!app.isOk())
|
|
return 3;
|
|
|
|
// Source file with path settings. Needed by qmake.
|
|
app.generateQConfigCpp();
|
|
|
|
// Bootstrapped includes. Needed by qmake.
|
|
app.generateHeaders();
|
|
if (!app.isOk())
|
|
return 3;
|
|
|
|
// Bootstrap qmake. Needed by config tests.
|
|
app.buildQmake();
|
|
if (!app.isOk())
|
|
return 3;
|
|
|
|
// Generate qdevice.pri
|
|
app.generateQDevicePri();
|
|
if (!app.isOk())
|
|
return 3;
|
|
|
|
// Prepare the config test build directory.
|
|
app.prepareConfigTests();
|
|
if (!app.isOk())
|
|
return 3;
|
|
|
|
// run qmake based configure
|
|
app.configure();
|
|
if (!app.isOk())
|
|
return 3;
|
|
|
|
return 0;
|
|
}
|
|
|
|
QT_END_NAMESPACE
|
|
|
|
int main( int argc, char** argv )
|
|
{
|
|
QT_USE_NAMESPACE
|
|
return runConfigure(argc, argv);
|
|
}
|