[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/emerge/bin/BuildSystem
From:       Wolfgang Rohdewald <wolfgang () rohdewald ! de>
Date:       2011-02-17 12:29:58
Message-ID: 20110217122958.0C0E8AC8BE () svn ! kde ! org
[Download RAW message or body]

SVN commit 1221276 by wrohdewald:

Regression from r1221089: VERBOSE=1 does not work for qmake, it tries to 
interpret V, E etc as options


 M  +2 -2      BuildSystemBase.py  
 M  +1 -1      QMakeBuildSystem.py  


--- trunk/kdesupport/emerge/bin/BuildSystem/BuildSystemBase.py #1221275:1221276
@@ -87,13 +87,13 @@
             defines += " %s" % self.subinfo.options.configure.defines
         return defines
 
-    def makeOptions(self, defines=""):
+    def makeOptions(self, defines="", maybeVerbose=True):
         """return options for make command line"""
         if self.subinfo.options.make.ignoreErrors:
             defines += " -i"
         if self.subinfo.options.make.makeOptions:
             defines += " %s" % self.subinfo.options.make.makeOptions
-        if utils.verbose() > 1:
+        if maybeVerbose and utils.verbose() > 1:
             defines += " VERBOSE=1"
         return defines
 
--- trunk/kdesupport/emerge/bin/BuildSystem/QMakeBuildSystem.py #1221275:1221276
@@ -66,7 +66,7 @@
         """implements the make step for Qt projects"""
         self.enterBuildDir()
 
-        command = ' '.join([self.makeProgramm, self.makeOptions(options)])
+        command = ' '.join([self.makeProgramm, self.makeOptions(options, maybeVerbose=False)])
 
         return self.system( command, "make" )
 
[prev in list] [next in list] [prev in thread] [next in thread]