From 175895a2e9ed3f17307f1f128dba37c619de6aa4 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 23 Sep 2014 12:22:42 -0400 Subject: add build_docs step and experimental use of autobuild graph subcommand --- BuildParams | 1 + build.sh | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/BuildParams b/BuildParams index c2fadf5943..3ac0d58c2b 100755 --- a/BuildParams +++ b/BuildParams @@ -11,6 +11,7 @@ Linux.symbolfiles = "newview/secondlife-symbols-linux.tar.bz2" # Use Public Upload Locations public_build = true +build_docs = true # skip windows debug build until we can get a fix in. build_CYGWIN_Debug = false diff --git a/build.sh b/build.sh index f908139979..9cb46669cd 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,7 @@ #!/bin/sh -# This is a the master build script - it is intended to be run by parabuild +# This is a the master build script - it is intended to be run by the Linden +# Lab build farm # It is called by a wrapper script in the shared repository which sets up # the environment from the various BuildParams files and does all the build # result post-processing. @@ -12,8 +13,6 @@ # * The special style in which python is invoked is intentional to permit # use of a native python install on windows - which requires paths in DOS form # * This script relies heavily on parameters defined in BuildParams -# * The basic convention is that the build name can be mapped onto a mercurial URL, -# which is also used as the "branch" name. check_for() { @@ -172,11 +171,17 @@ build() # This is called from the branch independent script upon completion of all platform builds. build_docs() { - begin_section Docs + begin_section "Building Documentation" + begin_section "Stub documentation.txt" # Stub code to generate docs echo Hello world > documentation.txt upload_item docs documentation.txt text/plain - end_section Docs + end_section "Stub documentation.txt" + begin_section "Dependency Graph" + depends_graph="$build_dir/dependancies.png" + "$AUTOBUILD" graph --output "$depends_graph" && record_event "autobuild graph succeeded" || record_event "autobuild graph failed" + end_section "Dependency Graph" + end_section "Building Documentation" } @@ -375,7 +380,6 @@ then fi fi - # check status and upload results to S3 if $succeeded then -- cgit v1.2.3