[Libreoffice-commits] core.git: 2 commits - bin/gbuild-to-ide solenv/gbuild
jan Iversen
jani at documentfoundation.org
Thu Jan 26 13:36:51 UTC 2017
bin/gbuild-to-ide | 33 +++++++++++++++++---------
solenv/gbuild/extensions/post_GbuildToJson.mk | 14 +++++++----
2 files changed, 32 insertions(+), 15 deletions(-)
New commits:
commit dcd86466c6125b3d2ef30e8056d03b832835c807
Author: jan Iversen <jani at documentfoundation.org>
Date: Thu Jan 26 14:35:43 2017 +0100
gbuildtojson support for yacc files.
added support for add_grammars macro
Change-Id: I17955bd1534d9f43e1953691d985a18ee8241d38
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 860f724..6a398d6 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 494319b..345b355 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 =
commit 1fb65a66f19ab78b01d7da9784f00437b7ce1681
Author: jan Iversen <jani at documentfoundation.org>
Date: Thu Jan 26 14:24:03 2017 +0100
gbuildtojson, added support for lex files
added add_scanner macro
Finalized the move around in gbuild-to-ide, to signal
which generators are actively supported.
Change-Id: I11699cd4380d49efc3b541abb7780b5136162433
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 3d9460c..860f724 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -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 ?
}
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk
index 512a871..494319b 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -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)) \
@@ -119,11 +119,14 @@ 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
More information about the Libreoffice-commits
mailing list