FCL/sf/mw/qt: comparison bin/syncqt

equal deleted inserted replaced

-:ef0373b55136
+:758a864f9613
 "QtSvg" => "$basedir/src/svg",
 "QtDeclarative" => "$basedir/src/declarative",
 "QtScript" => "$basedir/src/script",
 "QtScriptTools" => "$basedir/src/scripttools",
 "Qt3Support" => "$basedir/src/qt3support",
-"ActiveQt" => "$basedir/src/activeqt/container;$basedir/src/activeqt/control;$basedir/src/activeqt/shared",
+"ActiveQt" => "$basedir/src/activeqt",
 "QtTest" => "$basedir/src/testlib",
 "QtHelp" => "$basedir/tools/assistant/lib",
 "QtDesigner" => "$basedir/tools/designer/src/lib",
 "QtUiTools" => "$basedir/tools/designer/src/uitools",
 "QtDBus" => "$basedir/src/dbus",
 @modules_to_sync = keys(%modules) if($#modules_to_sync == -1);
 $isunix = checkUnix; #cache checkUnix
 # create path
+mkpath "$out_basedir/include", !$quiet;
 mkpath "$out_basedir/$out_subdir/Qt", !$quiet;
 my @ignore_headers = ();
 my $class_lib_map_contents = "";
 my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" );
 my @ignore_for_include_check = ( "qatomic.h" );
 my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" );
 my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" );
 my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDesigner}", "$modules{QtUiTools}", "$modules{QtDBus}", "$modules{phonon}" );
 my %colliding_headers = ();
+my %inject_headers;
+# Force generation of forwarding header for qconfig.h if (and only if) we can't
+# find the header by normal means.
+%inject_headers = ( "$basedir/src/corelib/global" => ( "*qconfig.h" ) ) unless (-e "$basedir/src/corelib/global/qconfig.h");
 foreach (@modules_to_sync) {
 #iteration info
 my $lib = $_;
 my $dir = "$modules{$lib}";
 #calc files and "copy" them
 foreach (@subdirs) {
 my $subdir = "$_";
 my @headers = findFiles("$subdir", "^[-a-z0-9_]*\\.h\$" , 0);
+push @headers, $inject_headers{$subdir} if (defined $inject_headers{$subdir});
 foreach (@headers) {
 my $header = "$_";
+my $shadow = ($header =~ s/^\*//);
 $header = 0 if("$header" =~ /^ui_.*.h/);
 foreach (@ignore_headers) {
 $header = 0 if("$header" eq "$_");
 }
 if($header) {
 $public_header = 0 if("$header" eq "$_");
 }
 }
 my $iheader = $subdir . "/" . $header;
+$iheader =~ s/^\Q$basedir\E/$out_basedir/ if ($shadow);
 my @classes = $public_header ? classNames($iheader) : ();
 if($showonly) {
 print "$header [$lib]\n";
 foreach(@classes) {
 print "SYMBOL: $_\n";
 } else {
 $colliding_headers{$file_name} = 1;
 my $warning_msg = 'Inclusion of header files from include/Qt is deprecated.';
 $header_content = "#ifndef QT_NO_QT_INCLUDE_WARN\n" .
 "    #if defined(__GNUC__)\n" .
-"        #pragma warning \"$warning_msg\"\n" .
+"        #warning \"$warning_msg\"\n" .
 "    #elif defined(_MSC_VER)\n" .
 "        #pragma message \"WARNING: $warning_msg\"\n" .
 "    #endif\n".
 "#endif\n\n";
 }
 if($check_includes) {
 for (keys(%modules)) {
 #iteration info
 my $lib = $_;
-my $dir = "$modules{$lib}";
+{
-foreach (split(/;/, $dir)) {
-my $current_dir = "$_";
 #calc subdirs
-my @subdirs = ($current_dir);
+my @subdirs = ($modules{$lib});
 foreach (@subdirs) {
 my $subdir = "$_";
-opendir DIR, "$subdir";
+opendir DIR, "$subdir" or die "Huh, directory ".$subdir." cannot be opened.";
 while(my $t = readdir(DIR)) {
 push @subdirs, "$subdir/$t" if(-d "$subdir/$t" && !($t eq ".") &&
 !($t eq "..") && !($t eq ".obj") &&
 !($t eq ".moc") && !($t eq ".rcc") &&
 !($t eq ".uic") && !($t eq "build"));

changeset 37	758a864f9613
parent 33	3e2da88830cd