diff options
| author | David Tardon <dtardon@redhat.com> | 2013-03-31 20:32:35 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-03-31 20:39:20 +0200 |
| commit | 911989ae03937ee716a6c1833b2593540500ba59 (patch) | |
| tree | e1f8bbf25c80621eea633f3b011f7e9288e96f0a /solenv/gbuild | |
| parent | 56f1ec87d26ffcd970ab4225e1652a7a698a845c (diff) | |
add $OUTDIR/pck to search path for SDK product
... so it is possible to drop the copying-to-bin hack in ZipPackage.mk
and ZipUnoApi.mk .
Change-Id: Ic506e25a21003fca491d0902b5d8f282775da229
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/ZipPackage.mk | 11 | ||||
| -rw-r--r-- | solenv/gbuild/ZipUnoApi.mk | 8 |
2 files changed, 4 insertions, 15 deletions
diff --git a/solenv/gbuild/ZipPackage.mk b/solenv/gbuild/ZipPackage.mk index bc016aed3126..612486c25e0e 100644 --- a/solenv/gbuild/ZipPackage.mk +++ b/solenv/gbuild/ZipPackage.mk @@ -12,20 +12,13 @@ # scp2 can easily deal with zip files but not so easily with 100s of # individual files; ideally the Package itself should be sufficient. -# sigh... WTF does that scp2/installer look for these in bin and not pck??? -gb_Zip_get_outdir_bin_target = $(OUTDIR)/bin/$(1).zip - define gb_ZipPackage_ZipPackage $(call gb_Package_Package,$(1),$(2)) -$(call gb_Zip_Zip_internal_nodeliver,$(1),$(WORKDIR)/Zip/$(1)) -$(call gb_Package_get_target,$(1)) : $(call gb_Zip_get_outdir_bin_target,$(1)) -$(call gb_Zip_get_outdir_bin_target,$(1)) : $(call gb_Zip_get_target,$(1)) - cp $$< $$@ -$(call gb_Zip_get_outdir_bin_target,$(1)) :| $(dir $(call gb_Zip_get_outdir_bin_target,$(1))).dir +$(call gb_Zip_Zip_internal,$(1),$(WORKDIR)/Zip/$(1)) +$(call gb_Package_get_target,$(1)) : $(call gb_Zip_get_final_target,$(1)) $(call gb_Package_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(1)) $(call gb_ZipPackage_get_target,$(1)) : $(call gb_Package_get_target,$(1)) $(call gb_Helper_make_userfriendly_targets,$(1),ZipPackage) -$(call gb_Deliver_add_deliverable,$(call gb_Zip_get_outdir_bin_target,$(1)),$(call gb_Zip_get_target,$(1)),$(1)) endef diff --git a/solenv/gbuild/ZipUnoApi.mk b/solenv/gbuild/ZipUnoApi.mk index d6bd3b95a247..6145a5ed9d47 100644 --- a/solenv/gbuild/ZipUnoApi.mk +++ b/solenv/gbuild/ZipUnoApi.mk @@ -14,14 +14,10 @@ define gb_ZipUnoApi_ZipUnoApi $(call gb_UnoApi_UnoApi,$(1),$(2)) -$(call gb_Zip_Zip_internal_nodeliver,$(1),$(WORKDIR)/Zip/$(1)) -$(call gb_UnoApi_get_target,$(1)) : $(call gb_Zip_get_outdir_bin_target,$(1)) -$(call gb_Zip_get_outdir_bin_target,$(1)) : $(call gb_Zip_get_target,$(1)) - cp $$< $$@ -$(call gb_Zip_get_outdir_bin_target,$(1)) :| $(dir $(call gb_Zip_get_outdir_bin_target,$(1))).dir +$(call gb_Zip_Zip_internal,$(1),$(WORKDIR)/Zip/$(1)) +$(call gb_UnoApi_get_target,$(1)) : $(call gb_Zip_get_final_target,$(1)) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(1)) $(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Zip_get_target,$(1)) -$(call gb_Deliver_add_deliverable,$(call gb_Zip_get_outdir_bin_target,$(1)),$(call gb_Zip_get_target,$(1)),$(1)) endef |