rev 10441 - scripts

Modestas Vainius modax-guest at alioth.debian.org
Fri May 2 14:51:13 UTC 2008


Author: modax-guest
Date: 2008-05-02 14:51:12 +0000 (Fri, 02 May 2008)
New Revision: 10441

Modified:
   scripts/autofixtll
Log:
v0.5.3: ignore " and ' around paths (thanks fabo)
add kdecore, kdeui, kde3support to predefined library list.

Modified: scripts/autofixtll
===================================================================
--- scripts/autofixtll	2008-05-02 00:05:00 UTC (rev 10440)
+++ scripts/autofixtll	2008-05-02 14:51:12 UTC (rev 10441)
@@ -122,6 +122,9 @@
     new Library('Xext', '${X11_Xext_LIB}', condition => 'X11_Xext_FOUND'),
     new Library('z', '${ZLIB_LIBRARY}'),
     new Library('solid', '${KDE4_SOLID_LIBS}'),
+    new Library('kdecore', '${KDE4_KDECORE_LIBS}'),
+    new Library('kdeui', '${KDE4_KDEUI_LIBS}'),
+    new Library('kde3support', '${KDE4_KDE3SUPPORT_LIBRARY}'),
 );
 
 #### Some defaults
@@ -438,14 +441,14 @@
         chomp;
         if ($link_cmd) {
             #cd /buildd/kdebase-workspace/obj-x86_64-linux-gnu/kwin/kcmkwin/kwindecoration && /usr/bin/cmake -E cmake_link_script CMakeFiles/kcm_kwindecoration.dir/link.txt $MSG_PREFIXverbose=1
-            if (m#^cd (.*) && .*/cmake -E cmake_link_script CMakeFiles/(.*?)\.dir/#) {
+            if (m#^cd ["']?(.*?)["']? && .*/cmake -E cmake_link_script CMakeFiles/(.*?)\.dir/#) {
                 $btarget = $2;
                 $bdir = File::Spec->abs2rel(Cwd::realpath($1), $builddir);
                 $link_cmd = 0;
             } else {
                 die "Unrecognized link line";
             }
-        } elsif (m/\[\s*\d+\%\] Building (.*) object (.*)/) {
+        } elsif (m/\[\s*\d+\%\] Building (.*) object ["']?(.*?)["']?/) {
             $bdir = $2;
             if ($bdir =~ m#CMakeFiles/(.*?)\.dir/#) {
                 $btarget = $1;
@@ -531,7 +534,7 @@
 
 ############## Main loop ##############################
 
-$main::VERSION = "0.5.2";
+$main::VERSION = "0.5.3";
 
 my $sourcedir = Cwd::getcwd();
 my $builddir = "obj-" . get_gnu_build_type();




More information about the pkg-kde-commits mailing list