From 463bc0cecc2f3b427dac8a42b0af3852e8e6aabb Mon Sep 17 00:00:00 2001
From: Michael Pyne <mpyne@kde.org>
Date: Sat, 22 May 2004 15:15:05 +0000
Subject: [PATCH] * Remove debugging output * Install modules after they've
 been built.  Default is enabled, can be   disabled per-module.

svn path=/trunk/kdenonbeta/kdecvs-build/; revision=313508
---
 kdecvs-build | 48 +++++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/kdecvs-build b/kdecvs-build
index 6aa6f91..cd061c4 100755
--- a/kdecvs-build
+++ b/kdecvs-build
@@ -24,24 +24,25 @@ use Fcntl;    # For sysopen constants
 # Remember kids, global variables are evil!  I only get to do this
 # because I'm an adult and you're not! :-P
 my %global_opts = (
-    "checkout-only"      => "",
-    "debug"              => "",
-    "apply-qt-patches"   => "",
-    "configure-flags"    => "",
-    "qtdir"              => "",
-    "kdedir"             => "",
-    "cxxflags"           => "",
-    "libpath"            => "",
-    "do-not-compile"     => "",
-    "binpath"            => "",
-    "no-cvs"             => "",
-    "refresh-build"      => "",
-    "reconfigure"        => "",
-    "release-tag"        => "",
-    "build-system-only"  => "",
-    "cvs-server"         => "",
-    "cvs-root"           => "$ENV{HOME}/kdecvs",
-    "lockfile"           => "$ENV{HOME}/.kdecvs-lock",
+    "checkout-only"       => "",
+    "debug"               => "",
+    "apply-qt-patches"    => "",
+    "configure-flags"     => "",
+    "qtdir"               => "",
+    "kdedir"              => "",
+    "cxxflags"            => "",
+    "libpath"             => "",
+    "do-not-compile"      => "",
+    "binpath"             => "",
+    "no-cvs"              => "",
+    "refresh-build"       => "",
+    "reconfigure"         => "",
+    "release-tag"         => "",
+    "build-system-only"   => "",
+    "install-after-build" => "1", # Default to true
+    "cvs-server"          => "",
+    "cvs-root"            => "$ENV{HOME}/kdecvs",
+    "lockfile"            => "$ENV{HOME}/.kdecvs-lock",
 
 # Deprecated in v0.6.  Logging is important, but doesn't
 # make sense to all be dumped to stdout.  I may add a simple
@@ -1273,7 +1274,12 @@ sub handle_build
         }
         else
         {
-            # Build succeeded
+            # Build succeeded, install unless we shouldn't
+            if (get_option($module, "install-after-build"))
+            {
+                handle_install($module);
+            }
+
             push @build_done, $module;
         }
     }
@@ -1328,7 +1334,7 @@ sub handle_install
     my $pretend = get_option ('global', 'pretend');
     my $result = 0;
 
-    for my $module (@install_list)
+    for my $module (@_)
     {
         if ($module eq "qt-copy")
         {
@@ -1409,7 +1415,7 @@ else
             join (', ', @ARGV), "\n";
     }
 
-    $result = handle_install ();
+    $result = handle_install (@install_list);
 }
 
 $time = localtime;