Changeset 651 for trunk/bin/syncqt

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• bin/syncqt (modified) (9 diffs)

trunk/bin/syncqt

@@ -4 +4 @@
 # Synchronizes Qt header files - internal development tool.
 #
-# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 # Contact: Nokia Corporation (qt-info@nokia.com)
 #
@@ -15 +15 @@
 use Config;
 use strict;
+
+for (my $i = 0; $i < $#ARGV; $i++) {
+    if ($ARGV[$i] eq "-base-dir" && $i < $#ARGV - 1) {
+        $ENV{"QTDIR"} = $ARGV[$i + 1];
+        last;
+    }
+}
 
 die "syncqt: QTDIR not defined" if ! $ENV{"QTDIR"}; # sanity check
@@ -62 +69 @@
 my $check_includes = 0;
 my $copy_headers = 0;
+my $create_uic_class_map = 1;
+my $create_private_headers = 1;
 my @modules_to_sync ;
 $force_relative = 1 if ( -d "/System/Library/Frameworks" );
@@ -85 +94 @@
     print "  -showonly             Show action but not perform        (default: " . ($showonly ? "yes" : "no") . ")\n";
     print "  -outdir <PATH>        Specify output directory for sync  (default: $out_basedir)\n";
+    print "  -separate-module <NAME>:<PROFILEDIR>:<HEADERDIR> Create headers for <NAME> with original headers in <HEADERDIR> relative to <PROFILEDIR> \n";
     print "  -help                 This help\n";
     exit 0;
@@ -577 +587 @@
         $var = "module";
         $val = shift @ARGV;
+    } elsif("$arg" eq "-separate-module") {
+        $var = "separate-module";
+        $val = shift @ARGV;
     } elsif("$arg" eq "-show") {
         $var = "showonly";
         $val = "yes";
+    } elsif("$arg" eq "-base-dir") {
+        # skip, it's been dealt with at the top of the file
+        shift @ARGV;
+        next;
     } elsif("$arg" eq '*') {
         # workaround for windows 9x where "%*" expands to "*"
@@ -629 +646 @@
         die "No such module: $val" unless(defined $modules{$val});
         push @modules_to_sync, $val;
+    } elsif ("$var" eq "separate-module") {
+        my ($module, $prodir, $headerdir) = split(/:/, $val);
+        $modules{$module} = $prodir;
+        push @modules_to_sync, $module;
+        $moduleheaders{$module} = $headerdir;
+        $create_uic_class_map = 0;
+        $create_private_headers = 0;
     } elsif ("$var" eq "output") {
         my $outdir = $val;
@@ -808 +832 @@
                                 $class_lib_map_contents .= "QT_CLASS_LIB($_, $lib, $header_base)\n";
                                 $header_copies++ if(syncHeader("$out_basedir/include/$lib/$class", "$out_basedir/include/$lib/$header", 0));
+
+                                # KDE-Compat headers for Phonon
+                                if ($lib eq "phonon") {
+                                    $header_copies++ if (syncHeader("$out_basedir/include/phonon_compat/Phonon/$class", "$out_basedir/include/$lib/$header", 0));
+                                }
                             }
-                        } else {
+                        } elsif ($create_private_headers) {
                             @headers = ( "$out_basedir/include/$lib/private/$header" );
                             push @headers, "$out_basedir/include/Qt/private/$header"
@@ -857 +886 @@
         my @master_includes;
         push @master_includes, "$out_basedir/include/$lib/$lib";
+        push @master_includes, "$out_basedir/include/phonon_compat/Phonon/Phonon" if ($lib eq "phonon");
         foreach my $master_include (@master_includes) {
             #generate the "master" include file
@@ -904 +934 @@
     }
 }
-unless($showonly) {
+unless($showonly || !$create_uic_class_map) {
     my $class_lib_map = "$out_basedir/src/tools/uic/qclass_lib_map.h";
     if(-e "$class_lib_map") {