[Libreoffice-commits] .: Branch 'libreoffice-3-4' - instsetoo_native/util

[Andras Timar]

 instsetoo_native/util/makefile.mk |   24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 2c236fcf883383e98d5f10fd1e52b7543742c874
Author: Andras Timar <atimar at novell.com>
Date:   Fri Apr 29 08:09:29 2011 +0200

    do not pack empty help packs

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 470d562..d4fa58a 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -76,6 +76,10 @@ LOCALPYFILES= \
     $(BIN)$/mailmerge.py
 .ENDIF
 
+help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
+
+allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j  $i $(NULL))))
+
 xxxx:
     echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml
 
@@ -129,9 +133,9 @@ ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
 
 ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
 
-ooohelppack : $(foreach,i,$(alllangiso) ooohelppack_$i)
+ooohelppack : $(foreach,i,$(allhelplangiso) ooohelppack_$i)
 
-ooodevhelppack: $(foreach,i,$(alllangiso) ooodevhelppack_$i)
+ooodevhelppack: $(foreach,i,$(allhelplangiso) ooodevhelppack_$i)
 
 sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
 
@@ -153,7 +157,7 @@ oxygenofficewithjre: $(foreach,i,$(alllangiso) oxygenofficewithjre_$i)
 
 oxygenofficelanguagepack : $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i)
 
-oxygenofficehelppack : $(foreach,i,$(alllangiso) oxygenofficehelppack_$i)
+oxygenofficehelppack : $(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i)
 
 MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
 MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
@@ -192,9 +196,9 @@ $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $(ADDDEPS)
 
 $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $(ADDDEPS)
 
-$(foreach,i,$(alllangiso) ooohelppack_$i) : $(ADDDEPS)
+$(foreach,i,$(allhelplangiso) ooohelppack_$i) : $(ADDDEPS)
 
-$(foreach,i,$(alllangiso) ooodevhelppack_$i) : $(ADDDEPS)
+$(foreach,i,$(allhelplangiso) ooodevhelppack_$i) : $(ADDDEPS)
 
 $(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
 
@@ -216,7 +220,7 @@ $(foreach,i,$(alllangiso) oxygenofficewithjre_$i) : $(ADDDEPS)
 
 $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $(ADDDEPS)
 
-$(foreach,i,$(alllangiso) oxygenofficehelppack_$i) : $(ADDDEPS)
+$(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i) : $(ADDDEPS)
 
 .IF "$(MAKETARGETS)"!=""
 $(MAKETARGETS) : $(ADDDEPS)
@@ -252,11 +256,11 @@ $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-$(foreach,i,$(alllangiso) ooohelppack_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(allhelplangiso) ooohelppack_$i) : $$@{$(PKGFORMAT:^".")}
 ooohelppack_%{$(PKGFORMAT:^".")} :
     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-$(foreach,i,$(alllangiso) ooodevhelppack_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(allhelplangiso) ooodevhelppack_$i) : $$@{$(PKGFORMAT:^".")}
 ooodevhelppack_%{$(PKGFORMAT:^".")} :
     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
 
@@ -322,13 +326,13 @@ $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
 oxygenofficelanguagepack_%{$(PKGFORMAT:^".")} :
     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
 
-$(foreach,i,$(alllangiso) oxygenofficehelppack_$i) : $$@{$(PKGFORMAT:^".")}
+$(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i) : $$@{$(PKGFORMAT:^".")}
 oxygenofficehelppack_%{$(PKGFORMAT:^".")} :
     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
 
 .ELSE			# "$(alllangiso)"!=""
 openoffice:
-    @echo cannot pack nothing...
+    @echo cannot pack anything...
 
 .ENDIF			# "$(alllangiso)"!=""