From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Sun, 1 Apr 2012 00:59:25 +0000 (+0000)
Subject: setup: show-tool-versions: report cl only on windows, report buildslave, git, openssl... 
X-Git-Url: https://git.rkrishnan.org/rgr-080307.php?a=commitdiff_plain;h=4ead889f03f6523624a1ee393fef9fcad6f9e4ad;p=tahoe-lafs%2Ftahoe-lafs.git

setup: show-tool-versions: report cl only on windows, report buildslave, git, openssl, and lzip, but not 7za
---

diff --git a/misc/build_helpers/show-tool-versions.py b/misc/build_helpers/show-tool-versions.py
index 18718a8b..2a8408d0 100644
--- a/misc/build_helpers/show-tool-versions.py
+++ b/misc/build_helpers/show-tool-versions.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-import locale, os, subprocess, sys, traceback
+import locale, os, platform, subprocess, sys, traceback
 
 added_zetuptoolz_egg = False
 try:
@@ -134,15 +134,19 @@ print_stdout(['locale'])
 print_python_encoding_settings()
 print
 print_stdout(['buildbot', '--version'])
-print_stdout(['cl'])
+print_stdout(['buildslave', '--version'])
+if 'windows' in platform.system().lower():
+    print_stderr(['cl'])
 print_stdout(['gcc', '--version'], numlines=1)
 print_stdout(['g++', '--version'], numlines=1)
 print_stdout(['cryptest', 'V'])
+print_stdout(['git', '--version'])
+print_stdout(['openssl', 'version'])
 print_stdout(['darcs', '--version'])
 print_stdout(['darcs', '--exact-version'], label='darcs-exact-version')
-print_stdout(['7za'], numlines=3)
 print_stdout(['flappclient', '--version'])
 print_stdout(['valgrind', '--version'])
+print_stdout(['lzip', '--version'])
 
 print_as_ver()