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

melt src/tools/tools.pro into src/src.pro

Browse Source 
this is done mainly to resolve spurious dependencies, in preparation
for making some tools not bootstrapped in native builds.

as a nice side effect, there is even more parallelization possible now.

Change-Id: I779cf0059c98c65aba8510bf3d24fdab4eeaa863
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-03-08 20:31:05 +01:00 committed by The Qt Project
parent 0d505b983a
commit 29daf4ddf9
2 changed files with 34 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/src.pro
View File

@ -1,7 +1,31 @@
TEMPLATE = subdirs TEMPLATE = subdirs
src_tools.subdir = $$PWD/tools src_tools_bootstrap.subdir = tools/bootstrap
src_tools.target = sub-tools src_tools_bootstrap.target = sub-bootstrap
src_tools_moc.subdir = tools/moc
src_tools_moc.target = sub-moc
src_tools_moc.depends = src_tools_bootstrap
src_tools_rcc.subdir = tools/rcc
src_tools_rcc.target = sub-rcc
src_tools_rcc.depends = src_tools_bootstrap
src_tools_uic.subdir = tools/uic
src_tools_uic.target = sub-uic
src_tools_uic.depends = src_tools_bootstrap
src_tools_qdoc.subdir = tools/qdoc
src_tools_qdoc.target = sub-qdoc
src_tools_qdoc.depends = src_tools_bootstrap
src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp
src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp
src_tools_qdbusxml2cpp.depends = src_tools_bootstrap
src_tools_qdbuscpp2xml.subdir = tools/qdbuscpp2xml
src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml
src_tools_qdbuscpp2xml.depends = src_tools_bootstrap
src_winmain.subdir = $$PWD/winmain src_winmain.subdir = $$PWD/winmain
src_winmain.target = sub-winmain src_winmain.target = sub-winmain
@ -9,7 +33,7 @@ src_winmain.depends = sub-corelib # just for the module .pri file
src_corelib.subdir = $$PWD/corelib src_corelib.subdir = $$PWD/corelib
src_corelib.target = sub-corelib src_corelib.target = sub-corelib
src_corelib.depends = src_tools src_corelib.depends = src_tools_moc src_tools_rcc
src_xml.subdir = $$PWD/xml src_xml.subdir = $$PWD/xml
src_xml.target = sub-xml src_xml.target = sub-xml
@ -48,7 +72,7 @@ src_platformsupport.depends = src_corelib src_gui src_network
src_widgets.subdir = $$PWD/widgets src_widgets.subdir = $$PWD/widgets
src_widgets.target = sub-widgets src_widgets.target = sub-widgets
src_widgets.depends = src_corelib src_gui src_widgets.depends = src_corelib src_gui src_tools_uic
src_opengl.subdir = $$PWD/opengl src_opengl.subdir = $$PWD/opengl
src_opengl.target = sub-opengl src_opengl.target = sub-opengl
@ -60,7 +84,7 @@ src_openglextensions.depends = src_gui
src_printsupport.subdir = $$PWD/printsupport src_printsupport.subdir = $$PWD/printsupport
src_printsupport.target = sub-printsupport src_printsupport.target = sub-printsupport
src_printsupport.depends = src_corelib src_gui src_widgets src_printsupport.depends = src_corelib src_gui src_widgets src_tools_uic
src_plugins.subdir = $$PWD/plugins src_plugins.subdir = $$PWD/plugins
src_plugins.target = sub-plugins src_plugins.target = sub-plugins
@ -69,12 +93,12 @@ src_plugins.depends = src_sql src_xml src_network
src_android.subdir = $$PWD/android src_android.subdir = $$PWD/android
# this order is important # this order is important
SUBDIRS += src_tools src_corelib SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_corelib
win32:SUBDIRS += src_winmain win32:SUBDIRS += src_winmain
SUBDIRS += src_network src_sql src_xml src_testlib SUBDIRS += src_network src_sql src_xml src_testlib
contains(QT_CONFIG, dbus) { contains(QT_CONFIG, dbus) {
SUBDIRS += src_dbus SUBDIRS += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
src_plugins.depends += src_dbus src_plugins.depends += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
} }
contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
!contains(QT_CONFIG, no-gui) { !contains(QT_CONFIG, no-gui) {
@ -85,7 +109,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
SUBDIRS += src_gui src_platformsupport src_openglextensions SUBDIRS += src_gui src_platformsupport src_openglextensions
src_plugins.depends += src_gui src_platformsupport src_plugins.depends += src_gui src_platformsupport
!contains(QT_CONFIG, no-widgets) { !contains(QT_CONFIG, no-widgets) {
SUBDIRS += src_widgets SUBDIRS += src_tools_uic src_widgets
src_plugins.depends += src_widgets src_plugins.depends += src_widgets
contains(QT_CONFIG, opengl(es1|es2)?) { contains(QT_CONFIG, opengl(es1|es2)?) {
SUBDIRS += src_opengl SUBDIRS += src_opengl
@ -97,7 +121,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
} }
} }
} }
SUBDIRS += src_plugins SUBDIRS += src_plugins src_tools_qdoc
nacl: SUBDIRS -= src_network src_testlib nacl: SUBDIRS -= src_network src_testlib

36
src/tools/tools.pro
View File

@ -1,36 +0,0 @@
TEMPLATE = subdirs
TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc
contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic
# Set subdir and respective target name
src_tools_bootstrap.subdir = bootstrap
src_tools_bootstrap.target = sub-tools-bootstrap
src_tools_moc.subdir = moc
src_tools_moc.target = sub-moc
src_tools_rcc.subdir = rcc
src_tools_rcc.target = sub-rcc
src_tools_uic.subdir = uic
src_tools_uic.target = sub-uic
src_tools_qdoc.subdir = qdoc
src_tools_qdoc.target = sub-qdoc
contains(QT_CONFIG, dbus) {
src_tools_qdbusxml2cpp.subdir = qdbusxml2cpp
src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp
src_tools_qdbuscpp2xml.subdir = qdbuscpp2xml
src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml
}
!ordered {
# Set dependencies for each subdir
src_tools_moc.depends = src_tools_bootstrap
src_tools_rcc.depends = src_tools_bootstrap
src_tools_uic.depends = src_tools_bootstrap
src_tools_qdoc.depends = src_tools_bootstrap
contains(QT_CONFIG, dbus) {
src_tools_qdbusxml2cpp.depends = src_tools_bootstrap
src_tools_qdbuscpp2xml.depends = src_tools_bootstrap
}
}
SUBDIRS = $$TOOLS_SUBDIRS