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

5 files changed, 6 insertions, 40 deletions

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index f2076ccef140..c6afdbdce070 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -179,7 +179,7 @@ LibreOffice_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarenvpath}/{os}/MS
+        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS
     }
 }
 
@@ -224,7 +224,7 @@ LibreOffice_Dev_SDK
         active 1
         compression 5
         script sdkoo
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarenvpath}/{os}/MS
+        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/sdkoo,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarenvpath}/{os}/MS
     }
 }
 
diff --git a/odk/Zip_odkcommon.mk b/odk/Zip_odkcommon.mk
index a68aaffee679..11827bda39d5 100644
--- a/odk/Zip_odkcommon.mk
+++ b/odk/Zip_odkcommon.mk
@@ -20,16 +20,4 @@ $(eval $(call gb_Zip_add_commandoptions,odkcommon,-r))
 # dependencies which custom targets need to be built.
 $(call gb_Zip_get_target,odkcommon) : $(odkcommon_ZIPDEPS)
 
-#FIXME: scp2 seems to require the zip to be in bin
-$(call gb_Zip_get_final_target,odkcommon) : $(OUTDIR)/bin/odkcommon.zip
-$(call gb_Zip_get_clean_target,odkcommon) : clean_odkcommon_zip
-
-$(OUTDIR)/bin/odkcommon.zip : $(call gb_Zip_get_target,odkcommon)
-	$(call gb_Deliver_deliver,$<,$@)
-
-.PHONY : clean_odkcommon_zip
-clean_odkcommon_zip:
-	rm -f $(OUTDIR)/bin/odkcommon.zip
-
-
 # vim: set noet sw=4 ts=4:
diff --git a/odk/Zip_odkexamples.mk b/odk/Zip_odkexamples.mk
index 048370ffee73..ed9ee29f9812 100644
--- a/odk/Zip_odkexamples.mk
+++ b/odk/Zip_odkexamples.mk
@@ -25,15 +25,4 @@ $(eval $(call gb_Zip_add_files,odkexamples,\
 	examples \
 ))
 
-#FIXME: scp2 seems to require the zip to be in bin
-$(call gb_Zip_get_final_target,odkexamples) : $(OUTDIR)/bin/odkexamples.zip | $(OUTDIR)/bin/.dir
-$(call gb_Zip_get_clean_target,odkexamples) : clean_odkexamples_zip
-
-$(OUTDIR)/bin/odkexamples.zip : $(call gb_Zip_get_target,odkexamples)
-	$(call gb_Deliver_deliver,$<,$@)
-
-.PHONY : clean_odkexamples_zip
-clean_odkexamples_zip:
-	rm -f $(OUTDIR)/bin/odkexamples.zip
-
 # vim: set noet sw=4 ts=4:
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