diff options
| -rwxr-xr-x | bin/gbuild-to-ide | 17 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToJson.mk | 5 |
2 files changed, 12 insertions, 10 deletions
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index 860f7243e8da..6a398d6c8724 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -92,15 +92,14 @@ class GbuildParser: # Add handling of BLACKLIST # Relation between json object and file extension jsonSrc = { - 'CXXOBJECTS': '.cxx', 'OBJCOBJECTS': '.m', 'OBJCXXOBJECTS': '.mm', 'COBJECTS': '.c', - - 'GENCXXOBJECTS': '.cxx', # remark is in workdir/GenCxxObject - 'ASMOBJECTS': '.s', #not in json, due to Blacklist ? - 'YACCOBJECTS': '.y', #not in json, due to Blacklist ? - 'GENCOBJECTS': '.c', #not in json, due to Blacklist ? - 'LEXOBJECTS': '.l', #not in json, due to add_scanners - 'JAVAOBJECTS': '.java', #not in json, due to Blacklist ? - 'PYTHONOBJECTS': '.py' #not in json, due to Blacklist ? + 'CXXOBJECTS': '.cxx', 'OBJCOBJECTS': '.m', 'OBJCXXOBJECTS': '.mm', 'COBJECTS': '.c', + 'LEXOBJECTS': '.l', 'YACCOBJECTS': '.y', + + 'GENCXXOBJECTS': '.cxx', # remark is in workdir/GenCxxObject + 'ASMOBJECTS': '.s', #not in json, due to Blacklist ? + 'GENCOBJECTS': '.c', #not in json, due to Blacklist ? + 'JAVAOBJECTS': '.java', #not in json, due to Blacklist ? + 'PYTHONOBJECTS': '.py' #not in json, due to Blacklist ? } diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk index 494319b2d050..345b3556cba0 100644 --- a/solenv/gbuild/extensions/post_GbuildToJson.mk +++ b/solenv/gbuild/extensions/post_GbuildToJson.mk @@ -123,11 +123,14 @@ define gb_LinkTarget_add_scanners $(call gb_LinkTarget_get_target,$(1)) : LEXOBJECTS += $(2) endef +define gb_LinkTarget_add_grammars +$(call gb_LinkTarget_get_target,$(1)) : YACCOBJECTS += $(2) + +endef gb_LinkTarget_use_package = gb_LinkTarget_use_generated_package = gb_LinkTarget_add_sdi_headers = gb_LinkTarget_use_external_project = -gb_LinkTarget_add_grammars = gb_LinkTarget__check_srcdir_paths = gb_LinkTarget__command_objectlist = @true gb_WinResTarget_WinResTarget_init = |