qt5base-lts/tools/configure/main.cpp
Oswald Buddenhagen 23ee57c5e9 move detectArch() call right after autoDetection()
it belongs there (technically, it would not hurt to actually call it
from within autoDetection()).

Task-number: QTBUG-31095
Change-Id: I7eb53762513eb9cebfd22317c8f44fe123eb91dd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-05-22 21:18:02 +02:00

128 lines
3.7 KiB
C++

/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the tools applications of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** 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 Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, 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, Digia gives you certain additional
** rights. These rights are described in the Digia 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.
**
**
** $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();
app.validateArgs();
if (!app.isOk())
return 3;
if( app.displayHelp() )
return 1;
// 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;
// Prepare the config test build directory.
app.prepareConfigTests();
if (!app.isOk())
return 3;
// Auto-detect modules and settings.
app.autoDetection();
// ... and the CPU architectures.
app.detectArch();
// After reading all command-line arguments, and doing all the
// auto-detection, it's time to do some last minute validation.
// If the validation fails, we cannot continue.
if (!app.verifyConfiguration())
return 3;
app.generateOutputVars();
if( !app.isDone() )
app.generateCachefile();
if( !app.isDone() )
app.generateConfigfiles();
if (!app.isDone())
app.generateQConfigPri();
if (!app.isDone())
app.displayConfig();
if( !app.isDone() )
app.generateMakefiles();
if( !app.isDone() )
app.showSummary();
if( !app.isOk() )
return 2;
return 0;
}
QT_END_NAMESPACE
int main( int argc, char** argv )
{
QT_USE_NAMESPACE
return runConfigure(argc, argv);
}