Bug 725199 - include build machine name in about:buildconfig r=ted
authorJohn Ford <jhford@mozilla.com>
Wed, 08 Feb 2012 19:16:47 -1000
changeset 86483 8d88f07c034f74cc0802fda4df7db7ce8edeeec7
parent 86482 20ad3570d59973829fe57035dfb3086515c08dd9
child 86484 9e23446b3559dacf96cb9e1df9859eb2f0e7389c
push id22021
push userbmo@edmorley.co.uk
push dateThu, 09 Feb 2012 17:55:20 +0000
treeherdermozilla-central@7b1ae3535886 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs725199
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 725199 - include build machine name in about:buildconfig r=ted
toolkit/content/Makefile.in
toolkit/content/buildconfig.html
--- a/toolkit/content/Makefile.in
+++ b/toolkit/content/Makefile.in
@@ -72,16 +72,19 @@ endif
 _dollar=$$
 SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
 # extra sanity check for old versions of hg
 # that don't support showconfig
 ifeq (http,$(patsubst http%,http,$(SOURCE_REPO)))
 DEFINES += -DSOURCE_REPO="$(SOURCE_REPO)"
 endif
 
+BUILD_HOSTNAME = $(shell hostname -s || hostname)
+DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)"
+
 ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif
 
 TEST_DIRS += tests
 
 EXTRA_JS_MODULES = \
   Geometry.jsm \
--- a/toolkit/content/buildconfig.html
+++ b/toolkit/content/buildconfig.html
@@ -52,16 +52,20 @@
   <style type="text/css">
     th { text-align: start; }
     h2 { margin-top: 1.5em; }
     th, td { vertical-align: top; }
   </style>
 </head>
 <body class="aboutPageWideContainer">
 <h1>about:buildconfig</h1>
+#ifdef BUILD_HOSTNAME
+<h2>Build Machine</h2>
+<p>@BUILD_HOSTNAME@</p>
+#endif
 #ifdef SOURCE_REPO
 #ifdef SOURCE_CHANGESET
 <h2>Source</h2>
 <p>Built from <a href="@SOURCE_REPO@/rev/@SOURCE_CHANGESET@">@SOURCE_REPO@/rev/@SOURCE_CHANGESET@</a></p>
 #endif
 #endif
 <h2>Build platform</h2>
 <table>