mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not second-guess help langs for installation

Browse Source 
Change-Id: I48484ca81008fe650aa9fa0eb561e3b2ff33399c
This commit is contained in:
David Tardon
2013-05-21 11:50:25 +02:00
parent 2147d08c78
commit 65d2432963
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scp2/CustomTarget_langmacros.mk
View File

@@ -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_CustomTarget_get_workdir,scp2/macros)/langmacros.inc : $(SRCDIR)/scp2/macros/macro.pl $(BUILDDIR)/config_host.mk.stamp
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \ export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \
export HELP_LANGS='$(gb_HELP_LANGS)' && \
$(PERL) $< -verbose -o $@ -c $(BUILDDIR)/config_host.mk.stamp \ $(PERL) $< -verbose -o $@ -c $(BUILDDIR)/config_host.mk.stamp \
) )

12
scp2/macros/macro.pl
View File

@@ -36,20 +36,13 @@ if ( !defined $completelangiso_var) {
exit 1; 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()) { if (!args_require_build()) {
print STDERR "No new languages, or config. Keeping old file\n"; print STDERR "No new languages, or config. Keeping old file\n";
exit 0; exit 0;
} }
my @completelangiso = split " +", $completelangiso_var; my @completelangiso = split " +", $completelangiso_var;
my @helplangs = split " +", $ENV{HELP_LANGS};
open OUTFILE, ">$outfile" or die "$0 ERROR: cannot open $outfile for writing!\n"; 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; my $first = 1;
print OUTFILE "#define EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(name) "; print OUTFILE "#define EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(name) ";
foreach $lang (@completelangiso) { foreach $lang (@helplangs) {
next if ( $poorhelplocalizations{$lang} );
print OUTFILE ";" unless $first; print OUTFILE ";" unless $first;
$first = 0; $first = 0;
print OUTFILE "\\\n\tName ($lang) = EXTRAFILELISTNAME(HelpTarget/,name,/$lang)"; print OUTFILE "\\\n\tName ($lang) = EXTRAFILELISTNAME(HelpTarget/,name,/$lang)";