diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-11-23 14:54:14 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-11-25 02:06:16 +0000 |
| commit | 65541cfaa167c9ac80af770c6034badefdc34199 (patch) | |
| tree | e44d7a9b7cf9ea62b42559b7347e0bb4526d5df6 /solenv | |
| parent | e62fc464f21fdaace28709f316becfa0fc54c0e8 (diff) | |
store makefile for targets in json too
Change-Id: Iae2f497da5d0ee4f8961a5655573e45a562dd76d
Reviewed-on: https://gerrit.libreoffice.org/31116
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToJson.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuildtojson/gbuildtojson.cxx | 1 | ||||
| -rw-r--r-- | solenv/qa/python/gbuildtojson.py | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk index 04d880780f0a..af57a716fbd6 100644 --- a/solenv/gbuild/extensions/post_GbuildToJson.mk +++ b/solenv/gbuild/extensions/post_GbuildToJson.mk @@ -16,6 +16,7 @@ gb_FULLDEPS:= gbuildtojson: @true + .PHONY : foo foo: @true @@ -27,6 +28,7 @@ mkdir -p $(WORKDIR)/GbuildToJson/$(dir $(2)) mkdir -p $(WORKDIR)/LinkTarget/$(dir $(2)) $(if $(GBUILDTOJSON_LD_LIBRARY_PATH),LD_LIBRARY_PATH=$(GBUILDTOJSON_LD_LIBRARY_PATH)) \ $(call gb_Executable_get_command,gbuildtojson) \ +--makefile=$(call var2file,$(shell $(gb_MKTEMP)),100,$(T_MAKEFILE)) \ --linktarget=$(call var2file,$(shell $(gb_MKTEMP)),100,$(2)) \ --ilibtarget=$(call var2file,$(shell $(gb_MKTEMP)),100,$(ILIBTARGET)) \ --cxxobjects=$(call var2file,$(shell $(gb_MKTEMP)),100,$(CXXOBJECTS)) \ @@ -55,6 +57,7 @@ define gb_Postprocess_register_target gbuildtojson : $(call gb_LinkTarget_get_target,$(call gb_$(2)_get_linktarget,$(3))) $(call gb_LinkTarget_get_target,$(call gb_$(2)_get_linktarget,$(3))): $(gb_Helper_MISCDUMMY) foo +$(call gb_LinkTarget_get_target,$(call gb_$(2)_get_linktarget,$(3))): T_MAKEFILE := $(lastword $(MAKEFILE_LIST)) endef gb_LinkTarget_use_static_libraries = diff --git a/solenv/gbuildtojson/gbuildtojson.cxx b/solenv/gbuildtojson/gbuildtojson.cxx index 12d7163f9927..6b3367dea6e2 100644 --- a/solenv/gbuildtojson/gbuildtojson.cxx +++ b/solenv/gbuildtojson/gbuildtojson.cxx @@ -18,6 +18,7 @@ using namespace std; static const list<string> validargs = { + "makefile", "linktarget", "ilibtarget", "cxxobjects", diff --git a/solenv/qa/python/gbuildtojson.py b/solenv/qa/python/gbuildtojson.py index e09139bc59a7..5eb438d782ca 100644 --- a/solenv/qa/python/gbuildtojson.py +++ b/solenv/qa/python/gbuildtojson.py @@ -62,7 +62,7 @@ class CheckGbuildToJson(unittest.TestCase): gbuildlibs.append(json.load(f)) foundlibs = set() for lib in gbuildlibs: - self.assertEqual(set(lib.keys()), set(['ASMOBJECTS', 'CFLAGS', 'CFLAGSAPPEND', 'CXXFLAGS', 'CXXFLAGSAPPEND', 'CXXOBJECTS', 'DEFS', 'GENCOBJECTS', 'GENCXXOBJECTS', 'ILIBTARGET', 'INCLUDE', 'LINKED_LIBS', 'LINKED_STATIC_LIBS', 'LINKTARGET', 'OBJCFLAGS', 'OBJCFLAGSAPPEND', 'OBJCOBJECTS', 'OBJCXXFLAGS', 'OBJCXXFLAGSAPPEND', 'OBJCXXOBJECTS', 'YACCOBJECTS'])) + self.assertEqual(set(lib.keys()), set(['MAKEFILE', 'ASMOBJECTS', 'CFLAGS', 'CFLAGSAPPEND', 'CXXFLAGS', 'CXXFLAGSAPPEND', 'CXXOBJECTS', 'DEFS', 'GENCOBJECTS', 'GENCXXOBJECTS', 'ILIBTARGET', 'INCLUDE', 'LINKED_LIBS', 'LINKED_STATIC_LIBS', 'LINKTARGET', 'OBJCFLAGS', 'OBJCFLAGSAPPEND', 'OBJCOBJECTS', 'OBJCXXFLAGS', 'OBJCXXFLAGSAPPEND', 'OBJCXXOBJECTS', 'YACCOBJECTS'])) if lib['LINKTARGET'].find('gbuildselftestdep') != -1: foundlibs.add('gbuildselftestdep') elif lib['LINKTARGET'].find('gbuildselftest') != -1: |