Kaydet (Commit) 1fb2947a authored tarafından jan Iversen's avatar jan Iversen

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
üst b7e6f688
...@@ -92,14 +92,14 @@ class GbuildParser: ...@@ -92,14 +92,14 @@ class GbuildParser:
'GENCXXOBJECTS': '.cxx', # remark is in workdir/GenCxxObject 'GENCXXOBJECTS': '.cxx', # remark is in workdir/GenCxxObject
'OBJCOBJECTS': '.m', 'OBJCOBJECTS': '.m',
'OBJCXXOBJECTS': '.mm', 'OBJCXXOBJECTS': '.mm',
'COBJECTS': '.c',
# gbuildtojson defines but does not fill these: # gbuildtojson defines but does not fill these:
'ASMOBJECTS': '.s', 'ASMOBJECTS': '.s',
'GENCOBJECTS': '.c', 'GENCOBJECTS': '.c',
'YACCOBJECTS': '.y', 'YACCOBJECTS': '.y',
# gbuildtojson need to be extended to fill these: # gbuildtojson need to be extended to fill these:
'COBJECTS': '.c',
'FLEXOBJECTS': '.l', 'FLEXOBJECTS': '.l',
'JAVAOBJECTS': '.java', 'JAVAOBJECTS': '.java',
'PYTHONOBJECTS': '.py' 'PYTHONOBJECTS': '.py'
...@@ -122,6 +122,8 @@ class GbuildParser: ...@@ -122,6 +122,8 @@ class GbuildParser:
else: else:
filesSorted[i] = [] filesSorted[i] = []
# TODO: extend GbuildLinkTarget with new json keys
# Find a better way instead on a zillion parameters
newObj = GbuildLinkTarget(match, newObj = GbuildLinkTarget(match,
location, location,
foundincludes, foundincludes,
......
...@@ -14,9 +14,6 @@ ...@@ -14,9 +14,6 @@
# --ASMOBJECTS # --ASMOBJECTS
# --GENCOBJECTS # --GENCOBJECTS
# --YACCOBJECTS # --YACCOBJECTS
#
# add new arguments:
# --COBJECTS
# --FLEXOBJECTS # --FLEXOBJECTS
# --JAVAOBJECTS # --JAVAOBJECTS
# --PYTHONOBJECTS # --PYTHONOBJECTS
...@@ -61,6 +58,10 @@ $(call gb_Executable_get_command,gbuildtojson) \ ...@@ -61,6 +58,10 @@ $(call gb_Executable_get_command,gbuildtojson) \
--asmobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(ASMOBJECTS)) \ --asmobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(ASMOBJECTS)) \
--gencobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(GENCOBJECTS)) \ --gencobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(GENCOBJECTS)) \
--gencxxobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(GENCXXOBJECTS)) \ --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)) \ --cflags=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_CFLAGS)) \
--cflagsappend=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_CFLAGS_APPEND)) \ --cflagsappend=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_CFLAGS_APPEND)) \
--cxxflags=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_CXXFLAGS)) \ --cxxflags=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_CXXFLAGS)) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment