diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-01-25 23:41:52 +0600 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-01-26 01:43:38 +0100 |
| commit | 3460799175e6c5795aa07c784e16d10ba9081d49 (patch) | |
| tree | c4a523faed60536a6b393f4f6f3d12343e1c1e1c /solenv/gbuild/extensions | |
| parent | 8abcdf66bab029a0668aacd4a608e04e490be996 (diff) | |
Clear gb_GbuildToJson_DENYLISTEDMODULES, allow these modules
Filter "empty" targets in Visual Studio solutions: it makes little sense
to add generated files to projects (they aren't intended for editing in
IDE); so most external libraries, which only have "generated" sources,
and aren't part of core anyway, would have zero source files in their
projects - thus excluded.
Handle C++/CLI files; use their specific CXXCLRFLAGS (set them to the
source files explicitly, overriding CXXFLAGS set on the project level).
While here, do the same with CFLAGS and C files.
Do not add H(XX) files (with names identical to C(XX) files) to the VS
projects. This adds a tiny subset of all headers, which is inconsistent.
Change-Id: I6bd932277287d3444bb547b93f2867d226072d60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162582
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'solenv/gbuild/extensions')
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToJson.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk index 0aa23a70e0a7..73f9be2b78ef 100644 --- a/solenv/gbuild/extensions/post_GbuildToJson.mk +++ b/solenv/gbuild/extensions/post_GbuildToJson.mk @@ -19,8 +19,6 @@ # --PYTHONOBJECTS # # Add black listed modules a json files (--DENYLIST) -# -# Reduce number of denylisted modules ifneq ($(filter gbuildtojson,$(MAKECMDGOALS)),) @@ -82,21 +80,21 @@ 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) $(gb_GbuildToJson_PHONY) -$(call gb_LinkTarget_get_target,$(call gb_$(2)_get_linktarget,$(3))): T_MAKEFILE := $(lastword $(MAKEFILE_LIST)) +$(call gb_LinkTarget_get_target,$(call gb_$(2)_get_linktarget,$(3))): T_MAKEFILE := $(lastword $(filter %.mk,$(MAKEFILE_LIST))) endef define gb_CppunitTest_register_target gbuildtojson : $(call gb_LinkTarget_get_target,$(2)) $(call gb_LinkTarget_get_target,$(2)): $(gb_Helper_MISCDUMMY) $(gb_GbuildToJson_PHONY) -$(call gb_LinkTarget_get_target,$(2)): T_MAKEFILE := $(lastword $(MAKEFILE_LIST)) +$(call gb_LinkTarget_get_target,$(2)): T_MAKEFILE := $(lastword $(filter %.mk,$(MAKEFILE_LIST))) endef define gb_StaticLibrary_register_target gbuildtojson : $(call gb_LinkTarget_get_target,$(2)) $(call gb_LinkTarget_get_target,$(2)): $(gb_Helper_MISCDUMMY) $(gb_GbuildToJson_PHONY) -$(call gb_LinkTarget_get_target,$(2)): T_MAKEFILE := $(lastword $(MAKEFILE_LIST)) +$(call gb_LinkTarget_get_target,$(2)): T_MAKEFILE := $(lastword $(filter %.mk,$(MAKEFILE_LIST))) endef gb_LinkTarget_use_static_libraries = @@ -191,7 +189,7 @@ endef gb_Module_add_l10n_target = -gb_GbuildToJson_DENYLISTEDMODULES := cli_ure jurt external +gb_GbuildToJson_DENYLISTEDMODULES := define gb_Module__add_moduledir_impl include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(notdir $(2)).mk |