diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-01 10:45:51 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-01 10:48:09 +0100 |
commit | f6f1a2dbc10ac43bbcd7d8f32af500c402b7338e (patch) | |
tree | 225dc3d97643f109bbb83feaf9e92329d01e2b72 | |
parent | e33e761bb5914988daa1b3e386371e9c367948bb (diff) |
Revert "Put the generated <module>version.h into build tree"
After discussion with Liang, I'm reverting it as he requested. This change put every header into the SYNCQT.HEADER_FILES twice for in-source builds, and the qtMODULEversion.h header did not include a path component.
This reverts commit 2fbc45b58bba860abf67fb28aa1319c9f4ededaf
Change-Id: Ie84cef19193ce5e49072f1f67a41140d9d2673b8
Reviewed-by: Liang Qi <liang.qi@nokia.com>
-rwxr-xr-x | bin/syncqt | 27 | ||||
-rw-r--r-- | src/corelib/corelib.pro | 2 | ||||
-rw-r--r-- | src/dbus/dbus.pro | 2 | ||||
-rw-r--r-- | src/gui/gui.pro | 2 | ||||
-rw-r--r-- | src/network/network.pro | 2 | ||||
-rw-r--r-- | src/opengl/opengl.pro | 2 | ||||
-rw-r--r-- | src/platformsupport/platformsupport.pro | 2 | ||||
-rw-r--r-- | src/printsupport/printsupport.pro | 2 | ||||
-rw-r--r-- | src/sql/sql.pro | 2 | ||||
-rw-r--r-- | src/testlib/testlib.pro | 2 | ||||
-rw-r--r-- | src/widgets/widgets.pro | 2 | ||||
-rw-r--r-- | src/xml/xml.pro | 2 |
12 files changed, 16 insertions, 33 deletions
diff --git a/bin/syncqt b/bin/syncqt index c7f7191e29..15814df3f9 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -72,9 +72,6 @@ $qtbasedir =~ s=\\=/=g if (defined $qtbasedir); # will be defined based on the modules sync.profile our (%modules, %moduleheaders, @allmoduleheadersprivate, %classnames, %mastercontent, %modulepris, %explicitheaders, %deprecatedheaders); -# store the build path for %modules -my %modules_build = (); - # global variables (modified by options) my $isunix = 0; my $module = 0; @@ -834,14 +831,6 @@ my %allmoduleheadersprivate = map { $_ => 1 } @allmoduleheadersprivate; $isunix = checkUnix; #cache checkUnix foreach my $lib (@modules_to_sync) { - my $modulebuildpath = "$out_basedir" . substr($modules{$lib}, length($basedir)); - unless(-e $modulebuildpath) { - make_path($modulebuildpath, $lib, $verbose_level); - } - $modules_build{$lib} = $modulebuildpath; -} - -foreach my $lib (@modules_to_sync) { #iteration info my $dir = $modules{$lib}; my $module_version = ""; @@ -944,7 +933,8 @@ foreach my $lib (@modules_to_sync) { my $modulepri = $modulepris{$lib}; if (-e $modulepri) { my $modulepriname = basename($modulepri); - my $moduleversionheader = $modules_build{$lib} . "/" . lc($lib) . "version.h"; + # FIXME: this creates a file in the source location for shadow-builds + my $moduleversionheader = "$modules{$lib}/" . lc($lib) . "version.h"; my $modulehexstring = sprintf("0x%02X%02X%02X", $module_major_version, $module_minor_version, $module_patch_version); open MODULE_VERSION_HEADER_FILE, ">$moduleversionheader" or die "Can't open $moduleversionheader for writing"; print MODULE_VERSION_HEADER_FILE "/* This file was generated by syncqt with the info from sync.profile. */\n"; @@ -957,6 +947,7 @@ foreach my $lib (@modules_to_sync) { print MODULE_VERSION_HEADER_FILE "\n"; print MODULE_VERSION_HEADER_FILE "#endif // QT_". uc($lib) . "_VERSION_H\n"; close MODULE_VERSION_HEADER_FILE; + $moduleversionheader = "<srcbase>" . substr($moduleversionheader, length($basedir)) if ($verbose_level < 2); print "$lib: created version header $moduleversionheader\n" if($verbose_level); } elsif ($modulepri) { print "$lib: WARNING: Module\'s pri file '$modulepri' not found.\n$lib: Skipped creating module version header.\n"; @@ -975,8 +966,6 @@ foreach my $lib (@modules_to_sync) { foreach my $headers_dir (@headers_paths) { #calc subdirs my @subdirs = ($headers_dir); - #add the path for version header - push(@subdirs, $modules_build{$lib}) if ($modules_build{$lib}); foreach my $subdir (@subdirs) { opendir DIR, $subdir or next; foreach my $t (sort readdir(DIR)) { @@ -1100,10 +1089,7 @@ foreach my $lib (@modules_to_sync) { if ($verbose_level && $header_copies) { my $new_header_dirname = dirname($iheader); - if ($new_header_dirname && $verbose_level < 2) { - $new_header_dirname = "<srcbase>" . substr($new_header_dirname, length($basedir)) if ($new_header_dirname =~ /$basedir/); - $new_header_dirname = "<outbase>" . substr($new_header_dirname, length($out_basedir)) if ($new_header_dirname =~ /$out_basedir/); - } + $new_header_dirname = "<srcbase>" . substr($new_header_dirname, length($basedir)) if ($new_header_dirname && $verbose_level < 2); my $header_base = basename($iheader); if ($verbose_level < 3) { my $line_prefix = ","; @@ -1116,10 +1102,7 @@ foreach my $lib (@modules_to_sync) { } print "$line_prefix $header_base ($header_copies)"; } else { # $verbose_level >= 3 - if ($verbose_level == 3) { - $iheader = "<srcbase>" . substr($iheader, length($basedir)) if ($iheader =~ /$basedir/); - $iheader = "<outbase>" . substr($iheader, length($out_basedir)) if ($iheader =~ /$out_basedir/); - } + $iheader = "<srcbase>" . substr($iheader, length($basedir)) if ($verbose_level == 3); print "$lib: created $header_copies fwd-include headers for $iheader\n"; } } diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 85d71aabf6..ba741c656c 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -14,7 +14,7 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused load(qt_module_config) -HEADERS += $$OUT_PWD/qtcoreversion.h +HEADERS += $$QT_SOURCE_TREE/src/corelib/qtcoreversion.h include(animation/animation.pri) include(arch/arch.pri) diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 0ce381b94e..6fd48de48d 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -33,7 +33,7 @@ win32 { } load(qt_module_config) -HEADERS += $$OUT_PWD/qtdbusversion.h +HEADERS += $$QT_SOURCE_TREE/src/dbus/qtdbusversion.h PUB_HEADERS = qdbusargument.h \ qdbusconnectioninterface.h \ diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 8856894aff..db045930a3 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -21,7 +21,7 @@ testcocoon { load(testcocoon) } -HEADERS += $$OUT_PWD/qtguiversion.h +HEADERS += $$QT_SOURCE_TREE/src/gui/qtguiversion.h include(accessible/accessible.pri) include(kernel/kernel.pri) diff --git a/src/network/network.pro b/src/network/network.pro index 839f944aa5..671b7fde69 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -22,7 +22,7 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore load(qt_module_config) -HEADERS += $$OUT_PWD/qtnetworkversion.h +HEADERS += $$QT_SOURCE_TREE/src/network/qtnetworkversion.h include(access/access.pri) include(bearer/bearer.pri) diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 989edaf3b8..89f8d0a3c2 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -17,7 +17,7 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui load(qt_module_config) -HEADERS += $$OUT_PWD/qtopenglversion.h +HEADERS += $$QT_SOURCE_TREE/src/opengl/qtopenglversion.h contains(QT_CONFIG, opengl):CONFIG += opengl contains(QT_CONFIG, opengles1):CONFIG += opengles1 diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index de4b835877..36323d9766 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -19,7 +19,7 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui include(../qbase.pri) -HEADERS += $$OUT_PWD/qtplatformsupportversion.h +HEADERS += $$PWD/qtplatformsupportversion.h DEFINES += QT_NO_CAST_FROM_ASCII PRECOMPILED_HEADER = ../corelib/global/qt_pch.h diff --git a/src/printsupport/printsupport.pro b/src/printsupport/printsupport.pro index d5ff307487..0aa92a95de 100644 --- a/src/printsupport/printsupport.pro +++ b/src/printsupport/printsupport.pro @@ -13,7 +13,7 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui load(qt_module_config) -HEADERS += $$OUT_PWD/qtprintsupportversion.h +HEADERS += $$QT_SOURCE_TREE/src/printsupport/qtprintsupportversion.h QMAKE_LIBS += $$QMAKE_LIBS_PRINTSUPPORT diff --git a/src/sql/sql.pro b/src/sql/sql.pro index 1730a3bff3..dbeed14386 100644 --- a/src/sql/sql.pro +++ b/src/sql/sql.pro @@ -15,7 +15,7 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore load(qt_module_config) -HEADERS += $$OUT_PWD/qtsqlversion.h +HEADERS += $$QT_SOURCE_TREE/src/sql/qtsqlversion.h DEFINES += QT_NO_CAST_FROM_ASCII PRECOMPILED_HEADER = ../corelib/global/qt_pch.h diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index d22d8e49c4..26769f95db 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -76,7 +76,7 @@ mac { load(qt_module_config) -HEADERS += $$OUT_PWD/qttestversion.h +HEADERS += $$QT_SOURCE_TREE/src/testlib/qttestversion.h QMAKE_TARGET_PRODUCT = QTestLib QMAKE_TARGET_DESCRIPTION = Qt \ diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index a48d096b8e..8f6a9713f6 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -13,7 +13,7 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore -HEADERS += $$OUT_PWD/qtwidgetsversion.h +HEADERS += $$QT_SOURCE_TREE/src/widgets/qtwidgetsversion.h include(../qbase.pri) diff --git a/src/xml/xml.pro b/src/xml/xml.pro index 252bba76dc..e860250507 100644 --- a/src/xml/xml.pro +++ b/src/xml/xml.pro @@ -14,7 +14,7 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore load(qt_module_config) -HEADERS += $$OUT_PWD/qtxmlversion.h +HEADERS += $$QT_SOURCE_TREE/src/xml/qtxmlversion.h PRECOMPILED_HEADER = ../corelib/global/qt_pch.h |