diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-11-22 13:05:50 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-11-22 14:45:54 +0000 |
| commit | 294bfdfaada9ba85ddcf853650a8da9c10f25281 (patch) | |
| tree | e53ce51d27f09f376771f2c799f3edad989b1647 /solenv/gbuild/extensions | |
| parent | Destroy item sets in SdDialogsTest::tearDown (diff) | |
| download | core-294bfdfaada9ba85ddcf853650a8da9c10f25281.tar.gz core-294bfdfaada9ba85ddcf853650a8da9c10f25281.zip | |
improvements to gbuildtoide
- move supported module selection from the test directly into gbuild, it
should not be possible now to have 'make gbuildtoide' failing, it
should skip problematic parts
- move from whitelisting to blacklisting bad modules
- toplevel 'make gbuildtoide' should work now, so add test (limit to
non-Windows for now, as Windows is stupid and slow)
- remove spurious debug output in test
Change-Id: I9838dd2fa091e5fb3e56f414f60164086e8f2076
Reviewed-on: https://gerrit.libreoffice.org/31072
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'solenv/gbuild/extensions')
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToIde.mk | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/solenv/gbuild/extensions/post_GbuildToIde.mk b/solenv/gbuild/extensions/post_GbuildToIde.mk index 47d0779d0903..fd5ca1992ad1 100644 --- a/solenv/gbuild/extensions/post_GbuildToIde.mk +++ b/solenv/gbuild/extensions/post_GbuildToIde.mk @@ -88,15 +88,34 @@ $(call gb_LinkTarget__add_include,$(1),$(call gb_CustomTarget_get_workdir,$(2))) endef -define gb_Module_add_target -$(if $(filter Library_% Executable_%,$(2)),$(call gb_Module__read_targetfile,$(1),$(2),target)) -$(if $(filter Library_% Executable_%,$(2)),$(call gb_Module_get_nonl10n_target,$(1)) : $$(gb_Module_CURRENTTARGET)) +define gb_Module__add_target_impl +$(call gb_Module__read_targetfile,$(1),$(2),target) + +$(call gb_Module_get_nonl10n_target,$(1)) : $(3) + +endef +define gb_Module_add_target +$(if $(filter Library_% Executable_%,$(2)),$(call gb_Module__add_target_impl,$(1),$(2),$$(gb_Module_CURRENTTARGET))) endef gb_Module_add_l10n_target = +gb_GbuildToIde_BLACKLISTEDMODULES := connectivity compilerplugins cli_ure dictionaries bridges helpcompiler helpcontent2 icon-themes jurt sal shell cppu cppuhelper cpputools extensions external i18npool javaunohelper jurt lingucomponent odk scaddins solenv stoc tools translations udkapi unoidl writerfilter + +define gb_Module__add_moduledir_impl +include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk +$(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK)) +gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK)) + +endef + +define gb_Module_add_moduledir +$(if $(filter $(gb_GbuildToIde_BLACKLISTEDMODULES),$(2)),,$(call gb_Module__add_moduledir_impl,$(1),$(2))) + +endef + endif # vim: set noet ts=4 sw=4: |