From d6d81df3a19561b448f40a329b3443faac74166c Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Tue, 4 Aug 2009 10:36:31 +0200
Subject: #i101955# consolidating xcs/xcu files in xcd files (for now in new
 postprocess/packregistry); extended configmgr2 to search for multiple xcd
 files per layer; removed some (relative, wrong) DOCTYPE SYSTEM paths from xcu
 files to avoid xsltproc warnings; extended scp2 EXTRA_ALL_LANG to work with
 extensions other than zip (i.e., xcd)

---
 scp2/macros/macro.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scp2/macros')

diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 53bf047d9e98..43a00f4fe411 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -138,9 +138,9 @@ sub write_DIR_IDENT_ALL_LANG
 
 sub write_EXTRA_ALL_LANG
 {
-    print OUTFILE "#define EXTRA_ALL_LANG(name) ";
+    print OUTFILE "#define EXTRA_ALL_LANG(name,ext) ";
     foreach $lang (@completelangiso) {
-        print OUTFILE "\\\n\tName ($lang) = EXTRAFILENAME(name,_$lang)";
+        print OUTFILE "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)";
         print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
     }
     print OUTFILE "\n\n";
-- 
cgit 


From 9751861070f6746d46defe34cbcd8766c53ae665 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Wed, 21 Oct 2009 11:21:09 +0200
Subject: #i101955# registry_en-US.xcd is effectively empty (fallback en-US
 configuration data is stored in the main non-localized xcd files), so need
 not be installed

---
 scp2/macros/macro.pl | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'scp2/macros')

diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 43a00f4fe411..91089c901cef 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -64,6 +64,7 @@ write_DIR_ISOLANGUAGE_ALL_LANG();
 write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ();
 write_DIR_IDENT_ALL_LANG();
 write_EXTRA_ALL_LANG();
+write_EXTRA_ALL_LANG_BUT_EN_US();
 write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG();
 write_EXTRA_IDENT_ALL_LANG();
 write_RESFILE_ALL_LANG();
@@ -146,6 +147,21 @@ sub write_EXTRA_ALL_LANG
     print OUTFILE "\n\n";
 }
 
+sub write_EXTRA_ALL_LANG_BUT_EN_US
+{
+    print OUTFILE "#define EXTRA_ALL_LANG_BUT_EN_US(name,ext) ";
+    my $first = 1;
+    foreach $lang (@completelangiso) {
+        if ($lang ne "en-US") {
+            print OUTFILE "; " unless $first;
+            $first = 0;
+            print OUTFILE
+                "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)";
+        }
+    }
+    print OUTFILE "\n\n";
+}
+
 sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG
 {
     my $first = 1;
-- 
cgit