diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-11-22 21:21:57 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-11-22 21:25:21 +0100 |
| commit | ab9c578ed17cfd9c9a49f22d83f33b0546faedba (patch) | |
| tree | cea15f86892172bd24380f7d65e1fa104bb91bbe /solenv/gbuild/extensions/post_GbuildToIde.mk | |
| parent | 9b910bd62eaf000171c669692c40056ff47e4d76 (diff) | |
Revert "improvements to gbuildtoide"
This reverts commit 294bfdfaada9ba85ddcf853650a8da9c10f25281.
Unfortunately this shutil.copytree(self.srcdirnative, self.tempsrc)
copies the entire SOURCEROOT into /tmp, with WORKDIR too if it's not
an out-of-tree build, which is quite an excessive use of space,
tmpfs or otherwise, and will no doubt make CI very happy.
Diffstat (limited to 'solenv/gbuild/extensions/post_GbuildToIde.mk')
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToIde.mk | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/solenv/gbuild/extensions/post_GbuildToIde.mk b/solenv/gbuild/extensions/post_GbuildToIde.mk index fd5ca1992ad1..47d0779d0903 100644 --- a/solenv/gbuild/extensions/post_GbuildToIde.mk +++ b/solenv/gbuild/extensions/post_GbuildToIde.mk @@ -88,33 +88,14 @@ $(call gb_LinkTarget__add_include,$(1),$(call gb_CustomTarget_get_workdir,$(2))) endef - -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 +$(if $(filter Library_% Executable_%,$(2)),$(call gb_Module__read_targetfile,$(1),$(2),target)) -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)) +$(if $(filter Library_% Executable_%,$(2)),$(call gb_Module_get_nonl10n_target,$(1)) : $$(gb_Module_CURRENTTARGET)) endef -define gb_Module_add_moduledir -$(if $(filter $(gb_GbuildToIde_BLACKLISTEDMODULES),$(2)),,$(call gb_Module__add_moduledir_impl,$(1),$(2))) - -endef +gb_Module_add_l10n_target = endif |