/[pkg-kde]/scripts/autofixtll

Diff of /scripts/autofixtll

Parent Directory | Revision Log | View Patch Patch

-revision 10310 by modax-guest,
Sat Apr 26 22:44:41 2008 UTC
+revision 10311 by modax-guest,
Mon Apr 28 01:00:13 2008 UTC
 Line 105 
 use IPC::Open2;
  #### Please add predefined libraries to load dynamic symbol from here.
  # new Library(name, cmake_target, [path]). If path is not specified,
- # it's path=/usr/lib/$name.so. Use '' quotes.
+ # it's /usr/lib/$name.so. Use '' quotes to avoid escaping $.
  my @LIBS = (
      new Library('QtDBus', '${QT_QTDBUS_LIBRARY}'),
      new Library('QtNetwork', '${QT_QTNETWORK_LIBRARY}'),
 Line 195 
 sub Library::to_string() {
      return $self->{name} . " ( " . $self->{path} . " )";
  }
+ sub IgnoreStack::new {
+     return bless( { stack => [] }, shift() );
+ }
+ sub IgnoreStack::process_line {
+     my ($self, $line) = @_;
+     my $stack = $self->{stack};
+     if ($line =~ m/^\s*((end)?(foreach|function|if|macro|while))\s*[(]/i) {
+         my $isend = defined $2;
+         my $cmd = uc($3);
+         if ($isend) {
+             if (@$stack) {
+                 my $s = pop @$stack;
+                 print STDERR "$MSG_PREFIX There is something wrong with IgnoreStack:\n",
+                              "$MSG_PREFIX   stack top ($s) does not match end command ($cmd)\n" if $s ne $cmd;
+             } else {
+                 print STDERR "$MSG_PREFIX IgnoreStack is empty but got 'end$cmd'. A bug probably.\n";
+             }
+         } else {
+             push @$stack, $cmd;
+         }
+         return 1; # Processed
+     } else {
+         return 0;
+     }
+ }
+ sub IgnoreStack::is_empty {
+     return scalar(@{shift()->{stack}}) == 0;
+ }
+ sub IgnoreStack::dump_stack {
+     my $self = shift;
+     print "Ignore stack dump:\n";
+     for my $e (@{$self->{stack}}) {
+         print "  $e\n";
+     }
+ }
  sub determine_needed_libs {
      my ($alllibs, $undefrefs) = @_;
-Line 230 
 sub write_target_link_libs {
+Line 270 
 sub write_target_link_libs {
      if (-r $cmakelists) {
          my @contents;
+         my @ignored;
          my $found = 0;
+         # Ignore directive inside if/endif, while/endwhile etc. blocks
+         my $ignstack = new IgnoreStack;
          # Read and change
          open(CMAKELISTS, "<$cmakelists");
          while (<CMAKELISTS>) {
-             if (!$found && m/(target_link_libraries\s*\(\s*$target\s+)(.*?)(\s*\).*)?$/i) {
+             if (!$found && !$ignstack->process_line($_) &&
+                 m/^\s*(target_link_libraries\s*\(\s*$target\s+)(.*?)(\s*\).*)?$/i) {
                  # Fix it
                  my $newline = $1;
                  my $end = $3;
-Line 244 
 sub write_target_link_libs {
+Line 289 
 sub write_target_link_libs {
                  $newline .= $strlibs;
                  $newline .= $end if ($end);
                  $newline .= "\n";
-                 push @contents, $newline;
-                 $found = $.;
+                 if ($ignstack->is_empty()) {
+                     push @contents, $newline;
+                     $found = $.;
+                 } else {
+                     # Save for later use
+                     push @ignored, { found => $., newline => $newline };
+                     push @contents, $_;
+                 }
              } else {
                  push @contents, $_;
              }
          }
          close(CMAKELISTS);
+         if (!$ignstack->is_empty()) {
+             $ignstack->dump_stack();
+             print STDERR "$cmakelists has been processed but ignore stack is not empty. Probably a bug!\n";
+         }
+         if (!$found && @ignored == 1) {
+             # That's probably it as there were no other candidates. Replace
+             $found = ${ignored[0]}->{found};
+             my $newline = ${ignored[0]}->{newline};
+             $contents[$found-1] = $newline;
+         } else {
+             print "$MSG_PREFIX More (", scalar(@ignored), ") than 1 target_link_libraries() found in the IF/WHILE etc. blocks\n";
+         }
          if (!$found) {
              die "$MSG_PREFIX $cmakelists could not be corrected (needed '$strlibs' for target '$target'). Respective target_link_libraries() was not found $MSG_PREFIX";
          } else {
-Line 313 
 sub build_and_fix {
+Line 379 
 sub build_and_fix {
                  die "Could not extract target from $bdir";
              }
              $bdir =~ s#/CMakeFiles/.*##;
-         } elsif (m/^Linking (.*) (shared module|executable) /) {
+         } elsif (m/^Linking (.*) (shared (module|library)|executable) /) {
              $link_cmd = 1;
          } elsif (m/undefined reference to `(.*)'$/) {
              # undefined reference to `QDBusMessage::createSignal(QString const&, QString const&, QString const&)'
-Line 328 
 sub build_and_fix {
+Line 394 
 sub build_and_fix {
      chdir $sourcedir;
      # Try to correct the error
+ #    print $MSG_PREFIX, $islderror, $bdir, $btarget, @undefrefs;
      if ($islderror && $bdir && $btarget && @undefrefs) {
          my $libs = determine_needed_libs(\@LIBS, \@undefrefs);
          if (@$libs) {
-Line 386 
 sub check_environment {
+Line 453 
 sub check_environment {
            "$MSG_PREFIX    \$ $QUILT push $patchname\n" .
            "$MSG_PREFIX    \$ $QUILT new $patchname\n";
      }
-     if (! -d $builddir) {
-         die "Build directory '$builddir' does not exist";
-     }
  }
  sub get_gnu_build_type {
-Line 400 
 sub get_gnu_build_type {
+Line 463 
 sub get_gnu_build_type {
  ############## Main loop ##############################
- $main::VERSION = "0.2";
+ $main::VERSION = "0.3";
  my $sourcedir = Cwd::getcwd();
  my $builddir = "obj-" . get_gnu_build_type();

 Legend:



Removed from v.10310
 


changed lines


 
Added in v.10311
 Legend:



Removed from v.10310
 


changed lines


 
Added in v.10311
-Removed from v.10310
+Added in v.10311

	ViewVC Help
Powered by ViewVC 1.1.5