[tor-commits] [tor-browser-build/master] Don't show detailed build logs on stdout

boklm at torproject.org boklm at torproject.org
Tue Feb 14 23:25:12 UTC 2017


commit 36a1538a2d119aac1e2f7b3ce21260d0258ccc88
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Wed Feb 15 00:11:07 2017 +0100

    Don't show detailed build logs on stdout
    
    To provide a more "high level" view of progress, don't output build logs
    of each componets on stdout, but write them in files in the logs/ directory.
    
    This idea was suggested by mcs and Kathy in this comment:
    https://trac.torproject.org/projects/tor/ticket/17379#comment:12
---
 .gitignore             | 1 +
 rbm                    | 2 +-
 rbm.conf               | 1 +
 rbm.local.conf.example | 5 +++++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 98554a3..e38b069 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ alpha_nightly
 nightly
 hardened
 rbm.local.conf
+logs
diff --git a/rbm b/rbm
index 3fdeb23..b0382cc 160000
--- a/rbm
+++ b/rbm
@@ -1 +1 @@
-Subproject commit 3fdeb23bc4ab4dc65e69ff0fac49db603c4efb08
+Subproject commit b0382ccc58b9286e066bf5980f80cf041e287067
diff --git a/rbm.conf b/rbm.conf
index 47ffbfb..802bb48 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -2,6 +2,7 @@
 debug: '[% GET ! ENV.RBM_NO_DEBUG %]'
 compress_tar: gz
 output_dir: "out/[% project %]"
+build_log: 'logs/[% project %]-[% c("var/osname") %].log'
 
 pkg_type: build
 
diff --git a/rbm.local.conf.example b/rbm.local.conf.example
index 20f081f..ac54935 100644
--- a/rbm.local.conf.example
+++ b/rbm.local.conf.example
@@ -22,6 +22,11 @@
 ### use the same docker image names.
 #docker_image_prefix: tor-browser_XXXXX
 
+### The build_log option defines in which file the build logs of each
+### component are stored. If you set it to '-' the logs are output on
+### stdout and stderr.
+#build_log: '-'
+
 var:
   local_conf: 1
 



More information about the tor-commits mailing list