Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-06-23 08:45:51 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-06-23 08:46:09 (GMT) |
| commit | c4f1c078ca0d6a9d6fe93655da5fb6010cc6e050 (patch) | |
| tree | 93289bc71171db64e049bc21c903e87013ac7206 /BuildTools/SCons/Tools/qt4.py | |
| parent | c64bfb54c72f5fab80cd6f3e3202f8c09064ecf3 (diff) | |
| download | swift-contrib-c4f1c078ca0d6a9d6fe93655da5fb6010cc6e050.zip swift-contrib-c4f1c078ca0d6a9d6fe93655da5fb6010cc6e050.tar.bz2 | |
Fixed .qrc dependencies not being tracked.
Resolves: #1134
Diffstat (limited to 'BuildTools/SCons/Tools/qt4.py')
| -rw-r--r-- | BuildTools/SCons/Tools/qt4.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py index d9e41d8..671fd08 100644 --- a/BuildTools/SCons/Tools/qt4.py +++ b/BuildTools/SCons/Tools/qt4.py @@ -49,19 +49,19 @@ class ToolQtWarning(SCons.Warnings.Warning): class GeneratedMocFileNotIncluded(ToolQtWarning): pass class QtdirNotFound(ToolQtWarning): pass SCons.Warnings.enableWarningClass(ToolQtWarning) -qrcinclude_re = re.compile(r'<file>([^<]*)</file>', re.M) +qrcinclude_re = re.compile(r'<file (alias=\"[^\"]*\")?>([^<]*)</file>', re.M) def transformToWinePath(path) : return os.popen('winepath -w "%s"'%path).read().strip().replace('\\','/') header_extensions = [".h", ".hxx", ".hpp", ".hh"] if SCons.Util.case_sensitive_suffixes('.h', '.H'): header_extensions.append('.H') # TODO: The following two lines will work when integrated back to SCons # TODO: Meanwhile the third line will do the work @@ -322,19 +322,19 @@ def generate(env): 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() - includes = qrcinclude_re.findall(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', function = scanResources, |