[Libreoffice-commits] core.git: scp2/CustomTarget_langmacros.mk scp2/macros

[David Tardon]

 scp2/CustomTarget_langmacros.mk |    1 +
 scp2/macros/macro.pl            |   12 ++----------
 2 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 65d243296309acf39cde21f709240b7b6b23e093
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 21 11:50:25 2013 +0200

    do not second-guess help langs for installation
    
    Change-Id: I48484ca81008fe650aa9fa0eb561e3b2ff33399c

diff --git a/scp2/CustomTarget_langmacros.mk b/scp2/CustomTarget_langmacros.mk
index 6e91b85..48cb596 100644
--- a/scp2/CustomTarget_langmacros.mk
+++ b/scp2/CustomTarget_langmacros.mk
@@ -16,6 +16,7 @@ $(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc :| $(call gb_Cust
 $(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc : $(SRCDIR)/scp2/macros/macro.pl $(BUILDDIR)/config_host.mk.stamp
 	$(call gb_Helper_abbreviate_dirs,\
 		export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \
+		export HELP_LANGS='$(gb_HELP_LANGS)' && \
 		$(PERL) $< -verbose -o $@ -c $(BUILDDIR)/config_host.mk.stamp \
 	)
 
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 1d5dd6c..696bdd8b 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -36,20 +36,13 @@ if ( !defined $completelangiso_var) {
     exit 1;
 }
 
-my $poorhelplocalizations_var = $ENV{WITH_POOR_HELP_LOCALIZATIONS};
-$poorhelplocalizations_var = $completelangiso_var if ( $poorhelplocalizations_var eq "ALL" );
-my %poorhelplocalizations;
-foreach $lang (split (/ /, $poorhelplocalizations_var)) {
-  next if ( $lang eq "en-US");
-  $poorhelplocalizations{$lang}++;
-}
-
 if (!args_require_build()) {
     print STDERR "No new languages, or config. Keeping old file\n";
     exit 0;
 }
 
 my @completelangiso = split " +", $completelangiso_var;
+my @helplangs = split " +", $ENV{HELP_LANGS};
 
 open OUTFILE, ">$outfile" or die "$0 ERROR: cannot open $outfile for writing!\n";
 
@@ -151,8 +144,7 @@ sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG
 {
     my $first = 1;
     print OUTFILE "#define EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(name) ";
-    foreach $lang (@completelangiso) {
-        next if ( $poorhelplocalizations{$lang} );
+    foreach $lang (@helplangs) {
         print OUTFILE ";" unless $first;
         $first = 0;
         print OUTFILE "\\\n\tName ($lang) = EXTRAFILELISTNAME(HelpTarget/,name,/$lang)";