diff options
author | David Tardon <dtardon@redhat.com> | 2011-12-20 15:30:38 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-12-23 16:42:59 +0100 |
commit | 07a87420ade12155b14be40e38a09a9ad0061719 (patch) | |
tree | dda0df97299e3aaaa01eacee87a5cf4e2b2000be | |
parent | don't hide images in menus (fdo#31471, fdo#41264) (diff) | |
download | core-07a87420ade12155b14be40e38a09a9ad0061719.tar.gz core-07a87420ade12155b14be40e38a09a9ad0061719.zip |
eval at the calling side, like other gbuild classes
-rw-r--r-- | filter/Jar_XSLTFilter.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/Jar.mk | 12 | ||||
-rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 29 |
3 files changed, 30 insertions, 13 deletions
diff --git a/filter/Jar_XSLTFilter.mk b/filter/Jar_XSLTFilter.mk index d68b3530370d..da798a4f445a 100644 --- a/filter/Jar_XSLTFilter.mk +++ b/filter/Jar_XSLTFilter.mk @@ -26,7 +26,7 @@ $(eval $(call gb_Jar_add_jars,XSLTFilter,\ $(OUTDIR)/bin/juh.jar \ )) -$(call gb_Jar_use_externals,XSLTFilter,saxon) +$(eval $(call gb_Jar_use_externals,XSLTFilter,saxon)) $(eval $(call gb_Jar_set_componentfile,XSLTFilter,filter/source/xsltfilter/XSLTFilter.jar,OOO)) diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 6a108ba7e1a3..36e5112b911d 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -96,11 +96,13 @@ endef # source files are forwarded to the ClassSet define gb_Jar_add_sourcefile $(call gb_JavaClassSet_add_sourcefile,$(call gb_Jar_get_classsetname,$(1)),$(2)) + endef # PACKAGEROOTS is the list of all root folders to pack into the jar (without META-INF as this is added automatically) define gb_Jar_set_packageroot $(call gb_Jar_get_target,$(1)) : PACKAGEROOTS := $(2) + endef # PACKAGEFILES is the list of all root files to pack into the jar @@ -115,16 +117,18 @@ endef define gb_Jar_add_sourcefiles $(foreach sourcefile,$(2),$(call gb_Jar_add_sourcefile,$(1),$(sourcefile))) + endef define gb_JarTest_set_classpath $(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(2)) + endef # JARCLASSPATH is the class path that is written to the manifest of the jar define gb_Jar_set_jarclasspath - $(call gb_Jar_get_target,$(1)) : JARCLASSPATH := $(2) + endef # provide a manifest template containing jar specific information to be written into the manifest @@ -139,27 +143,33 @@ endef # remember: classpath is "inherited" to ClassSet define gb_Jar_add_jar $(call gb_JavaClassSet_add_jar,$(call gb_Jar_get_classsetname,$(1)),$(2)) + endef define gb_Jar_add_system_jar $(call gb_JavaClassSet_add_system_jar,$(call gb_Jar_get_classsetname,$(1)),$(2)) + endef # specify jars with imported modules define gb_Jar_add_jars $(call gb_JavaClassSet_add_jars,$(call gb_Jar_get_classsetname,$(1)),$(2)) + endef define gb_Jar_add_system_jars $(call gb_JavaClassSet_add_system_jars,$(call gb_Jar_get_classsetname,$(1)),$(2)) + endef define gb_Jar_use_external $(call gb_JavaClassSet_use_external,$(call gb_Jar_get_classsetname,$(1)),$(2)) + endef define gb_Jar_use_externals $(call gb_JavaClassSet_use_externals,$(call gb_Jar_get_classsetname,$(1)),$(2)) + endef # possible directories for jar files containing UNO services diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 4c8d7cfc5603..61cb4e83bc31 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -62,6 +62,7 @@ $(call gb_JavaClassSet_get_clean_target,%) : define gb_JavaClassSet_JavaClassSet $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := + endef define gb_JavaClassSet__get_sourcefile @@ -69,8 +70,8 @@ $(SRCDIR)/$(1).java endef define gb_JavaClassSet_add_sourcefile -$(eval $(call gb_JavaClassSet_get_target,$(1)) : \ - $(call gb_JavaClassSet__get_sourcefile,$(2))) +$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet__get_sourcefile,$(2)) + endef define gb_JavaClassSet_add_sourcefiles @@ -79,42 +80,48 @@ $(foreach sourcefile,$(2),$(call gb_JavaClassSet_add_sourcefile,$(1),$(sourcefil endef define gb_JavaClassSet_set_classpath -$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2)) +$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $(2) endef # problem: currently we can't get these dependencies to work # build order dependency is a hack to get these prerequisites out of the way in the build command define gb_JavaClassSet_add_jar -$(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2)) -$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2))) -$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)) +$(call gb_JavaClassSet_get_target,$(1)) : $(2) +$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2)) +$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2) + endef # this does not generate dependency on the jar define gb_JavaClassSet_add_system_jar -$(eval $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2))) -$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)) +$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2)) +$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2) + endef define gb_JavaClassSet_add_jars $(foreach jar,$(2),$(call gb_JavaClassSet_add_jar,$(1),$(jar))) + endef define gb_JavaClassSet_add_system_jars $(foreach jar,$(2),$(call gb_JavaClassSet_add_system_jar,$(1),$(jar))) + endef # this forwards to functions that must be defined in RepositoryExternal.mk. -# $(call gb_LinkTarget_use_external,library,external) +# $(eval $(call gb_LinkTarget_use_external,library,external)) define gb_JavaClassSet_use_external -$(eval $(if $(value gb_JavaClassSet__use_$(2)),\ +$(if $(value gb_JavaClassSet__use_$(2)),\ $(call gb_JavaClassSet__use_$(2),$(1)),\ - $(error gb_JavaClassSet_use_external: unknown external: $(2)))) + $(error gb_JavaClassSet_use_external: unknown external: $(2))) + endef define gb_JavaClassSet_use_externals $(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external))) + endef # vim: set noet sw=4: |