[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdesvn-build-1.10
From:       Michael Pyne <mpyne () kde ! org>
Date:       2009-07-13 2:45:50
Message-ID: 1247453150.826276.4193.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 995583 by mpyne:

- Use branch for git modules after all.
- Run clean_build_directory under a forked process so it can be logged (and that's
  so that we don't get "No log file" with the error message.


 M  +15 -5     kdesvn-build  


--- branches/work/kdesvn-build-1.10/kdesvn-build #995582:995583
@@ -2225,6 +2225,8 @@
         # Call internal function, name given by $command[1]
         if($command[0] eq 'kdesvn-build')
         {
+            # No colors!
+            ($RED, $GREEN, $YELLOW, $NORMAL, $BOLD) = ("") x 5;
             debug "Calling $command[1]";
 
             my $cmd = $command[1];
@@ -2625,11 +2627,12 @@
         my %qtcopy_opts = (
             'configure-flags' => '-qt-gif -no-phonon -qdbus -nomake demos -nomake \
examples -fast',  'repository' => 'git://qt.gitorious.org/qt/qt.git',
+            'branch'     => 'master',
         );
 
         # Merge (uses Perl hash slice)
         @options{keys %qtcopy_opts} = values %qtcopy_opts;
-        delete @options{qw/branch tag/}; # These don't apply to qt-copy git
+        delete @options{qw(tag)}; # These don't apply to qt-copy git
     }
 
     if ($module eq 'kdesupport') {
@@ -4830,6 +4833,10 @@
 #
 # i.e. the effect is similar to "rm -r $arg/* $arg/.*".
 #
+# This assumes we're called from a separate child process.  Therefore the
+# normal logging routines are /not used/, since our output will be logged
+# by the parent kdesvn-build.
+#
 # The first parameter should be the absolute path to the directory to delete.
 #
 # Returns boolean true on success, boolean false on failure.
@@ -4837,7 +4844,7 @@
 {
     my $dir = shift;
 
-    debug "Deleting under r[$dir]";
+    print "starting delete of $dir\n";
 
     # This closure subroutine will be called for every file/directory.
     # It will be called in a postorder traversal (i.e. parent processed after
@@ -4853,7 +4860,7 @@
         if (not -l _ and -d _)
         {
             # Remove directory.
-            debug "Removing directory y[$name]";
+            debug "Removing directory $name";
             if (not pretending)
             {
                 rmdir ($name) or die "Couldn't delete $name!: $!";
@@ -4862,7 +4869,7 @@
         else
         {
             # Remove file/symlink/etc.
-            debug "Removing file y[$name]";
+            debug "Removing file $name";
             if (not pretending)
             {
                 unlink ($name) or die "Couldn't delete $name!: $!";
@@ -4910,8 +4917,11 @@
     {
         info "\tRemoving files in build directory for g[$module]";
 
-        if (not prune_under_directory($builddir))
+        # This variant of log_command runs the sub prune_under_directory($builddir)
+        # in a forked child, so that we can log its output.
+        if (log_command($module, 'clean-builddir', [ 'kdesvn-build', \
'prune_under_directory', $builddir ]))  {
+            error " r[b[*]\tFailed to clean build directory.  Verify the permissions \
are correct.";  return 0; # False for this function.
         }
 


[prev in list] [next in list] [prev in thread] [next in thread]