diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-23 09:56:58 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-16 10:45:58 +0200 |
| commit | 47c2ec8355252c3a5d9cf4edb248faf99b556b7c (patch) | |
| tree | ce097c83cbf356f213ee52c1afa49b9acf93053c /solenv/gbuild/Jar.mk | |
| parent | 6ff09fd588059fe2b8502222e217e34eab177c2a (diff) | |
CWS gnumake4: some improvements for zip+jar, documentation
Diffstat (limited to 'solenv/gbuild/Jar.mk')
| -rw-r--r-- | solenv/gbuild/Jar.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index a719d73bb1aa..7404b39e0d3b 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -60,11 +60,15 @@ $(call gb_Jar_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(ca rm -f $(call gb_Jar_get_final_target,$*) && \ rm -f $(call gb_Jar_get_outdir_target,$*)) -# resets scoped variables +$(call gb_Jar_get_final_target,%) : $(call gb_Jar_get_outdir_target,%) + $(call gb_Helper_abbreviate_dirs,\ + touch $@) + +# resets scoped variables (see explanations where they are set) # creates a class set and a dependency to it # registers target and clean target -# creates a rule to move common jar files to solver when needed -# adds jar files to DeliverTarget +# adds jar files to DeliverLogTarget +# creates a deliver rule define gb_Jar_Jar $(call gb_Jar_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH) @@ -76,10 +80,6 @@ $(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1))) $(call gb_Jar_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(1))) $$(call gb_Jar__command,$(1),$$@,$$*,$$?) -$(call gb_Jar_get_final_target,$(1)) : $(call gb_Jar_get_outdir_target,$(1)) - $$(call gb_Helper_abbreviate_dirs,\ - touch $$@) - $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1)) $(call gb_Helper_abbreviate_dirs,\ $$(call gb_Deliver_deliver,$$<,$$@)) @@ -95,6 +95,7 @@ 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 |