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

[jan Iversen]

 bin/gbuild-to-ide                             |    6 ++++--
 solenv/gbuild/extensions/post_GbuildToJson.mk |    7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 1fb2947aea679afeb061b38538c0a6ea8b3254a2
Author: jan Iversen <jani at documentfoundation.org>
Date:   Mon Jan 16 19:01:18 2017 +0100

    post_GbuildToJson.mk, extended with extra file types
    
    Extended the call to gbuildtojson, with extra file types.
    Some filetypes still need data collection, this
    is noted in the file as todo.
    
    Change-Id: I3e832f82656236d42d1d7b59bf3ac2925c5b1568

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 47eaebd..b2c23c8 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -92,14 +92,14 @@ class GbuildParser:
                    'GENCXXOBJECTS': '.cxx', # remark is in workdir/GenCxxObject
                    'OBJCOBJECTS':   '.m',
                    'OBJCXXOBJECTS': '.mm',
+                   'COBJECTS':      '.c',
 
-                    # gbuildtojson defines but does not fill these:
+            # gbuildtojson defines but does not fill these:
                    'ASMOBJECTS': '.s',
                    'GENCOBJECTS': '.c',
                    'YACCOBJECTS': '.y',
 
                    # gbuildtojson need to be extended to fill these:
-                   'COBJECTS': '.c',
                    'FLEXOBJECTS': '.l',
                    'JAVAOBJECTS': '.java',
                    'PYTHONOBJECTS': '.py'
@@ -122,6 +122,8 @@ class GbuildParser:
                         else:
                             filesSorted[i] = []
 
+                    # TODO: extend GbuildLinkTarget with new json keys
+                    # Find a better way instead on a zillion parameters
                     newObj = GbuildLinkTarget(match,
                                               location,
                                               foundincludes,
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk
index 89a4c84..512a871 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -14,9 +14,6 @@
 #   --ASMOBJECTS
 #   --GENCOBJECTS
 #   --YACCOBJECTS
-#
-# add new arguments:
-#   --COBJECTS
 #   --FLEXOBJECTS
 #   --JAVAOBJECTS
 #   --PYTHONOBJECTS
@@ -61,6 +58,10 @@ $(call gb_Executable_get_command,gbuildtojson) \
 --asmobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(ASMOBJECTS)) \
 --gencobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(GENCOBJECTS)) \
 --gencxxobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(GENCXXOBJECTS)) \
+--cobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(COBJECTS)) \
+--flexobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(FLEXOBJECTS)) \
+--javaobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(JAVAOBJECTS)) \
+--pythonobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(PYTHONOBJECTS)) \
 --cflags=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_CFLAGS)) \
 --cflagsappend=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_CFLAGS_APPEND)) \
 --cxxflags=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_CXXFLAGS)) \