[commit] r2742 - in trunk: . Install/Build

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Feb  5 11:29:06 2018
New Revision: 2742

Log:
Less verbose msbuild

Modified:
   trunk/.gitignore
   trunk/Install/Build/tools.py

Modified: trunk/.gitignore
==============================================================================
--- trunk/.gitignore	Mon Feb  5 11:29:02 2018	(r2741)
+++ trunk/.gitignore	Mon Feb  5 11:29:06 2018	(r2742)
@@ -446,3 +446,4 @@
 /GME-src.zip
 Install/vc_redist.x64.v10.0.40219.325.exe
 Install/vc_redist.x86.v10.0.40219.325.exe
+/msbuild_*_*.log

Modified: trunk/Install/Build/tools.py
==============================================================================
--- trunk/Install/Build/tools.py	Mon Feb  5 11:29:02 2018	(r2741)
+++ trunk/Install/Build/tools.py	Mon Feb  5 11:29:06 2018	(r2742)
@@ -9,6 +9,8 @@
 
 import os
 import os.path
+import sys
+import subprocess
 import win32com.client
 from prefs import prefs
 
@@ -99,14 +101,11 @@
     """
     toolmsg("Executing " + str(args))
     #toolmsg(" ".join(map(lambda x: '"' + x + '"', args)))
-    import subprocess
     with open(os.devnull, "w") as nulfp:
         # n.b. stderr=subprocess.STDOUT fails mysteriously
-        import sys
         subprocess.check_call(args, stdout=(sys.stdout if prefs['verbose'] else nulfp), stderr=subprocess.STDOUT, shell=True, cwd=dirname)
 
 
-
 def test_VS():
     "Test for Microsoft Visual Studio 2015. Raises exception if not found."
     toolmsg("Trying to create VisualStudio.DTE object")
@@ -127,16 +126,15 @@
     arch = arch or prefs['arch']
     target = target or ("Clean;" * prefs['clean']) + 'Build'
 
-    import subprocess
     # , '/fl', '/flp:Verbosity=diagnostic'
     # , '/m'
-    args = [msbuild, sln_path, '/m', '/t:' + target,
+    args = [msbuild, sln_path, '/nologo', '/m', '/t:' + target,
          '/p:VisualStudioVersion=%s.0;PlatformToolset=v%s0;Configuration=%s' % (prefs['toolset'], prefs['toolset'], config_name) +
-        (';Platform=x64' if arch == 'x64' else '') ]
-    with open(os.devnull, "w") as nulfp:
-        # n.b. stderr=subprocess.STDOUT fails mysteriously
-        import sys
-        subprocess.check_call(args, stdout=(sys.stdout if prefs['verbose'] else nulfp), stderr=None, shell=True)
+        (';Platform=x64' if arch == 'x64' else ''),
+        '/fl', '/flp:Verbosity=normal;LogFile=msbuild_{}_{}.log'.format(os.path.basename(sln_path), arch),
+        '/clp:' + ('Verbosity=minimal' if prefs['verbose'] else 'Verbosity=quiet')]
+    # n.b. stderr=subprocess.STDOUT fails mysteriously
+    subprocess.check_call(args, stdout=sys.stdout, stderr=None, shell=True)
 
 def xme2mga(xml_file, paradigm):
     """