Author: wade
Date: 2006-11-01 16:19:08 -0500 (Wed, 01 Nov 2006)
New Revision: 67246

Modified:
   trunk/release/monobuild/scheduler-daemon.py
   trunk/release/packaging/build
   trunk/release/packaging/build-all
Log:
packaging/build:
-by default, print build output
-add option to suppress output (old default)

build-all, scheduler-daemon.py:
-update to take new default into account



Modified: trunk/release/monobuild/scheduler-daemon.py
===================================================================
--- trunk/release/monobuild/scheduler-daemon.py 2006-11-01 21:16:32 UTC (rev 
67245)
+++ trunk/release/monobuild/scheduler-daemon.py 2006-11-01 21:19:08 UTC (rev 
67246)
@@ -97,7 +97,7 @@
 
                                        # Build if the build doesn't exist 
already
                                        if not info.exists:
-                                               command = "cd %s; ./build %s %s 
%s" % (config.packaging_dir, distro, package_name, version)
+                                               command = "cd %s; ./build 
--suppress_output %s %s %s" % (config.packaging_dir, distro, package_name, 
version)
                                                log.log("%s:\t%s\n" % (distro, 
command) )
 
                                                num_started_builds += 1

Modified: trunk/release/packaging/build
===================================================================
--- trunk/release/packaging/build       2006-11-01 21:16:32 UTC (rev 67245)
+++ trunk/release/packaging/build       2006-11-01 21:19:08 UTC (rev 67246)
@@ -58,15 +58,19 @@
 skip_steps = False
 # This is to specify installing release packages even when building a package 
from head
 install_release_packages = False
-opts, remaining_args = getopt.getopt(sys.argv[1:], "", [ "skip_steps", 
"install_release_packages" ])
+# Don't print to the screen
+print_screen = 1
+opts, remaining_args = getopt.getopt(sys.argv[1:], "", [ "skip_steps", 
"install_release_packages", "suppress_output" ])
 for option, value in opts:
        if option == "--skip_steps":
                 skip_steps = True
        if option == "--install_release_packages":
                 install_release_packages = True
+       if option == "--suppress_output":
+                print_screen = 0
 
 if len(remaining_args) < 3:
-       print "Usage is: ./build [--skip_steps] [--install_release_packages] 
configuration package version <release>"
+       print "Usage is: ./build [--skip_steps] [--install_release_packages] 
[--suppress_output] configuration package version <release>"
         print "  <release> is optional"
        sys.exit(1)
 
@@ -185,7 +189,7 @@
 
 # Update step: installing deps
 LOGFILE = os.path.join(config.build_info_dir, build_info.rel_files_dir, 
'logs', 'install-deps.log')
-log_obj = logger.Logger(filename=LOGFILE, print_screen=0)
+log_obj = logger.Logger(filename=LOGFILE, print_screen=print_screen)
 build_info.update_step("install-deps", state="inprogress", 
log=os.path.basename(LOGFILE), start=utils.get_time(), finish="")
 
 if install_release_packages:
@@ -210,7 +214,7 @@
 
 # Update step: building
 LOGFILE = os.path.join(config.build_info_dir, build_info.rel_files_dir, 
'logs', 'build.log')
-log_obj = logger.Logger(filename=LOGFILE, print_screen=0)
+log_obj = logger.Logger(filename=LOGFILE, print_screen=print_screen)
 build_info.update_step("build", state="inprogress", 
log=os.path.basename(LOGFILE), start=utils.get_time(), finish="")
 # Copy tar.gz and zip files
 files_to_copy = [ source_file ]
@@ -283,7 +287,7 @@
                        print "Running step %d!" % counter
                        name = package.info['POSTBUILD_STEP_NAME%d' % counter]
                        LOGFILE = os.path.join(config.build_info_dir, 
build_info.rel_files_dir, 'logs', '%s.log' % name)
-                       log_obj = logger.Logger(filename=LOGFILE, 
print_screen=0)
+                       log_obj = logger.Logger(filename=LOGFILE, 
print_screen=print_screen)
                        build_info.update_step(name, state="inprogress", 
log=os.path.basename(LOGFILE), start=utils.get_time(), finish="")
 
                        (code, output) = build_env.ssh.execute("%s cd %s  " % 
(step_env_pre_cmd, remote_src_dir + package.info['POSTBUILD_STEP%d' % counter] 
), env=build_env.env_vars, logger=log_obj, output_timeout=timeout, 
max_output_size=max_output_size)

Modified: trunk/release/packaging/build-all
===================================================================
--- trunk/release/packaging/build-all   2006-11-01 21:16:32 UTC (rev 67245)
+++ trunk/release/packaging/build-all   2006-11-01 21:19:08 UTC (rev 67246)
@@ -21,7 +21,7 @@
 
 for distro in  [EMAIL PROTECTED]; do
        echo Starting $distro
-       ./build --skip_steps $distro $package $version $release > 
logs/build-all.$distro.$package.$version-$release 2>&1 &
+       ./build --suppress_output --skip_steps $distro $package $version 
$release > logs/build-all.$distro.$package.$version-$release 2>&1 &
        PIDS=([EMAIL PROTECTED] $!)
 done
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to