1 files changed, 38 insertions, 13 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
index d5c14e2..372b261 100644
--- a/BuildTools/SCons/Tools/qt4.py
+++ b/BuildTools/SCons/Tools/qt4.py
@@ -31,18 +31,19 @@ selection method.
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
 __revision__ = "/home/scons/scons/branch.0/branch.96/baseline/src/engine/SCons/Tool/qt.py 0.96.92.D001 2006/04/10 23:13:27 knight"
 
 import os.path
 import re
 import subprocess
+from string import Template
 
 import SCons.Action
 import SCons.Builder
 import SCons.Defaults
 import SCons.Scanner
 import SCons.Tool
 import SCons.Util
 import SCons.SConf
 
@@ -123,73 +124,75 @@ class _Automoc:
         # Q_OBJECT detection
         q_object_search = re.compile(r'[^A-Za-z0-9]Q_OBJECT[^A-Za-z0-9]') 
         # cxx and c comment 'eater'
         #comment = re.compile(r'(//.*)|(/\*(([^*])|(\*[^/]))*\*/)')
         # CW: something must be wrong with the regexp. See also bug #998222
         #    CURRENTLY THERE IS NO TEST CASE FOR THAT
         
         # The following is kind of hacky to get builders working properly (FIXME)
         objBuilderEnv = objBuilder.env
-        objBuilder.env = env
+        objBuilder.env = env.Clone()
+        if os.path.basename(objBuilder.env ["CXX"]).startswith(("gcc", "clang")):
+            objBuilder.env.Append(CXXFLAGS = "-w")
         mocBuilderEnv = env.Moc4.env
         env.Moc4.env = env
         
         # make a deep copy for the result; MocH objects will be appended
         out_sources = source[:]
 
         for obj in source:
-            if isinstance(obj,basestring):  # big kludge!
-                print "scons: qt4: '%s' MAYBE USING AN OLD SCONS VERSION AND NOT CONVERTED TO 'File'. Discarded." % str(obj)
+            if isinstance(obj,str):  # big kludge!
+                print("scons: qt4: '%s' MAYBE USING AN OLD SCONS VERSION AND NOT CONVERTED TO 'File'. Discarded." % str(obj))
                 continue
             if not obj.has_builder():
                 # binary obj file provided
                 if debug:
-                    print "scons: qt: '%s' seems to be a binary. Discarded." % str(obj)
+                    print("scons: qt: '%s' seems to be a binary. Discarded." % str(obj))
                 continue
             cpp = obj.sources[0]
             if not splitext(str(cpp))[1] in cxx_suffixes:
                 if debug:
-                    print "scons: qt: '%s' is no cxx file. Discarded." % str(cpp) 
+                    print("scons: qt: '%s' is no cxx file. Discarded." % str(cpp) )
                 # c or fortran source
                 continue
             #cpp_contents = comment.sub('', cpp.get_contents())
             try:
-                cpp_contents = cpp.get_contents()
+                cpp_contents = str(cpp.get_contents())
             except: continue # may be an still not generated source
             h=None
             for h_ext in header_extensions:
                 # try to find the header file in the corresponding source
                 # directory
                 hname = splitext(cpp.name)[0] + h_ext
                 h = find_file(hname, (cpp.get_dir(),), env.File)
                 if h:
                     if debug:
-                        print "scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp))
+                        print("scons: qt: Scanning '%s' (header of '%s')" % (str(h), str(cpp)))
                     #h_contents = comment.sub('', h.get_contents())
-                    h_contents = h.get_contents()
+                    h_contents = str(h.get_contents())
                     break
             if not h and debug:
-                print "scons: qt: no header for '%s'." % (str(cpp))
+                print("scons: qt: no header for '%s'." % (str(cpp)))
             if h and q_object_search.search(h_contents):
                 # h file with the Q_OBJECT macro found -> add moc_cpp
                 moc_cpp = env.Moc4(h)
                 moc_o = objBuilder(moc_cpp)
                 out_sources.append(moc_o)
                 #moc_cpp.target_scanner = SCons.Defaults.CScan
                 if debug:
-                    print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp))
+                    print("scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp)))
             if cpp and q_object_search.search(cpp_contents):
                 # cpp file with Q_OBJECT macro found -> add moc
                 # (to be included in cpp)
                 moc = env.Moc4(cpp)
                 env.Ignore(moc, moc)
                 if debug:
-                    print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(cpp), str(moc))
+                    print("scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(cpp), str(moc)))
                 #moc.source_scanner = SCons.Defaults.CScan
         # restore the original env attributes (FIXME)
         objBuilder.env = objBuilderEnv
         env.Moc4.env = mocBuilderEnv
 
         return (target, out_sources)
 
 AutomocShared = _Automoc('SharedObject')
 AutomocStatic = _Automoc('StaticObject')
@@ -338,19 +341,19 @@ def generate(env):
         def recursiveFiles(basepath, path) :
             result = []
             for item in os.listdir(os.path.join(basepath, path)) :
                 itemPath = os.path.join(path, item)
                 if os.path.isdir(os.path.join(basepath, itemPath)) :
                     result += recursiveFiles(basepath, itemPath)
                 else:
                     result.append(itemPath)
             return result
-        contents = node.get_contents()
+        contents = str(node.get_contents())
         includes = [included[1] for included in qrcinclude_re.findall(contents)]
         qrcpath = os.path.dirname(node.path)
         dirs = [included for included in includes if os.path.isdir(os.path.join(qrcpath,included))]
         # dirs need to include files recursively
         for dir in dirs :
             includes.remove(dir)
             includes+=recursiveFiles(qrcpath,dir)
         return includes
     qrcscanner = SCons.Scanner.Scanner(name = 'qrcfile',
@@ -362,20 +365,42 @@ def generate(env):
         source_scanner = qrcscanner,
         src_suffix = '$QT4_QRCSUFFIX',
         suffix = '$QT4_QRCCXXSUFFIX',
         prefix = '$QT4_QRCCXXPREFIX',
         single_source = True
         )
     env.Append( BUILDERS = { 'Qrc': qrcbuilder } )
 
     # Interface builder
+    def addDisableWarningsPragmaToFile(target, source, env):
+        assert( len(target) == 1 )
+        assert( len(source) == 1 )
+        srcf = str(source[0])
+        dstf = str(target[0])
+        with open(dstf, 'r+') as uiHeader:
+            data=uiHeader.read()
+
+            template = Template(
+"""#pragma once
+#pragma warning(push, 0)
+#pragma GCC system_header
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wall"
+$uiheadertext
+#pragma clang diagnostic pop
+#pragma warning(pop)
+""")
+            uiHeader.seek(0)
+            uiHeader.write(template.substitute(uiheadertext=data))
+            uiHeader.truncate()
+
     uic4builder = Builder(
-        action = SCons.Action.Action('$QT4_UICCOM', cmdstr = '$QT4_UICCOMSTR'), 
+        action = [SCons.Action.Action('$QT4_UICCOM', cmdstr = '$QT4_UICCOMSTR'), SCons.Action.Action(addDisableWarningsPragmaToFile, None)],
         src_suffix='$QT4_UISUFFIX',
         suffix='$QT4_UICDECLSUFFIX',
         prefix='$QT4_UICDECLPREFIX',
         single_source = True
         #TODO: Consider the uiscanner on new scons version
         )
     env['BUILDERS']['Uic4'] = uic4builder
 
     # Metaobject builder