From f6f1a2dbc10ac43bbcd7d8f32af500c402b7338e Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Wed, 1 Feb 2012 10:45:51 +0100
Subject: 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>
---
 bin/syncqt | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

(limited to 'bin')

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;
@@ -833,14 +830,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};
@@ -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";
                             }
                         }
-- 
cgit v1.2.3