[Libreoffice-commits] core.git: bin/gbuild-to-ide

[jan Iversen]

 bin/gbuild-to-ide |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 53d3755972bfd3bd2cd650edf91f1483038028c8
Author: jan Iversen <jani at documentfoundation.org>
Date:   Sat Jan 28 10:03:22 2017 +0100

    gbuild-to-ide, add pr module sources
    
    Additional to having sources pr target (needed
    for generarition), each module also has a sources key
    where all the module source files are sorted, this allows
    to present the user with a sorted list of sources.
    
    Change-Id: I8fd8249c88dc55f47199b7998faeb721d74f982f

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 18f88d3..47c7cae 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -49,9 +49,6 @@ class GbuildParser:
                     foundincludes.append(includeswitch.strip()[len(json_srcdir)+1:])
                 else:
                     foundincludes.append(includeswitch.strip())
-
-        #foundincludes = [includeswitch.strip()[len(json_srcdir)+1:] for includeswitch in GbuildParser._includepattern.findall(includes) if
-        #        len(includeswitch) > 2]
         return (foundincludes, foundisystem)
 
     def __split_objs(module,objsline, ext):
@@ -91,6 +88,7 @@ class GbuildParser:
         #      tools translations
         #      udkapi unoid
         # Add handling of BLACKLIST
+
         # Relation between json object and file extension
         jsonSrc = {
                     'CXXOBJECTS': '.cxx', 'OBJCOBJECTS': '.m', 'OBJCXXOBJECTS': '.mm', 'COBJECTS': '.c',
@@ -135,8 +133,14 @@ class GbuildParser:
 
         moduleDict['include']={ 'targets': [], 'headers':self.headers_of('include')}
 
-        for module in sorted(moduleDict):
-            self.modules[module] = moduleDict[module]
+        for i in sorted(moduleDict):
+            module = moduleDict[i]
+            src = []
+            for target in module['targets']:
+                for ext in jsonSrc:
+                    src.extend(target[ext])
+            module['sources'] = sorted(src)
+            self.modules[i] = module
         return self