From c2f5e09900561d417d53a74fd6bc189cb7d898e1 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Tue, 3 Dec 2013 08:19:36 +0100 Subject: Zip .ui translations per UIConfig target. Fix installer / scp2 to not ignore directory prefix in 'Name'. Change-Id: Ib319363c8be73a72029f1ba3833e518e15c55e29 Reviewed-on: https://gerrit.libreoffice.org/6915 Reviewed-by: David Tardon Tested-by: David Tardon --- scp2/inc/macros.inc | 8 ++++---- scp2/macros/macro.pl | 16 +++++++++++++++ scp2/source/ooo/file_library_ooo.scp | 2 +- scp2/source/ooo/file_ooo.scp | 40 ++++++++++++++++++------------------ scp2/source/ooo/ure.scp | 2 +- 5 files changed, 42 insertions(+), 26 deletions(-) (limited to 'scp2') diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 2f605a9b611d..d95c364bbe38 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -481,12 +481,12 @@ End #include -#define UI_FILELIST_ALL_LANG(name, file, ext) \ +#define UI_FILELIST_ALL_LANG(name, file) \ File CONCAT3(gid_File_Share_Config_Sofficecfg_uiconfig_, name, _Lang) \ TXT_FILE_BODY; \ - Styles = (FILELIST); \ - Dir = FILELIST_DIR; \ - EXTRA_ALL_LANG_BUT_EN_US(file, ext); \ + Styles = (PACKED); \ + Dir = gid_Dir_Share_Config_Sofficecfg; \ + UI_ALL_LANG_BUT_EN_US(file); \ End #define URE_PRIVATE_LIB(id,name) \ diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl index 3ebeabeeea76..3e7e415fe2a9 100644 --- a/scp2/macros/macro.pl +++ b/scp2/macros/macro.pl @@ -50,6 +50,7 @@ write_DIR_ISOLANGUAGE_ALL_LANG(); write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ(); write_EXTRA_ALL_LANG(); write_EXTRA_ALL_LANG_BUT_EN_US(); +write_UI_ALL_LANG_BUT_EN_US(); write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(); write_RESFILE_ALL_LANG(); write_README_ALL_LANG(); @@ -166,6 +167,21 @@ sub write_EXTRA_ALL_LANG_BUT_EN_US print OUTFILE "\n\n"; } +sub write_UI_ALL_LANG_BUT_EN_US +{ + print OUTFILE "#define UI_ALL_LANG_BUT_EN_US(name) "; + my $first = 1; + foreach $lang (@completelangiso) { + if ($lang ne "en-US") { + print OUTFILE "; " unless $first; + $first = 0; + print OUTFILE + "\\\n\tName ($lang) = STRING(CONCAT2(name,/ui/res/$lang.zip))"; + } + } + print OUTFILE "\n\n"; +} + sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG { my $first = 1; diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 40b4e75dce25..9c5050190b0d 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -275,7 +275,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3) #else #if !defined(MACOSX) File gid_File_Lib_Sqlite3 - Name = "sqlite/" SPECIAL_NAME(sqlite3); + Name = SPECIAL_NAME(sqlite3); PACKED_LIB_FILE_BODY; End #endif //!defined(MACOSX) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 965c89fa9709..ab2cfe4c2c7c 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -607,31 +607,31 @@ UI_FILELIST(uui, "UIConfig/uui.filelist") UI_FILELIST(vcl, "UIConfig/vcl.filelist") UI_FILELIST(xmlsec, "UIConfig/xmlsec.filelist") -UI_FILELIST_ALL_LANG(basicide, UIConfig/modules/BasicIDE, filelist) -UI_FILELIST_ALL_LANG(cui, UIConfig/cui, filelist) +UI_FILELIST_ALL_LANG(basicide, modules/BasicIDE) +UI_FILELIST_ALL_LANG(cui, cui) #ifdef DBCONNECTIVITY -UI_FILELIST_ALL_LANG(dbaccess, UIConfig/dbaccess, filelist) -#endif -UI_FILELIST_ALL_LANG(desktop, UIConfig/desktop, filelist) -UI_FILELIST_ALL_LANG(filter, UIConfig/filter, filelist) -UI_FILELIST_ALL_LANG(scalc, UIConfig/modules/scalc, filelist) -UI_FILELIST_ALL_LANG(schart, UIConfig/modules/schart, filelist) -UI_FILELIST_ALL_LANG(sdraw, UIConfig/modules/sdraw, filelist) -UI_FILELIST_ALL_LANG(sfx, UIConfig/sfx, filelist) -UI_FILELIST_ALL_LANG(simpress, UIConfig/modules/simpress, filelist) -UI_FILELIST_ALL_LANG(smath, UIConfig/modules/smath, filelist) +UI_FILELIST_ALL_LANG(dbaccess, dbaccess) +#endif +UI_FILELIST_ALL_LANG(desktop, desktop) +UI_FILELIST_ALL_LANG(filter, filter) +UI_FILELIST_ALL_LANG(scalc, modules/scalc) +UI_FILELIST_ALL_LANG(schart, modules/schart) +UI_FILELIST_ALL_LANG(sdraw, modules/sdraw) +UI_FILELIST_ALL_LANG(sfx, sfx) +UI_FILELIST_ALL_LANG(simpress, modules/simpress) +UI_FILELIST_ALL_LANG(smath, modules/smath) #ifdef GUIBASE_UNX -UI_FILELIST_ALL_LANG(spa, UIConfig/spa, filelist) +UI_FILELIST_ALL_LANG(spa, spa) #endif -UI_FILELIST_ALL_LANG(svt, UIConfig/svt, filelist) -UI_FILELIST_ALL_LANG(svx, UIConfig/svx, filelist) -UI_FILELIST_ALL_LANG(swriter, UIConfig/modules/swriter, filelist) +UI_FILELIST_ALL_LANG(svt, svt) +UI_FILELIST_ALL_LANG(svx, svx) +UI_FILELIST_ALL_LANG(swriter, modules/swriter) #ifdef ENABLE_TELEPATHY -UI_FILELIST_ALL_LANG(tubes, UIConfig/tubes, filelist) +UI_FILELIST_ALL_LANG(tubes, tubes) #endif -UI_FILELIST_ALL_LANG(uui, UIConfig/uui, filelist) -UI_FILELIST_ALL_LANG(vcl, UIConfig/vcl, filelist) -UI_FILELIST_ALL_LANG(xmlsec, UIConfig/xmlsec, filelist) +UI_FILELIST_ALL_LANG(uui, uui) +UI_FILELIST_ALL_LANG(vcl, vcl) +UI_FILELIST_ALL_LANG(xmlsec, xmlsec) #ifdef WNT diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 653fb6f8d2df..3e9983bf9d83 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -571,7 +571,7 @@ End File gid_File_Misc_ServicesRdb TXT_FILE_BODY; Dir = GID_DIR_URE_SHARE_MISC; - Name = "ure/services.rdb"; + Name = "services.rdb"; Styles = (PACKED); End -- cgit