[Libreoffice-commits] .: 2 commits - apache-commons/ExternalProject_apache_commons_logging.mk solenv/gbuild

[Libreoffice Gerrit user]

 apache-commons/ExternalProject_apache_commons_logging.mk |    7 +++++
 solenv/gbuild/ExternalProject.mk                         |   19 +++++++++++++++
 2 files changed, 26 insertions(+)

New commits:
commit b041f920d3156b686b5b66125200da104530d892
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Oct 4 08:35:00 2012 +0200

    commons-logging uses tomcat, so it should depend on it
    
    Change-Id: Ic0ad26494081c58c01a4f8ecd004d0c289a704e8

diff --git a/apache-commons/ExternalProject_apache_commons_logging.mk b/apache-commons/ExternalProject_apache_commons_logging.mk
index fce2635..bc5b18b 100644
--- a/apache-commons/ExternalProject_apache_commons_logging.mk
+++ b/apache-commons/ExternalProject_apache_commons_logging.mk
@@ -14,6 +14,13 @@ $(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging))
 
 $(eval $(call gb_ExternalProject_use_unpacked,apache_commons_logging,apache_commons_logging))
 
+# TODO: this should go into RepositoryExternal.mk
+ifeq ($(SYSTEM_TOMCAT),YES)
+$(eval $(call gb_ExternalProject_use_packages,apache_commons_logging,\
+	tomcat_inc \
+))
+endif
+
 $(eval $(call gb_ExternalProject_register_targets,apache_commons_logging,\
 	build \
 ))
commit 3c68b623660d43ef22141f46dec465f0c56859e8
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Oct 4 08:33:12 2012 +0200

    add gb_ExternalProject_use_package(s)
    
    There needs to be a way to depend on the output of other external
    packages.
    
    Change-Id: Ic0f200b6d6b6c0968a28434ba96f1a2f1efa527e

diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index d35d238..0680d75 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -109,4 +109,23 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_ExternalProje
 
 endef
 
+# Make an external project depend on a package
+#
+# This is most useful for depending on output files created by another
+# ExternalProject.
+#
+# gb_ExternalProject_use_package external package
+define gb_ExternalProject_use_package
+$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_Package_get_target,$(2))
+
+endef
+
+# Make an external project depend on several packages at once
+#
+# gb_ExternalProject_use_packages external package(s)
+define gb_ExternalProject_use_packages
+$(foreach package,$(2),$(call gb_ExternalProject_use_package,$(1),$(package)))
+
+endef
+
 # vim: set noet sw=4 ts=4: