mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Python 3 compatibility for building qt

scons-python3
Alex 2021-09-24 12:34:33 +08:00
parent ab5c7b05ba
commit d7dc1c9741
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/scons/qt5.py
View File

@ -135,23 +135,25 @@ class _Automoc:
out_sources = source[:] out_sources = source[:]
for obj in source: for obj in source:
if isinstance(obj,basestring): # big kludge! if isinstance(obj,str): # big kludge!
print "scons: qt5: '%s' MAYBE USING AN OLD SCONS VERSION AND NOT CONVERTED TO 'File'. Discarded." % str(obj) print("scons: qt5: '%s' MAYBE USING AN OLD SCONS VERSION AND NOT CONVERTED TO 'File'. Discarded." % str(obj))
continue continue
if not obj.has_builder(): if not obj.has_builder():
# binary obj file provided # binary obj file provided
if debug: 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 continue
cpp = obj.sources[0] cpp = obj.sources[0]
if not splitext(str(cpp))[1] in cxx_suffixes: if not splitext(str(cpp))[1] in cxx_suffixes:
if debug: 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 # c or fortran source
continue continue
#cpp_contents = comment.sub('', cpp.get_contents()) #cpp_contents = comment.sub('', cpp.get_contents())
try: try:
cpp_contents = cpp.get_contents() cpp_contents = cpp.get_contents()
if not isinstance(cpp_contents, str):
cpp_contents = str(cpp_contents)
except: continue # may be an still not generated source except: continue # may be an still not generated source
h=None h=None
for h_ext in header_extensions: for h_ext in header_extensions:
@ -161,12 +163,14 @@ class _Automoc:
h = find_file(hname, (cpp.get_dir(),), env.File) h = find_file(hname, (cpp.get_dir(),), env.File)
if h: if h:
if debug: 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 = comment.sub('', h.get_contents())
h_contents = h.get_contents() h_contents = h.get_contents()
if not isinstance(h_contents, str):
h_contents = str(h_contents)
break break
if not h and debug: 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): if h and q_object_search.search(h_contents):
# h file with the Q_OBJECT macro found -> add moc_cpp # h file with the Q_OBJECT macro found -> add moc_cpp
moc_cpp = env.Moc5(h) moc_cpp = env.Moc5(h)
@ -174,14 +178,14 @@ class _Automoc:
out_sources.append(moc_o) out_sources.append(moc_o)
#moc_cpp.target_scanner = SCons.Defaults.CScan #moc_cpp.target_scanner = SCons.Defaults.CScan
if debug: 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): if cpp and q_object_search.search(cpp_contents):
# cpp file with Q_OBJECT macro found -> add moc # cpp file with Q_OBJECT macro found -> add moc
# (to be included in cpp) # (to be included in cpp)
moc = env.Moc5(cpp) moc = env.Moc5(cpp)
env.Ignore(moc, moc) env.Ignore(moc, moc)
if debug: 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 #moc.source_scanner = SCons.Defaults.CScan
# restore the original env attributes (FIXME) # restore the original env attributes (FIXME)
objBuilder.env = objBuilderEnv objBuilder.env = objBuilderEnv
@ -303,6 +307,8 @@ def generate(env):
result.append(itemPath) result.append(itemPath)
return result return result
contents = node.get_contents() contents = node.get_contents()
if not isinstance(contents, str):
contents = str(contents)
includes = qrcinclude_re.findall(contents) includes = qrcinclude_re.findall(contents)
qrcpath = os.path.dirname(node.path) qrcpath = os.path.dirname(node.path)
dirs = [included for included in includes if os.path.isdir(os.path.join(qrcpath,included))] dirs = [included for included in includes if os.path.isdir(os.path.join(qrcpath,included))]

16
src/mtsgui/SConscript
View File

@ -3,10 +3,10 @@ Import('env', 'os', 'glob', 'sys', 'hasQt', 'hasCollada', 'hasBreakpad', 'mainEn
# For running Uic & Moc (below) # For running Uic & Moc (below)
def recursiveDirs(root) : def recursiveDirs(root) :
return filter((lambda a : a.rfind(".svn") == -1), [a[0] for a in os.walk(root)]) return list(filter((lambda a : a.rfind(".svn") == -1), [a[0] for a in os.walk(root)]))
def unique(list) : def unique(l) :
return dict.fromkeys(list).keys() return list(dict.fromkeys(l).keys())
def scanFiles(dir, accept=["*.cpp"], reject=[]) : def scanFiles(dir, accept=["*.cpp"], reject=[]) :
sources = [] sources = []
@ -15,15 +15,15 @@ def scanFiles(dir, accept=["*.cpp"], reject=[]) :
for pattern in accept : for pattern in accept :
sources+=glob.glob(path + "/" + pattern) sources+=glob.glob(path + "/" + pattern)
for pattern in reject: for pattern in reject:
sources = filter((lambda a : a.rfind(pattern) == -1), sources) sources = list(filter((lambda a : a.rfind(pattern) == -1), sources))
sources = map((lambda a : os.path.basename(a)), sources) sources = list(map((lambda a : os.path.basename(a)), sources))
return unique(sources) return unique(sources)
if hasQt: if hasQt:
qtEnv = mainEnv.Clone() qtEnv = mainEnv.Clone()
qtEnv.Append(CPPPATH=['#src/mtsgui']) qtEnv.Append(CPPPATH=['#src/mtsgui'])
if qtEnv.has_key('QTINCLUDE'): if 'QTINCLUDE' in qtEnv:
qtEnv.Prepend(CPPPATH=qtEnv['QTINCLUDE']) qtEnv.Prepend(CPPPATH=qtEnv['QTINCLUDE'])
qtEnv.EnableQt5Modules(['QtGui', 'QtWidgets', 'QtCore', 'QtOpenGL', 'QtXml', 'QtXmlPatterns', 'QtNetwork']) qtEnv.EnableQt5Modules(['QtGui', 'QtWidgets', 'QtCore', 'QtOpenGL', 'QtXml', 'QtXmlPatterns', 'QtNetwork'])
@ -51,9 +51,9 @@ if hasQt:
if hasCollada: if hasCollada:
qtSources += converter_objects qtSources += converter_objects
if env.has_key('COLLADALIBDIR'): if 'COLLADALIBDIR' in env:
qtEnv.Prepend(LIBPATH=env['COLLADALIBDIR']) qtEnv.Prepend(LIBPATH=env['COLLADALIBDIR'])
if env.has_key('COLLADALIB'): if 'COLLADALIB' in env:
qtEnv.Prepend(LIBS=env['COLLADALIB']) qtEnv.Prepend(LIBS=env['COLLADALIB'])
if sys.platform == 'darwin': if sys.platform == 'darwin':