Changeset 1072 for trunk/bin/syncqt

Timestamp:

Sep 10, 2011, 12:55:12 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

syncqt: Paths in headers.pri must be relative to QTDIR.

These paths are used in .pro files located in the Qt source tree (QTDIR)
so they must be relative to it in order to get correct final paths (not to
the build directory which differs in shadow builds).

The code only worked with shadow builds only if the shadow build tree
was located in the same parent directory as the Qt source tree (i.e.
/home/bob/Coding/qt and /home/bob/Coding/qt-build). This is not always
the case.

File:

• trunk/bin/syncqt (modified) (5 diffs)

trunk/bin/syncqt

@@ -342 +342 @@
 
 ######################################################################
-# Syntax:  fixPaths(file, dir)
+# Syntax:  fixPaths(file, dir)
 # Params:  file, string, filepath to be made relative to dir
 #          dir, string, dirpath for point of origin
+
+
 #
 # Purpose: file is made relative (if possible) of dir.
@@ -350 +352 @@
 ######################################################################
 sub fixPaths {
-    my ($file, $dir) = @_;
-    $dir =~ s=^$basedir/=$out_basedir/= if(!($basedir eq $out_basedir));
+    my ($file, $dir) = @_;
+    $dir =~ s=^$basedir/=$out_basedir/= if(!($basedir eq $out_basedir));
     $file =~ s=\\=/=g;
     $file =~ s/\+/\\+/g;
@@ -890 +892 @@
                             #deal with the install directives
                             if($public_header) {
-                                my $pri_install_iheader = fixPaths($iheader, $current_dir);
+                                my $pri_install_iheader = fixPaths($iheader, $current_dir);
                                 foreach my $class (@classes) {
                                     # Strip namespaces:
@@ -898 +900 @@
 #                                   }
                                     my $class_header = fixPaths("$out_basedir/include/$lib/$class",
-                                                                $current_dir) . " ";
+                                                                $current_dir) . " ";
                                     $pri_install_classes .= $class_header
                                                                 unless($pri_install_classes =~ $class_header);
@@ -906 +908 @@
                         }
                         else {
-                            my $pri_install_iheader = fixPaths($iheader, $current_dir);
+                            my $pri_install_iheader = fixPaths($iheader, $current_dir);
                             $pri_install_pfiles.= "$pri_install_iheader ";;
                         }