From 3ad90ea8f629552e6fa35d94600352d9cf924c8b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 29 Oct 2012 17:25:30 +0100 Subject: Generate a proper static QtBootstrap module Making a properly installed libQtBootstrap simplifies our tools build process a little and in addition allows other comand line tools to use the bootstrap lib and link against it. Initial-version-by: Lars Knoll Change-Id: Iddf4568a5505bc24898ec1abf7e7022e19f0a454 Reviewed-by: Joerg Bornemann --- src/tools/bootstrap/bootstrap.pri | 65 --------------------------------- src/tools/bootstrap/bootstrap.pro | 37 +++++++++++-------- src/tools/moc/moc.pro | 16 ++++---- src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 5 ++- src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 3 +- src/tools/qdoc/qdoc.pro | 3 +- src/tools/rcc/rcc.pro | 4 +- src/tools/uic/uic.pro | 5 +-- 8 files changed, 39 insertions(+), 99 deletions(-) delete mode 100644 src/tools/bootstrap/bootstrap.pri (limited to 'src') diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri deleted file mode 100644 index 2b64b291b9..0000000000 --- a/src/tools/bootstrap/bootstrap.pri +++ /dev/null @@ -1,65 +0,0 @@ -CONFIG += console qtinc -CONFIG -= qt -!build_pass:contains(QT_CONFIG, build_all):CONFIG += release -CONFIG -= app_bundle -CONFIG += exceptions_off - -DEFINES += \ - QT_BOOTSTRAPPED \ - QT_LITE_UNICODE \ - QT_NO_CAST_FROM_ASCII \ - QT_NO_CAST_TO_ASCII \ - QT_NO_CODECS \ - QT_NO_DATASTREAM \ - QT_NO_LIBRARY \ - QT_NO_QOBJECT \ - QT_NO_SYSTEMLOCALE \ - QT_NO_THREAD \ - QT_NO_UNICODETABLES \ - QT_NO_USING_NAMESPACE \ - QT_NO_DEPRECATED - -INCLUDEPATH += $$QT_BUILD_TREE/include \ - $$QT_BUILD_TREE/include/QtCore \ - $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION \ - $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION/QtCore -DEPENDPATH += $$INCLUDEPATH \ - $$QT_SOURCE_TREE/src/corelib/global \ - $$QT_SOURCE_TREE/src/corelib/kernel \ - $$QT_SOURCE_TREE/src/corelib/tools \ - $$QT_SOURCE_TREE/src/corelib/io \ - $$QT_SOURCE_TREE/src/corelib/codecs - -hpux-acc*|hpuxi-acc* { - LIBS += $$QT_BUILD_TREE/src/tools/bootstrap/libbootstrap.a -} else { - contains(CONFIG, debug_and_release_target) { - CONFIG(debug, debug|release) { - QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap/debug - } else { - QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap/release - } - } else { - QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap - } - LIBS += -lbootstrap -} -!contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile { - include($$PWD/../../3rdparty/zlib_dependency.pri) -} -win32:LIBS += -luser32 -lole32 -ladvapi32 - -mac { - CONFIG -= incremental - LIBS += -framework CoreServices -} - -# Make dummy "sis" and "freeze" target to keep recursive "make sis/freeze" working. -sis_target.target = sis -sis_target.commands = -sis_target.depends = first -QMAKE_EXTRA_TARGETS += sis_target -freeze_target.target = freeze -freeze_target.commands = -freeze_target.depends = first -QMAKE_EXTRA_TARGETS += freeze_target diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 07c4a10573..924d1406b1 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -1,18 +1,12 @@ option(host_build) -TEMPLATE = lib -TARGET = bootstrap -CONFIG += static -CONFIG += console qtinc -CONFIG -= qt -CONFIG += exceptions_off -!build_pass:contains(QT_CONFIG, build_all):CONFIG += release -mac:CONFIG -= app_bundle incremental +TARGET = QtBootstrap +QT = +CONFIG += no_module_headers internal_module -DEFINES += \ +MODULE_DEFINES = \ QT_BOOTSTRAPPED \ QT_LITE_UNICODE \ - QT_NO_CAST_FROM_ASCII \ QT_NO_CAST_TO_ASCII \ QT_NO_CODECS \ QT_NO_DATASTREAM \ @@ -25,11 +19,22 @@ DEFINES += \ QT_NO_DEPRECATED \ QT_QMAKE_LOCATION=\\\"$$QMAKE_QMAKE\\\" -INCLUDEPATH += $$QT_BUILD_TREE/include \ - $$QT_BUILD_TREE/include/QtCore \ - $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION \ - $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION/QtCore \ - $$QT_BUILD_TREE/src/corelib/global +DEFINES += \ + $$MODULE_DEFINES \ + QT_NO_CAST_FROM_ASCII + +MODULE_CONFIG = console -app_bundle release +MODULE_PRIVATE_INCLUDES = \ + \$\$QT_MODULE_INCLUDE_BASE \ + \$\$QT_MODULE_INCLUDE_BASE/QtCore \ + \$\$QT_MODULE_INCLUDE_BASE/QtCore/$$QT_VERSION \ + \$\$QT_MODULE_INCLUDE_BASE/QtCore/$$QT_VERSION/QtCore + +qtProcessModuleFlags(CONFIG, MODULE_CONFIG) + +load(qt_module) + +INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global DEPENDPATH += $$INCLUDEPATH \ ../../corelib/global \ @@ -119,6 +124,8 @@ macx: { if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri) else:include(../../3rdparty/zlib_dependency.pri) +win32:LIBS += -luser32 -lole32 -ladvapi32 + lib.CONFIG = dummy_install INSTALLS += lib diff --git a/src/tools/moc/moc.pro b/src/tools/moc/moc.pro index 8b53578e23..c83f5f6f15 100644 --- a/src/tools/moc/moc.pro +++ b/src/tools/moc/moc.pro @@ -1,18 +1,16 @@ option(host_build) -TEMPLATE = app -TARGET = moc +TEMPLATE = app +TARGET = moc +QT = bootstrap-private -DEFINES += QT_MOC QT_NO_CAST_FROM_BYTEARRAY QT_NO_COMPRESS -DESTDIR = ../../../bin -INCLUDEPATH += $$OUT_PWD/../../corelib/global -DEPENDPATH += $$OUT_PWD/../../corelib/global -LIBS = -OBJECTS_DIR = . +DEFINES += QT_MOC QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_BYTEARRAY QT_NO_COMPRESS +DESTDIR = ../../../bin + +INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global include(moc.pri) HEADERS += qdatetime_p.h SOURCES += main.cpp -include(../bootstrap/bootstrap.pri) target.path = $$[QT_HOST_BINS] INSTALLS += target diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro index 0fee3efbe4..00328dfbc0 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro @@ -1,11 +1,14 @@ option(host_build) TEMPLATE = app TARGET = qdbuscpp2xml +QT = bootstrap-private DESTDIR = ../../../bin include(../moc/moc.pri) +DEFINES += QT_NO_CAST_FROM_ASCII + INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtDBus \ $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION \ @@ -26,8 +29,6 @@ SOURCES += qdbuscpp2xml.cpp \ $$QT_SOURCE_TREE/src/dbus/qdbus_symbols.cpp \ $$QT_SOURCE_TREE/src/dbus/qdbusunixfiledescriptor.cpp -include(../bootstrap/bootstrap.pri) - target.path = $$[QT_HOST_BINS] INSTALLS += target load(qt_targets) diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro index 1d5c4d2fc3..01f43c4d8a 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro @@ -1,10 +1,11 @@ option(host_build) TEMPLATE = app TARGET = qdbusxml2cpp +QT = bootstrap-private DESTDIR = ../../../bin -include(../bootstrap/bootstrap.pri) +DEFINES += QT_NO_CAST_FROM_ASCII INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtDBus \ diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro index 0c3521c5d7..2cd51e796c 100644 --- a/src/tools/qdoc/qdoc.pro +++ b/src/tools/qdoc/qdoc.pro @@ -1,12 +1,11 @@ option(host_build) TEMPLATE = app TARGET = qdoc +QT = bootstrap-private DESTDIR = ../../../bin DEFINES += QDOC2_COMPAT -include(../bootstrap/bootstrap.pri) -DEFINES -= QT_NO_CAST_FROM_ASCII DEFINES += QT_NO_TRANSLATION INCLUDEPATH += $$QT_SOURCE_TREE/src/tools/qdoc \ diff --git a/src/tools/rcc/rcc.pro b/src/tools/rcc/rcc.pro index b224f98b61..1e2e57f2f9 100644 --- a/src/tools/rcc/rcc.pro +++ b/src/tools/rcc/rcc.pro @@ -1,14 +1,14 @@ option(host_build) TEMPLATE = app TARGET = rcc +QT = bootstrap-private DESTDIR = ../../../bin -DEFINES += QT_RCC +DEFINES += QT_RCC QT_NO_CAST_FROM_ASCII include(rcc.pri) HEADERS += ../../corelib/kernel/qcorecmdlineargs_p.h SOURCES += main.cpp -include(../bootstrap/bootstrap.pri) target.path = $$[QT_HOST_BINS] INSTALLS += target diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro index d481168ac2..34c3f2a33d 100644 --- a/src/tools/uic/uic.pro +++ b/src/tools/uic/uic.pro @@ -1,9 +1,10 @@ option(host_build) TEMPLATE = app TARGET = uic +QT = bootstrap-private DESTDIR = ../../../bin -DEFINES += QT_UIC +DEFINES += QT_UIC QT_NO_CAST_FROM_ASCII include(uic.pri) include(cpp/cpp.pri) @@ -19,8 +20,6 @@ SOURCES += main.cpp \ QMAKE_CXXFLAGS_RELEASE -= -O2 } -include(../bootstrap/bootstrap.pri) - target.path = $$[QT_HOST_BINS] INSTALLS += target load(qt_targets) -- cgit v1.2.3