mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbuildtojson, added support for lex files

Browse Source 
added add_scanner macro

Finalized the move around in gbuild-to-ide, to signal
which generators are actively supported.

Change-Id: I11699cd4380d49efc3b541abb7780b5136162433
This commit is contained in:
jan Iversen 2017-01-26 14:24:03 +01:00
parent 8af9286632
commit 1fb65a66f1
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bin/gbuild-to-ide
View File

@ -76,19 +76,31 @@ class GbuildParser:
def parse(self):
# current json blacklist, this is just for reference:
# bridges
# connectivity compilerplugins cli_ure cppu cppuhelper cpputools
# dictionaries
# extensions external
# helpcompiler helpcontent2
# i18npool icon-themes
# javaunohelper jurt
# lingucomponent
# odk
# sal scaddins shell solenv stoc
# tools translations
# udkapi unoid
# Add handling of BLACKLIST
# Relation between json object and file extension
jsonSrc = {
'CXXOBJECTS': '.cxx',
'CXXOBJECTS': '.cxx', 'OBJCOBJECTS': '.m', 'OBJCXXOBJECTS': '.mm', 'COBJECTS': '.c',
'GENCXXOBJECTS': '.cxx', # remark is in workdir/GenCxxObject
'OBJCOBJECTS': '.m',
'OBJCXXOBJECTS': '.mm',
'ASMOBJECTS': '.s',
'YACCOBJECTS': '.y',
'GENCOBJECTS': '.c',
'COBJECTS': '.c',
'FLEXOBJECTS': '.l',
'JAVAOBJECTS': '.java',
'PYTHONOBJECTS': '.py'
'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 ?
}

9
solenv/gbuild/extensions/post_GbuildToJson.mk
View File

@ -14,7 +14,7 @@
# --ASMOBJECTS
# --GENCOBJECTS
# --YACCOBJECTS
# --FLEXOBJECTS
# --LEXOBJECTS
# --JAVAOBJECTS
# --PYTHONOBJECTS
#
@ -56,10 +56,10 @@ $(call gb_Executable_get_command,gbuildtojson) \
--objcobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(OBJCOBJECTS)) \
--objcxxobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(OBJCXXOBJECTS)) \
--asmobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(ASMOBJECTS)) \
--lexobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(LEXOBJECTS)) \
--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)) \
@ -118,12 +118,15 @@ endef
define gb_LinkTarget_add_objcxxobject
$(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS += $(2)
endef
define gb_LinkTarget_add_scanners
$(call gb_LinkTarget_get_target,$(1)) : LEXOBJECTS += $(2)
endef
gb_LinkTarget_use_package =
gb_LinkTarget_use_generated_package =
gb_LinkTarget_add_sdi_headers =
gb_LinkTarget_use_external_project =
gb_LinkTarget_add_scanners =
gb_LinkTarget_add_grammars =
gb_LinkTarget__check_srcdir_paths =
gb_LinkTarget__command_objectlist = @true