[Libreoffice-commits] core.git: 3 commits - solenv/gbuild

[David Tardon]

 solenv/gbuild/AllLangHelp.mk |    1 +
 solenv/gbuild/HelpTarget.mk  |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 26ea7f4deb2470f59717539a63f8685b1d257bf0
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Feb 27 15:55:32 2013 +0100

    pack .cfg and .tree files
    
    Change-Id: I2a7936c9c71d65482281816720b20b920c2e3e74

diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index daafb5f..ed5b43f 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -609,6 +609,7 @@ endef
 # gb_HelpTarget_set_configdir target configdir
 define gb_HelpTarget_set_configdir
 $(call gb_HelpLinkTarget_set_configdir,$(1),$(SRCDIR)/$(2))
+$(call gb_HelpTarget__add_file,$(1),$(call gb_HelpTarget__get_module,$(1)).cfg)
 
 endef
 
@@ -625,6 +626,7 @@ $(if $(call gb_HelpTarget__is_default_lang,$(1)),,\
 	$(call gb_HelpTreeTarget_set_helptextdir,$(1),$(call gb_HelpTarget__get_helpdir,$(1),$(3))) \
 )
 $(call gb_HelpLinkTarget_set_treefile,$(1),$(call gb_HelpTarget__get_treefile,$(1),$(2)))
+$(call gb_HelpTarget__add_file,$(1),$(call gb_HelpTarget__get_module,$(1)).tree)
 
 endef
 
commit bc31afa905fbcb29db9330adf3e0ac5867b9531b
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Feb 27 14:30:54 2013 +0100

    actually pack the help jar
    
    Change-Id: Iec3ca941d16cdfd52711a3effb96c865cbd24069

diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index d1a8d6d..daafb5f 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -630,7 +630,7 @@ endef
 
 # gb_HelpTarget__add_jar target
 define gb_HelpTarget__add_jar
-$(call gb_HelpTarget__add_file,$(1),$(call gb_HelpTarget__get_module,$(2)).jar)
+$(call gb_HelpTarget__add_file,$(1),$(call gb_HelpTarget__get_module,$(1)).jar)
 $(call gb_HelpJarTarget_get_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1))
 $(call gb_HelpTarget_get_packing_target,$(1)) : $(call gb_HelpJarTarget_get_target,$(1))
 $(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpJarTarget_get_clean_target,$(1))
commit 053b98a38a3c020361ed109687736f8dac239732
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Feb 27 14:11:28 2013 +0100

    make sure that outdir exists
    
    Change-Id: Id481219cae8af1cea90dbc0f1d28f6a6483927d8

diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk
index 143f6bc..dd03395 100644
--- a/solenv/gbuild/AllLangHelp.mk
+++ b/solenv/gbuild/AllLangHelp.mk
@@ -55,6 +55,7 @@ $(call gb_HelpTarget_set_configdir,$(3),$(gb_AllLangHelp_AUXDIR))
 $(call gb_HelpTarget_set_helpdir,$(3),$(gb_AllLangHelp_HELPDIR))
 
 $(call gb_HelpTarget_get_outdir_target,$(4)) : $(call gb_HelpTarget_get_zipfile,$(3))
+$(call gb_HelpTarget_get_outdir_target,$(4)) :| $(dir $(call gb_HelpTarget_get_outdir_target,$(4))).dir
 $(call gb_AllLangHelp_get_target,$(1)) : $(call gb_HelpTarget_get_outdir_target,$(4))
 $(call gb_AllLangHelp_get_target,$(1)) : $(call gb_HelpTarget_get_target,$(3))
 $(call gb_AllLangHelp_get_clean_target,$(1)) : $(call gb_HelpTarget_get_clean_target,$(3))