diff options
authorTor Lillqvist <>2013-08-08 23:10:16 +0300
committerTor Lillqvist <>2013-08-08 23:36:30 +0300
commitdfc4ace4278d6c9e77ec150f947a1a6ee454d70d (patch)
parent1b5ed901af4aefad8397f259c85a6a94871df2e1 (diff)
fdo#62442: Move the InfoPlist.strings files into the app from langpacks
The digital signature of an app bundle includes an integrity check for the Resources subtree. This is the normal place for Mac apps to have their read-only non-code "resources". In LibreOffice it is currently not much used, though. The signature thus breaks when a lang pack installer is run and plops its InfoPlist.strings file into the "Resources" subtree. This file contains translations of strings in the app's Info.plist file. For LibreOffice, it contains translations only for some of the file type names in Info.plist. (Why only some, I don't know.) Files installed by a lang pack insaller into other locations in the app bundle don't harm the signature. Making the InfoPlist.strings files be distributed as part of the main app bundle instead of in langpacks should keep the signature valid even if a lang pack is installed. The InfoPlist.strings files are small so the size of the main app should not grow significantly. This required introduction of a new functionality in scp2: The possibility to generate a list of several complete File or Directory stanzas, one for each language for which translations are being built. (This is different from the existing functionality, used for files that go into lang packs, where a stanza contains several Name or HostName attributes (or whatever the term is) where the attribute names are qualified with the language code in parens.) Change-Id: I3afd9b08944fe1bccb5f0c881d740d260f589e39
3 files changed, 38 insertions, 11 deletions
diff --git a/scp2/macros/ b/scp2/macros/
index e86623c454d4..3ebeabeeea76 100644
--- a/scp2/macros/
+++ b/scp2/macros/
@@ -21,6 +21,7 @@ my $destfile;
my $config_stamp;
my $lastcompletelangiso_var;
my $completelangiso_var = $ENV{COMPLETELANGISO_VAR};
+my $help_langs_var = $ENV{HELP_LANGS};
if ( !defined $completelangiso_var) {
print STDERR "ERROR: No language defined!\n";
@@ -33,13 +34,15 @@ if (!args_require_build()) {
my @completelangiso = split " +", $completelangiso_var;
-my @helplangs = split " +", $ENV{HELP_LANGS};
+my @helplangs = split " +", $help_langs_var;
open OUTFILE, ">$outfile" or die "$0 ERROR: cannot open $outfile for writing!\n";
print OUTFILE "// generated file, do not edit\n\n";
print OUTFILE "// languages used for last time generation\n";
print OUTFILE "// completelangiso: $completelangiso_var\n\n";
+print OUTFILE "// help_langs: $help_langs_var\n\n";
@@ -57,6 +60,38 @@ close OUTFILE;
rename $outfile, $destfile;
+ print OUTFILE "#define ITERATE_ALL_LANG_FILE(gid,dir,macro,name,ext) ";
+ foreach $lang (@helplangs) {
+ my $shortlang = $lang;
+ $shortlang = "en" if $shortlang eq "en-US";
+ my $speciallang = $lang;
+ $speciallang =~ s/-/_/;
+ print OUTFILE "\\\nFile CONCAT3(gid_File_,gid,_$speciallang)";
+ print OUTFILE "\\\n\tDir = CONCAT3(gid_Dir_,dir,_$speciallang);";
+ print OUTFILE "\\\n\tmacro;";
+ print OUTFILE "\\\n\tName = STRING(CONCAT3(name,_$lang,ext)); ";
+ print OUTFILE "\\\nEnd ";
+ print OUTFILE "\\\n";
+ }
+ print OUTFILE "\n\n";
+ print OUTFILE "#define ITERATE_ALL_LANG_DIR_LPROJ(gid,parent) ";
+ foreach $lang (@helplangs) {
+ my $shortlang = $lang;
+ $shortlang = "en" if $shortlang eq "en-US";
+ my $speciallang = $lang;
+ $speciallang =~ s/-/_/;
+ print OUTFILE "\\\nDirectory CONCAT3(gid_Dir_,gid,_$speciallang)";
+ print OUTFILE "\\\n\tParentID = CONCAT2(gid_Dir_,parent);";
+ print OUTFILE "\\\n\tDosName = \"$shortlang.lproj\"; ";
+ print OUTFILE "\\\nEnd ";
+ print OUTFILE "\\\n";
+ }
+ print OUTFILE "\n\n";
sub write_ALL_LANG
print OUTFILE "#define ALL_LANG(ident, resid) ";
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 6037330d8fbd..26475611a666 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -26,10 +26,7 @@ End
#ifdef MACOSX
-Directory gid_Dir_Bundle_Contents_Resources_Lang
- ParentID = gid_Dir_Bundle_Contents_Resources;
#ifdef MACOSX
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 256636de3a84..f51f0a6e45c2 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -756,12 +756,7 @@ End
#ifdef MACOSX
-File gid_File_InfoPlist_Lang
- Dir = gid_Dir_Bundle_Contents_Resources_Lang;
- Styles = (ARCHIVE);
- EXTRA_ALL_LANG(InfoPlist,zip);
#ifdef MACOSX