[Libreoffice-commits] core.git: 6 commits - instsetoo_native/util Makefile.in odk/Zip_odkcommon.mk odk/Zip_odkexamples.mk solenv/gbuild
David Tardon
dtardon at redhat.com
Sun Mar 31 11:40:00 PDT 2013
Makefile.in | 3 +-
instsetoo_native/util/openoffice.lst.in | 4 +--
odk/Zip_odkcommon.mk | 12 ----------
odk/Zip_odkexamples.mk | 11 ---------
solenv/gbuild/AllLangResTarget.mk | 9 +------
solenv/gbuild/ComponentTarget.mk | 7 -----
solenv/gbuild/Configuration.mk | 38 --------------------------------
solenv/gbuild/Helper.mk | 7 ++++-
solenv/gbuild/Jar.mk | 2 -
solenv/gbuild/Library.mk | 2 -
solenv/gbuild/Pagein.mk | 6 +----
solenv/gbuild/Pyuno.mk | 3 +-
solenv/gbuild/Rdb.mk | 12 ----------
solenv/gbuild/UnpackedTarball.mk | 2 -
solenv/gbuild/Zip.mk | 2 -
solenv/gbuild/ZipPackage.mk | 8 ------
solenv/gbuild/ZipUnoApi.mk | 5 ----
17 files changed, 22 insertions(+), 111 deletions(-)
New commits:
commit 911989ae03937ee716a6c1833b2593540500ba59
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 31 20:32:35 2013 +0200
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
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index f2076cc..c6afdbd 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 a68aaff..11827bd 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 048370f..ed9ee29 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 bc016ae..612486c 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 d6bd3b9..6145a5e 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
commit 56f1ec87d26ffcd970ab4225e1652a7a698a845c
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 31 15:01:40 2013 +0200
do not deliver unneeded zips
Change-Id: I00ac0593e94203994bd3626c6ebb6d5b97441aa6
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index b0d2984..3384eed8 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -35,9 +35,10 @@ $(call gb_Pyuno_get_clean_target,%) :
rm -f $(call gb_Pyuno_get_target,$*) $(call gb_Pyuno_get_outdir_target,$*)
define gb_Pyuno_Pyuno
-$(call gb_Zip_Zip,Pyuno/$(1),$(2))
+$(call gb_Zip_Zip_internal_nodeliver,Pyuno/$(1),$(2))
$$(eval $$(call gb_Module_register_target,$(call gb_Pyuno_get_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Pyuno)
+$(call gb_Deliver_add_deliverable,$(call gb_Pyuno_get_outdir_target,$(1)),$(call gb_Zip_get_target,Pyuno/$(1)),$(1))
$(call gb_Pyuno_get_target,$(1)) : $(call gb_Pyuno_get_outdir_target,$(1))
$(call gb_Pyuno_get_outdir_target,$(1)) : $(call gb_Zip_get_target,Pyuno/$(1))
$(call gb_Pyuno_get_outdir_target,$(1)) :| $(dir $(call gb_Pyuno_get_outdir_target,$(1))).dir
diff --git a/solenv/gbuild/ZipPackage.mk b/solenv/gbuild/ZipPackage.mk
index 1691214..bc016ae 100644
--- a/solenv/gbuild/ZipPackage.mk
+++ b/solenv/gbuild/ZipPackage.mk
@@ -17,7 +17,7 @@ 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,$(1),$(WORKDIR)/Zip/$(1))
+$(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 $$< $$@
diff --git a/solenv/gbuild/ZipUnoApi.mk b/solenv/gbuild/ZipUnoApi.mk
index 56e0c6a..d6bd3b9 100644
--- a/solenv/gbuild/ZipUnoApi.mk
+++ b/solenv/gbuild/ZipUnoApi.mk
@@ -14,7 +14,7 @@
define gb_ZipUnoApi_ZipUnoApi
$(call gb_UnoApi_UnoApi,$(1),$(2))
-$(call gb_Zip_Zip_internal,$(1),$(WORKDIR)/Zip/$(1))
+$(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 $$< $$@
commit e49111d67c062e37077dd515357d029c61745373
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 31 14:53:33 2013 +0200
add some missing deliverable registrations
Change-Id: I5d22ba89d64a2768666aa277222aadd4f2e879b4
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index 6acd4a8..1fe74c0 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -59,6 +59,7 @@ $(call gb_Pagein_get_target,$(1)) : OBJECTS :=
$(call gb_Pagein_get_target,$(1)) : $(realpath $(lastword $(MAKEFILE_LIST)))
$$(eval $$(call gb_Module_register_target,$(call gb_Pagein_get_outdir_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Pagein,$(call gb_Pagein_get_outdir_target,$(1)))
+$(call gb_Deliver_add_deliverable,$(call gb_Pagein_get_outdir_target,$(1)),$(call gb_Pagein_get_target,$(1)),$(1))
$(call gb_Pagein_get_outdir_target,$(1)) : $(call gb_Pagein_get_target,$(1))
$(call gb_Pagein_get_outdir_target,$(1)) :| $(dir $(call gb_Pagein_get_outdir_target,$(1))).dir
diff --git a/solenv/gbuild/ZipPackage.mk b/solenv/gbuild/ZipPackage.mk
index 34c6b1d..1691214 100644
--- a/solenv/gbuild/ZipPackage.mk
+++ b/solenv/gbuild/ZipPackage.mk
@@ -25,6 +25,7 @@ $(call gb_Zip_get_outdir_bin_target,$(1)) :| $(dir $(call gb_Zip_get_outdir_bin_
$(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 8e76dff..56e0c6a 100644
--- a/solenv/gbuild/ZipUnoApi.mk
+++ b/solenv/gbuild/ZipUnoApi.mk
@@ -21,6 +21,7 @@ $(call gb_Zip_get_outdir_bin_target,$(1)) : $(call gb_Zip_get_target,$(1))
$(call gb_Zip_get_outdir_bin_target,$(1)) :| $(dir $(call gb_Zip_get_outdir_bin_target,$(1))).dir
$(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
commit c752beca4fac6db2ca92f8aa4e77dd052f6cc26e
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 31 13:21:45 2013 +0200
drop setting unused var. on clean target
Change-Id: I860c45ab4de0636ed8e0301e70da66658e91ceb6
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 3223d04..b1a37de 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -49,7 +49,6 @@ $(call gb_Rdb_get_clean_target,%) :
define gb_Rdb_Rdb
$(call gb_Rdb_get_target,$(1)) : COMPONENTS :=
-$(call gb_Rdb_get_clean_target,$(1)) : COMPONENTS :=
$(call gb_Rdb_get_outdir_target,$(1)) : $(call gb_Rdb_get_target,$(1)) \
| $(dir $(call gb_Rdb_get_outdir_target,$(1))).dir
$(call gb_Deliver_add_deliverable,$(call gb_Rdb_get_outdir_target,$(1)),$(call gb_Rdb_get_target,$(1)),$(1))
@@ -61,7 +60,6 @@ endef
define gb_Rdb_add_component
$(call gb_Rdb_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2))
$(call gb_Rdb_get_target,$(1)) : COMPONENTS += $(2)
-$(call gb_Rdb_get_clean_target,$(1)) : COMPONENTS += $(2)
endef
commit 8370d0a6a952042152db62d6dfc3aeac2912dc80
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 31 13:18:57 2013 +0200
drop extraneous delivery rules
These destinations are already covered by the default delivery rules
created in Package.mk .
Change-Id: Idc77f01ef468223a23632f9fae02f7b14a35c7d9
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 629c310..9638d24 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -386,13 +386,6 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
$(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
rm -f $${RESPONSEFILE})
-$(call gb_ResTarget_get_outdir_target,%) :
- $(call gb_Deliver_deliver,$<,$@)
-
-$(call gb_ResTarget_get_unittest_target,%) :
- $(call gb_Helper_abbreviate_dirs,mkdir -p $(dir $@))
- $(call gb_Deliver_deliver,$<,$@)
-
define gb_ResTarget_ResTarget
$(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2)
$(call gb_ResTarget_get_target,$(1)) : LANGUAGE = $(3)
@@ -402,9 +395,11 @@ $(call gb_AllLangResTarget_get_clean_target,$(2)) : $(call gb_ResTarget_get_clea
$(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target,$(1))
$(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1))
+$(call gb_ResTarget_get_outdir_target,$(1)) :| $(dir $(call gb_ResTarget_get_outdir_target,$(1))).dir
$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1))
$(call gb_ResTarget_get_unittest_target,$(1)) : $(call gb_ResTarget_get_target,$(1))
+$(call gb_ResTarget_get_unittest_target,$(1)) :| $(dir $(call gb_ResTarget_get_unittest_target,$(1))).dir
$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_unittest_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1))
endef
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 313b185..94f4c8d 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -60,13 +60,6 @@ $(call gb_ComponentTarget_get_target,%) : \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_ComponentTarget__command,$@,$<,$*)
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_ComponentTarget_get_outdir_target,))%/.dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_ComponentTarget_get_outdir_target,%) :
- $(call gb_Deliver_deliver,$<,$@)
-
define gb_ComponentTarget_ComponentTarget
$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 65e9885..11b5f07 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -114,16 +114,6 @@ $(call gb_XcsTarget_get_clean_target,%) :
rm -f $(call gb_XcsTarget_get_target,$*) \
$(call gb_XcsTarget_get_outdir_target,$(XCSFILE)))
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_XcsTarget_get_outdir_target,%))%/.dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(dir $(call gb_XcsTarget_get_outdir_target,%)).dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_XcsTarget_get_outdir_target,%) :
- $(call gb_Helper_abbreviate_dirs,\
- $(call gb_Deliver_deliver,$<,$@))
-
# XcuDataTarget class
@@ -162,16 +152,6 @@ $(call gb_XcuDataTarget_get_clean_target,%) :
rm -f $(call gb_XcuDataTarget_get_target,$*) \
$(call gb_XcuDataTarget_get_outdir_target,$(XCUFILE)))
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_XcuDataTarget_get_outdir_target,))%/.dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(dir $(call gb_XcuDataTarget_get_outdir_target,)).dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_XcuDataTarget_get_outdir_target,%) :
- $(call gb_Helper_abbreviate_dirs,\
- $(call gb_Deliver_deliver,$<,$@))
-
# XcuModuleTarget class
@@ -206,14 +186,6 @@ $(call gb_XcuModuleTarget_get_clean_target,%) :
rm -f $(call gb_XcuModuleTarget_get_target,$*) \
$(call gb_XcuModuleTarget_get_outdir_target,$(XCUFILE)))
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_XcuModuleTarget_get_outdir_target,))%/.dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_XcuModuleTarget_get_outdir_target,%) :
- $(call gb_Helper_abbreviate_dirs,\
- $(call gb_Deliver_deliver,$<,$@))
-
# XcuLangpackTarget class
@@ -245,16 +217,6 @@ $(call gb_XcuLangpackTarget_get_clean_target,%) :
$(call gb_XcuLangpackTarget__get_target_with_lang,$*,$(lang)) \
$(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(XCUFILE),$(lang))))
-# the .dir is for make 3.81, which ignores trailing /
-$(dir $(call gb_XcuLangpackTarget_get_outdir_target,))%/.dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(dir $(call gb_XcuLangpackTarget_get_outdir_target,)).dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-$(call gb_XcuLangpackTarget_get_outdir_target,%) :
- $(call gb_Helper_abbreviate_dirs,\
- $(call gb_Deliver_deliver,$<,$@))
-
# XcuMergeTarget class
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index 146f1b5..6acd4a8 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -54,9 +54,6 @@ $(call gb_Pagein_get_clean_target,%) :
$(call gb_Pagein_get_target,%) :
$(call gb_Pagein__command,$@,$*,$^)
-$(call gb_Pagein_get_outdir_target,%) : $(call gb_Pagein_get_target,%)
- $(call gb_Deliver_deliver,$<,$@)
-
define gb_Pagein_Pagein
$(call gb_Pagein_get_target,$(1)) : OBJECTS :=
$(call gb_Pagein_get_target,$(1)) : $(realpath $(lastword $(MAKEFILE_LIST)))
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 7b57524..3223d04 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -47,14 +47,6 @@ $(call gb_Rdb_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Rdb_get_outdir_target,$*) $(call gb_Rdb_get_target,$*))
-# DO NOT DEFINE: it overwrites the definition from Package.mk for xml/
-# and doesn't work on 3.81
-#$(dir $(call gb_Rdb_get_outdir_target,))%/.dir :
-# mkdir -p $(dir $@)
-
-$(call gb_Rdb_get_outdir_target,%) :
- $(call gb_Deliver_deliver,$<,$@)
-
define gb_Rdb_Rdb
$(call gb_Rdb_get_target,$(1)) : COMPONENTS :=
$(call gb_Rdb_get_clean_target,$(1)) : COMPONENTS :=
commit ea18ca070284b16faabba063b72463590e7eb3ac
Author: David Tardon <dtardon at redhat.com>
Date: Sun Mar 31 11:34:10 2013 +0200
fix user-friendly targets' deps
An user-friendly target sometimes needs to depend on a different target
than gb_Classname_get_target to really build everything (esp. to deliver
the built product). The rule of thumb is: use the same target that is
used for gb_Module_register_targets.
Change-Id: I874751871b4569b2a68766cc3f3b5c7645347af0
diff --git a/Makefile.in b/Makefile.in
index 3b392e3d..f19de69 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -124,7 +124,8 @@ gbuild_TARGETS := AllLangHelp \
UnoApiMerge \
UnpackedTarball \
WinResTarget \
- Zip
+ Zip \
+ ZipPackage
# build a generic gbuild target
$(foreach target,$(gbuild_TARGETS),$(target)_% $(foreach module,$(gbuild_modules),$(target)_$(module)/%)):
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 0a732c2..64876e4 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -106,10 +106,13 @@ $$(subst $(OUTDIR)/,$(WORKDIR)/Clean/OutDir/,$(1))
endef
# e.g. 'make CppunitTest_sw_macros_test'
+#
+# gb_Helper_make_userfriendly_targets target class build-target? clean-target?
define gb_Helper_make_userfriendly_targets
.PHONY: $(2)_$(1) $(2)_$(1).clean
-$(2)_$(1) : $(call gb_$(2)_get_target,$(1))
-$(2)_$(1).clean : $(call gb_$(2)_get_clean_target,$(1))
+$(2)_$(1) : $(if $(3),$(3),$(call gb_$(2)_get_target,$(1)))
+$(2)_$(1).clean : $(if $(4),$(4),$(call gb_$(2)_get_clean_target,$(1)))
+
endef
define gb_Helper_init_registries
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index ff40b3b..12b9d16 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -97,7 +97,7 @@ $(call gb_Jar_get_target,$(1)) : PACKAGEDIRS :=
$(call gb_Jar_get_target,$(1)) : PACKAGEFILES :=
$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)))
$(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),Jar)
+$(call gb_Helper_make_userfriendly_targets,$(1),Jar,$(call gb_Jar_get_outdir_target,$(1)))
$(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)),$(1))
$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))
$(call gb_Jar_get_outdir_target,$(1)) :| $(dir $(call gb_Jar_get_outdir_target,$(1))).dir
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index b5a9b4f..7f62315 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -73,7 +73,7 @@ $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target
$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS :=
$(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1)))
$$(eval $$(call gb_Module_register_target,$(call gb_Library__get_final_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),Library)
+$(call gb_Helper_make_userfriendly_targets,$(1),Library,$(call gb_Library__get_final_target,$(1)))
$(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
endef
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index e499946..146f1b5 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -61,7 +61,7 @@ define gb_Pagein_Pagein
$(call gb_Pagein_get_target,$(1)) : OBJECTS :=
$(call gb_Pagein_get_target,$(1)) : $(realpath $(lastword $(MAKEFILE_LIST)))
$$(eval $$(call gb_Module_register_target,$(call gb_Pagein_get_outdir_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),Pagein)
+$(call gb_Helper_make_userfriendly_targets,$(1),Pagein,$(call gb_Pagein_get_outdir_target,$(1)))
$(call gb_Pagein_get_outdir_target,$(1)) : $(call gb_Pagein_get_target,$(1))
$(call gb_Pagein_get_outdir_target,$(1)) :| $(dir $(call gb_Pagein_get_outdir_target,$(1))).dir
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index bcaa3ff..7b57524 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -63,7 +63,7 @@ $(call gb_Rdb_get_outdir_target,$(1)) : $(call gb_Rdb_get_target,$(1)) \
$(call gb_Deliver_add_deliverable,$(call gb_Rdb_get_outdir_target,$(1)),$(call gb_Rdb_get_target,$(1)),$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_Rdb_get_outdir_target,$(1)),$(call gb_Rdb_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),Rdb)
+$(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(call gb_Rdb_get_outdir_target,$(1)))
endef
define gb_Rdb_add_component
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index e6ed638..d201996 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -220,7 +220,7 @@ define gb_UnpackedTarball_UnpackedTarball
$(call gb_UnpackedTarball_UnpackedTarball_internal,$(1))
$$(eval $$(call gb_Module_register_target,$(call gb_UnpackedTarball_get_final_target,$(1)),$(call gb_UnpackedTarball_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),UnpackedTarball)
+$(call gb_Helper_make_userfriendly_targets,$(1),UnpackedTarball,$(call gb_UnpackedTarball_get_final_target,$(1)))
endef
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index 4f8b139..ace9457 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -95,7 +95,7 @@ $(call gb_Zip_Zip_internal,$(1),$(2))
$(call gb_Zip_get_target,$(1)) : $(lastword $(MAKEFILE_LIST))
$(eval $(call gb_Module_register_target,$(call gb_Zip_get_final_target,$(1)),$(call gb_Zip_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),Zip)
+$(call gb_Helper_make_userfriendly_targets,$(1),Zip,$(call gb_Zip_get_final_target,$(1)))
endef
More information about the Libreoffice-commits
mailing list