diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-25 18:40:48 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-25 23:31:30 +0200 |
| commit | 461d830ed8f664e171245b0cf9d53dc33a0f04d2 (patch) | |
| tree | 6ff4a44bbeb727a977675d1b90da2cfa890de4ef /solenv | |
| parent | 15a9ef2147e2cdcc1ec5bb2f63e0154bcd5fa651 (diff) | |
stop using apache-commons jars from OUTDIR too
Change-Id: I0d9282cd3a267ad2d25b43adbf995365aaa56fa1
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Extension.mk | 9 | ||||
| -rw-r--r-- | solenv/gbuild/Jar.mk | 12 | ||||
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 6 |
3 files changed, 25 insertions, 2 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index da5be96e1299..d98259eb53f1 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -278,6 +278,15 @@ $(call gb_Extension__get_preparation_target,$(1)) \ endef +# Add a dependency on an ExternalProject. +# +# call gb_Extension_use_external_project,extension,externalproject +define gb_Extension_use_external_project +$(call gb_Extension__get_preparation_target,$(1)) \ + :| $(call gb_ExternalProject_get_target,$(2)) + +endef + define gb_Extension_use_package $(call gb_Extension__get_preparation_target,$(1)) \ :| $(call gb_Package_get_target,$(2)) diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 2c6ba148a711..62e33d537916 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -221,10 +221,11 @@ $(call gb_Jar_add_manifest_classpath,$(1),$(call gb_Helper_make_url,$(2))) endef +# call gb_Jar_use_external_jar,jar,externaljarfullpath,manifestentry define gb_Jar_use_external_jar +$(if $(3),,$(call gb_Output_error,gb_Jar_use_external_jar: manifest entry missing)) $(call gb_JavaClassSet_use_system_jar,$(call gb_Jar_get_classsetname,$(1)),$(2)) -$(call gb_Jar_add_manifest_classpath,$(1),$(notdir $(2))) -$(call gb_Jar_get_target,$(1)) : $(2) +$(call gb_Jar_add_manifest_classpath,$(1),$(3)) endef @@ -283,6 +284,13 @@ $(foreach customtarget,$(2),$(call gb_Jar_use_customtarget,$(1),$(customtarget)) endef +# Add a dependency on an ExternalProject. +# +# call gb_Jar_use_external_project,jar,externalproject +define gb_Jar_use_external_project +$(call gb_JavaClassSet_use_external_project,$(call gb_Jar_get_classsetname,$(1)),$(2)) +endef + # possible directories for jar files containing UNO services gb_Jar_COMPONENTPREFIXES := \ OOO:vnd.sun.star.expand:\dLO_JAVA_DIR/ \ diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 806300820d3a..5d967493f786 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -197,4 +197,10 @@ $(call gb_JavaClassSet_add_classpath,$(1),$(call gb_CustomTarget_get_workdir,$(2 endef +define gb_JavaClassSet_use_external_project +$(call gb_JavaClassSet_get_preparation_target,$(1)) : \ + $(call gb_ExternalProject_get_target,$(2)) + +endef + # vim: set noet sw=4: |