[Libreoffice-commits] .: 2 commits - doc/nsis-broffice.txt patches/dev300
Michael Meeks
michael at kemper.freedesktop.org
Thu Jan 27 03:06:42 PST 2011
doc/nsis-broffice.txt | 183 +++++++++++++++++++++++++++++-
patches/dev300/apply | 26 ----
patches/dev300/scp2-user-config-ooo3.diff | 34 -----
3 files changed, 185 insertions(+), 58 deletions(-)
New commits:
commit 4329eaf0312469de53c654e8c858da7e08c7d1bf
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Jan 27 11:06:26 2011 +0000
remove broken patch, and unused / stale distro sections
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2d0ba97..3e41159 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -63,7 +63,7 @@ SUSE-11.1 : NovellBase, DisableGCJ, BerkeleyDB43, ImpressFontSize, PostgreSQL
SUSE-11.2 : NovellBase, DisableGCJ, BerkeleyDB43, ImpressFontSize, PostgreSQL, SUSE112
SUSE : NovellBase, DisableGCJ, BerkeleyDB43, ImpressFontSize, PostgreSQL, SUSE112
# Slackware
-Slackware : LinuxCommon, SlackwareOnly, NotDebian, Mono, msaccess
+Slackware : LinuxCommon, NotDebian, Mono, msaccess
# Debian
DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL
Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, HPPA, AXP, kFreeBSD
@@ -77,8 +77,8 @@ UbuntuLucid : UbuntuBased, UbuntuLucidOnly
UbuntuMaverick : UbuntuBased, UbuntuMaverickOnly
UbuntuL10n : UbuntuBased, UbuntuL10nOnly
# DroplineGNOME
-DroplineGNOME : LinuxCommon, DroplineGNOMEOnly, NotDebian, Mono, msaccess
-DroplineGNOME64 : LinuxCommon, DroplineGNOMEOnly, NotDebian, Mono, msaccess
+DroplineGNOME : LinuxCommon, NotDebian, Mono, msaccess
+DroplineGNOME64 : LinuxCommon, NotDebian, Mono, msaccess
# Ark Linux
Ark: LinuxCommon, NotDebian, ArkOnly, BerkeleyDB43, KDE4
# www.pld-linux.org
@@ -86,7 +86,7 @@ PLDBase: LinuxCommon, NotDebian, PLDOnly
PLD: PLDBase
PLD64: PLDBase
# Mandriva Linux
-MandrivaBase: MandrivaOnly, LinuxCommon, MandrivaOnlyUnix, Split, NotDebian
+MandrivaBase: MandrivaOnly, LinuxCommon, Split, NotDebian
Mandriva: MandrivaBase
Mandriva64: MandrivaBase
# Frugalware Linux
@@ -523,14 +523,6 @@ reportdesign-mention-package-l10n.diff, rengelha
# move progress bar for go-oo splash
go-oo-splash.diff
-[ SlackwareOnly ]
-SectionOwner => Slackware
-scp2-user-config-ooo3.diff
-
-[ DroplineGNOMEOnly ]
-SectionOwner => DropLine
-scp2-user-config-ooo3.diff
-
[ MandrivaOnly ]
SectionOwner => gghibo
@@ -550,15 +542,7 @@ wizards-path.diff, mrl
mdv-toolbariconstosmall.diff, cabral
mdv-exceptcxx-include-string.diff, cabral
-[ MandrivaOnlyUnix ]
-
-SectionOwner => gghibo
-help-support-mdv.diff
-scp2-user-config-ooo3.diff, pmladek
-
-
[ NovellOnlyUnix ]
-
# Help Support page
# FIXME: there is not longer About/Support button in LibreOffice help-support.diff, michael
@@ -825,8 +809,6 @@ gentoo-pax-fix.diff, aprosky
ibm-j9vm.diff, hmth
# system db check
system-db-check.diff, i#65979, hmth
-# User ~/.ooo3 as user dir
-scp2-user-config-ooo3.diff, pmladek
# default inc/lib
config_office-XINC-XLIB-defaults.diff, i#65976
# Sandbox problem with wrong path
diff --git a/patches/dev300/scp2-user-config-ooo3.diff b/patches/dev300/scp2-user-config-ooo3.diff
deleted file mode 100644
index 2d215aa..0000000
--- a/patches/dev300/scp2-user-config-ooo3.diff
+++ /dev/null
@@ -1,34 +0,0 @@
----
- officecfg/registry/data/org/openoffice/Setup.xcu | 2 +-
- scp2/source/ooo/common_brand.scp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git officecfg/registry/data/org/openoffice/Setup.xcu officecfg/registry/data/org/openoffice/Setup.xcu
-index 8e18ca5..7c0b95d 100644
---- officecfg/registry/data/org/openoffice/Setup.xcu
-+++ officecfg/registry/data/org/openoffice/Setup.xcu
-@@ -788,7 +788,7 @@
- <value>10</value>
- </prop>
- <prop oor:name="VersionIdentifiers">
-- <value oor:separator=",">OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
-+ <value oor:separator=",">OpenOffice.org 2=ooo-2.0,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
- </prop>
- <node oor:name="MigrationSteps">
- <node oor:name="Datasources" oor:op="replace">
-diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp
-index 7bbf873..0b235a0 100644
---- scp2/source/ooo/common_brand.scp
-+++ scp2/source/ooo/common_brand.scp
-@@ -774,7 +774,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall
- #elif defined MACOSX
- Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
- #else
-- Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
-+ Value = "$SYSUSERCONFIG/.ooo3";
- #endif
- End
-
---
-1.7.0.1
-
commit da28aba81ead89b67679bd0079a838265e8a9cf7
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Jan 20 14:19:19 2011 +0000
more notes on msi branding
diff --git a/doc/nsis-broffice.txt b/doc/nsis-broffice.txt
index e24e848..77933ab 100644
--- a/doc/nsis-broffice.txt
+++ b/doc/nsis-broffice.txt
@@ -1,12 +1,184 @@
TODO:
- * Other interesting pieces:
+
+** FIXME:
+ + install location ...
+
+* Un-solved Q's
+ + how are multiple Director.idt files built ?
+ + $basedir must be different, and create_directory_table must
+ be called multiple times [!]
+
+
+* Why are we installed in a top-level menu of name 'LibreOffice 3.3' ?
+
+* FolderItem gid_Folderitem_Soffice_Desktop
+ ComponentCondition = "CREATEDESKTOPLINK=1";
+ ComponentIDFile = "gid_Brand_File_Desktophelper_Txt";
+ FileID = gid_Brand_File_Bin_Soffice;
+ FolderID = PREDEFINED_DESKTOP;
+ IconFile = gid_Brand_File_Bin_Soffice;
+ IconID = 0;
+ ModuleID = gid_Module_Root;
+ Name = "%PRODUCTNAME %PRODUCTVERSION";
+ Name (pt-BR) = "%PRODUCTNAME_BR %PRODUCTVERSION";
+
+property.pm:
+ if ( $installer::globals::desktoplinkexists )
+ {
+ my $onepropertyline = "DESKTOPLINKEXISTS" . "\t" . "1" . "\n";
+ push(@{$propertyfile}, $onepropertyline);
+
+ $onepropertyline = "CREATEDESKTOPLINK" . "\t" . "1" . "\n"; # Setting the default
+ push(@{$propertyfile}, $onepropertyline);
+ }
+
+directory.pm
+ + 'add_root_directories' [ urgh ! ]
+ + $realproductkey = $productname . " " . $productversion;
+ + ho hum !
+ + this could be -impossibly- nasty ...
+ + can we change this at install time ? almost certainly not.
+ + $directorytableref ... -> !?
+ + what ...
+
+* Director.idt
+ ./LibreOffice/msi/idt_files/en-US_pt-BR_de/00/Director.idt
+ + Two variables to clobber:
+ + 'OfficeMenuFolder' globals.pm ($officemenufolder)
+ directory.pm:
+ $oneline = "$installer::globals::officemenufolder\t$installer::globals::programmenufolder\t$shortproductkey|$realproductkey\n";
+ push(@{$directorytableref}, $oneline);
+
+ + 'INSTALLLOCATION' (?)
+
+
+ * We run 'msidb.exe' on the directories with all these .idt files.
+ ( http://msdn.microsoft.com/en-us/library/aa370083%28v=vs.85%29.aspx )
+
+ * Shortcut is localised ...
+ * What about Director.idt ?
+ + (http://msdn.microsoft.com/en-us/library/aa368259%28v=vs.85%29.aspx )
+
+ * how are the multiple Director.idt files created ?
+ + we run one make_installer.pl -l en-US_pt-BR_de
+ + eg.
+
+ * bin/modules/installer/windows/admin.pm:
+ # Get File.idt, Component.idt and Directory.idt from database
+ my $tablelist = "File Directory Component Registry";
+ * bin/modules/installer/windows/idtglobal.pm
+ + helps to builds some of the strings ...
+ + cf. prepare_language_idt_directory
+ + Wow (get_rtf_licensetext): convert to rtf !?
+ * setbidiattributes
+ + interesting [!]
+
+ * make_installer.pl - idt...
+ @translationfiles (?)
+
+
+... creating idt files ...
+create_directory_foo to Q:/build/libreoffice-3.3.0.2/instsetoo_native/wntmsci12.pro/LibreOffice/msi/idt_files/de_en-US_pt-BR/00/Director.idt.de !!!
+create_directory_foo to Q:/build/libreoffice-3.3.0.2/instsetoo_native/wntmsci12.pro/LibreOffice/msi/idt_files/de_en-US_pt-BR/00/Director.idt.en-US !!!
+create_directory_foo to Q:/build/libreoffice-3.3.0.2/instsetoo_native/wntmsci12.pro/LibreOffice/msi/idt_files/de_en-US_pt-BR/00/Director.idt.pt-BR !!!
+... copying idt files ...
+
+We get this during the main build:
+ + from
+
+
+
+
+--------------------------------------------------------------------------------------------------------------------------------------------
+
+Shortcut.idt-pt_BR [!]
+
+ installer::windows::shortcut::create_shortcut_table($filesinproductlanguageresolvedarrayref, $linksinproductlanguageresolvedarrayref, $folderinproductlanguageresolvedarrayref, $folderitemsinproductlanguageresolvedarrayref, $directoriesforepmarrayref, $newidtdir, $languagesarrayref, $includepatharrayref, \@iconfilecollector);
+
+Shortcut Directory_ Name Component_ Target Arguments Description Hotkey Icon_ IconIndex ShowCmd WkDir
+s72 s72 l128 s72 s72 S255 L255 I2 S72 I2 I2 S72
+WINDOWSENCODINGTEMPLATE Shortcut Shortcut
+
+gid_Folderitem_Sbase OfficeMenuFolder LIBREO~1|LibreOffice Base g_f_exe_sbase__libreoffice3_program [LibreOffice3_program]\sbase.exe Gerencie bancos de dados, crie consultas e relatórios para rastrear e gerenciar suas informações por meio do Base. 1 LibreOffice3_Basis_program
+
+ * get_shortcut_name() - passes in '$onelanguage' but simply does not use it [!]
+ + [ then again - get_shortcut_description does not either ]
+ => this is all pre-translated [ somehow ]
+
+ if (! (!(( $onelink->{'ismultilingual'} )) || ( $onelink->{'specificlanguage'} eq $onelanguage )) ) { next; }
+ + $onelink comes from $linksref arg #2 to create_shortcut_table
+ + $linksinproductlanguageresolvedarrayref - from make_installer.pl [!]
+
+ # First the links, defined in scp as ShortCut [!] ... hmm.
+
+ # Second the entries into the start menu, defined in scp as Folder and Folderitem
+ # These shortcuts will fill the icons table.
+
+ * So - we have:in setup_osl.ins:
+ + an un-translated Name [!] ...
+
+FolderItem gid_Folderitem_Soffice_Desktop
+ ComponentCondition = "CREATEDESKTOPLINK=1";
+ ComponentIDFile = "gid_Brand_File_Desktophelper_Txt";
+ FileID = gid_Brand_File_Bin_Soffice;
+ FolderID = PREDEFINED_DESKTOP;
+ IconFile = gid_Brand_File_Bin_Soffice;
+ IconID = 0;
+ ModuleID = gid_Module_Root;
+ Name = "%PRODUCTNAME %PRODUCTVERSION";
+ Parameter = "";
+ Styles = (NOWEB,NON_ADVERTISED,USE_HELPER_FILENAME);
+ Tooltip (af) = "LibreOffice, the office productivity suite provided by The Document Foundation. See http://www.documentfoundation.org";
+
+scp_Copy_Readme_Txt has a per-language name translation
+ + Name (en-US) - etc....
+
+ + Can we have a Name and a manual Name (pt-BR) ? - I wonder.
+ + or just a Name (en-US) and a Name (pt-BR)
+ * Attempt #1 - leave Name =, and add a Name (pt-BR) = - lets see.
+
+
+ Registry.idt.pt-BR:
+ + similar issue:
+ + g_r_software_manufacturer_productname_productversion_capabilities_applicationname -1 Software\LibreOffice\LibreOffice\3.3\Capabilities ApplicationName LibreOffice 3.3 g_m_root_registry_libreoffice33
+ + Lots of 'LibreOffice 3.3's in here ...
+
+* code run during MSI install / de-install: [ interesting ]
+ setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
+ seems to be run during MSI install time [!] ?
solenv/bin/modules/installer/globals.pm: $officemenufolder = "OfficeMenuFolder";
solenv/bin/modules/installer/worker.pm: # The OfficeMenuFolder is defined as: $productname . " " . $productversion;
+--------------------------------------------------------------------------------------------------------------------------------------------
+
+* BrOffice MSI installer artwork:
+ + Componen.idt (?)
+ + backing_left.png, intro.png (?)
+ + File.idt - has all files mentioned in it.
+ + Binary.idt - ImageBmp -> Image.bmp and BannerBmp -> Banner.bmp
+ + Seems to be -per-language- already [!] - fun :-)
+ + where does Image.bmp come from (?)
+ + not the scp2 ... [!]
+ + How interesting [!]
+ + this is already duplicated in the build
+ tree per-language [!] (most odd).
+ * comes from:
+ + instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary.idt
+ + instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Banner.bmp
+ + instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Image.bmp
+ * And for inc_openoffice ...
+ + [ ARGH - these are not in the default_images/brand/ directory ...
+ this should be fixed on master ... ;-]
+ + hack_msitemplates
+ + interesting [!] re-writes the source ...
+
+ * passed into make_installer with -msitemplate=<directory>
+solenv/bin/modules/installer/windows/idtglobal.pm: # Copying all idt-files from the source $installer::globals::idttemplatepath to the destination $destinationdir
+
+
+--------------------------------------------------------------------------------------------------------------------------------------------
+ template pre-processing needs to substitute:
+ 'is broffice' as a define ... - can we use it ?
@@ -201,6 +373,8 @@ to be a tad more clever.
+--------------------------------------------------------------------------------------------------------------------------------------------
+
--------------- language pieces ---------------
* or how to detect what language we're using ...
@@ -261,6 +435,8 @@ http://msdn.microsoft.com/en-us/library/dd318693%28v=VS.85%29.aspx
* how can that be set / fetched from the script !?
+ hmm [!] ...
+--------------------------------------------------------------------------------------------------------------------------------------------
+
* ULF files are translated with:
+ 'ulfex' ... from Localize.sdf ...
+ uses an internal localise.sdf [ sub-setted ? ] ...
@@ -285,6 +461,8 @@ http://msdn.microsoft.com/en-us/library/dd318693%28v=VS.85%29.aspx
* this is used by pre2par.pl to translate .ulf -> .par
+--------------------------------------------------------------------------------------------------------------------------------------------
+
* Bug #1
+ 'LibreOffice_BR Writer' in the msi file installer text.
+ NASTY ! - where does that get in ?
@@ -294,7 +472,6 @@ http://msdn.microsoft.com/en-us/library/dd318693%28v=VS.85%29.aspx
* Bug #2
+ We have "LibreOffice 3.3 - Assistante" in the msi installer title [urk] ...
+ "Instalando o LibreOffice 3.3"
- +
yeah, the perl is used to create the data-base tables in plain text
@@ -356,6 +533,7 @@ en-US = "http://www.openoffice.org"
somewhen after: "Creating .idt files" ...
+--------------------------------------------------------------------------------------------------------------------------------------------
*** ARGH ! ***
@@ -381,6 +559,7 @@ somewhen after: "Creating .idt files" ...
+--------------------------------------------------------------------------------------------------------------------------------------------
----- help packs -----
* why not lang-packs of a product with only help in it ?
More information about the Libreoffice-commits
mailing list