[Libreoffice-commits] .: 2 commits - doc/nsis-broffice.txt patches/dev300
Michael Meeks
michael at kemper.freedesktop.org
Fri Jan 7 07:57:00 PST 2011
doc/nsis-broffice.txt | 137 +++++++++++++++++++++++++++++++++-
patches/dev300/apply | 7 -
patches/dev300/pushfont-psstream.diff | 20 ----
3 files changed, 135 insertions(+), 29 deletions(-)
New commits:
commit 2f2864763f398e1ff4b1f49ed0444c2c6732f2b4
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Jan 7 15:57:08 2011 +0000
remove obsolete pushfont patch
diff --git a/patches/dev300/apply b/patches/dev300/apply
index ebd6ae6..9500691 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -528,14 +528,10 @@ go-oo-splash.diff
[ SlackwareOnly ]
SectionOwner => Slackware
-
-pushfont-psstream.diff
scp2-user-config-ooo3.diff
[ DroplineGNOMEOnly ]
SectionOwner => DropLine
-
-pushfont-psstream.diff, i#84481
scp2-user-config-ooo3.diff
@@ -578,9 +574,6 @@ scp2-user-config-suse.diff, pmladek
# FIXME: this should be set automatically when you use the system mysqlcppconn
mysqlcppconn-static-mysql-binding.diff, pmladek
-# Push fonts into the ps stream always
-pushfont-psstream.diff, i#84481, michael
-
[ DisableGCJ ]
# ignore gcj; OOo newer worked well with it
diff --git a/patches/dev300/pushfont-psstream.diff b/patches/dev300/pushfont-psstream.diff
deleted file mode 100644
index c563c1f..0000000
--- a/patches/dev300/pushfont-psstream.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- psprint_config/configuration/ppds/SGENPRT.PS | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git psprint_config/configuration/ppds/SGENPRT.PS psprint_config/configuration/ppds/SGENPRT.PS
-index 79eead5..7c45795 100644
---- psprint_config/configuration/ppds/SGENPRT.PS
-+++ psprint_config/configuration/ppds/SGENPRT.PS
-@@ -44,6 +44,8 @@
- *NickName: "Generic Printer"
- *PCFileName: "SGENPRT.PPD"
-
-+*% CUPS can cope, and fixes some symbol issues
-+*TTRasterizer: Type42
-
- *% ===== Basic Capabilities and Defaults =====
-
---
-1.7.0.1
-
commit 7411ea507674ef1b9e38d4e6e17007b0a4f1a04b
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Jan 7 15:48:54 2011 +0000
more nsis docs
diff --git a/doc/nsis-broffice.txt b/doc/nsis-broffice.txt
index 9b4dbe2..e24e848 100644
--- a/doc/nsis-broffice.txt
+++ b/doc/nsis-broffice.txt
@@ -1,6 +1,13 @@
TODO:
- + remove obsolete go-oo artwork from:
- + setup_native/source/win32/nsis/
+ * Other interesting pieces:
+ + 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;
+
+
+
+ template pre-processing needs to substitute:
+ 'is broffice' as a define ... - can we use it ?
+ PRODUCT_PUBLISHER
@@ -256,6 +263,12 @@ http://msdn.microsoft.com/en-us/library/dd318693%28v=VS.85%29.aspx
* ULF files are translated with:
+ 'ulfex' ... from Localize.sdf ...
+ + uses an internal localise.sdf [ sub-setted ? ] ...
+
+ + comes from:
+ + Q:/build/libreoffice-3.3.0.1/solver/330/wntmsci12.pro/sdf/scp2.zip
+ + wow [!]
+
+ localise/source/lngex.cxx
* -but- the %PRODUCTNAME is still present in the translated output...
@@ -263,3 +276,123 @@ http://msdn.microsoft.com/en-us/library/dd318693%28v=VS.85%29.aspx
call to replace_variables ... on all the variables.
+ ergo we just need to add PRODUCTNAME_BR to the mix.
+ * [ ... nice ! ... ]
+
+* .ulf files already have (broken) translation [!]
+
+* 'ulfconv' is used to create a .mlf file from a .ulf file
+ + setup_native/source/ulfconv/ ...
+* 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 ?
+ + need another perl fix.
+ + this is in the idt file substitution ... [!]
+
+* 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
+and then it is using the msidb.exe from Visual studio to create teh
+msi database and makecab.exe to create the cab file from the Files
+table
+
+first information is http://en.wikipedia.org/wiki/Windows_Installer
+it explains the structure
+
+
+* NICE !
+
+* inc_openoffice\windows\msi_languages\Control.ulf
+ + we have a [ProductName] substitution there ...
+
+ * instsetoo_native/inc_openiffice/windows/msi_languages/Property.ulf
+ + still has *hard-coded* openoffice.org stuff ...
+
+ * Where does that come from !?
+ + why substitute -so- late ?
+ + interesting.
+
+inc_ooohelppack/windows/msi_templates/Property.idt
+ + we get translations from the .ulf files [ somehow ]
+ + *Looks* like the MSI branding artwork is already keyed from ProductName ;-)
+
+* who localises .idt files !
+
+===== main repo =====
+solenv/bin/make_installer.pl: # Attention: The table "Feature.idt" contains language specific strings -> parameter: $languagesarrayref !
+solenv/bin/modules/installer/systemactions.pm:# Example: "Feature.idt.01" -> "Feature.idt"
+solenv/bin/modules/installer/windows/feature.pm:# Creating the file Feature.idt dynamically
+solenv/bin/modules/installer/windows/feature.pm: my $featuretablename = $basedir . $installer::globals::separator . "Feature.idt" . "." . $onelanguage;
+solenv/bin/modules/installer/windows/idtglobal.pm: # Example: "Feature.idt.01"
+solenv/bin/modules/installer/windows/idtglobal.pm:# CustomAc.idt, InstallU.idt, Feature.idt
+solenv/bin/modules/installer/windows/idtglobal.pm: my $featuretablename = $languageidtdir . $installer::globals::separator . "Feature.idt";
+solenv/bin/modules/installer/windows/mergemodule.pm:# Reading the file "Feature.idt". The Feature, that is defined in scp
+solenv/bin/modules/installer/windows/mergemodule.pm: my $idtfilename = "Feature.idt";
+
+solenv/bin/modules/installer/windows/property.pm: ${$propertyfile}[$i] =~ s/\bPRODUCTNAMETEMPLATE\b/$productname/;
+
+
+* property.pm/set_important_properties:
+ + fun !
+
+
+* Properties are listed in the .idt file eg.
+
+ARPHELPLINK OOO_ARPHELPLINKTEMPLATE
+
+And translated via the .ulf file:
+[OOO_ARPHELPLINKTEMPLATE]
+
+en-US = "http://www.openoffice.org"
+
+
+** Check the ulf translation foo [!] ...
+
+somewhen after: "Creating .idt files" ...
+
+
+
+*** ARGH ! ***
+ + sub replace_all_setupscriptvariables_in_script [!] ...
+
+ + we have all these built-in things: eg.
+ + they are substituted through: setupscript.pm [!]
+ + -and- we have no clue ...
+
+ WITHOUTDOTUNIXPRODUCTNAME
+ + manufactured internally [!]
+ PRODUCTNAME - built in ! ...
+ and no PROUCTNAME_BR [ why !? ] ... wassup ?
+
+ + some variables come from setup_osl.ins' 'Installation' section.
+
+ + add_lowercase_productname_setupscript_variable .... ? - hmmm.
+ + looks like it is moving stuff from openoffice.lst -> the variable hash
+
+ + vars come from: replace_all_setupscriptvariables_in_script ...
+
+* dmake ooohelppack_pt-BR
+
+
+
+----- help packs -----
+
+* why not lang-packs of a product with only help in it ?
+
+* components/.../packinfo_office_help.txt
+ + we need to use this.
+ + So - the module = "..." is substituting for langpacks
+ but not helppacks. [!] ...
+ + as we read the .txt - we don't do that.
+
+* solenv/bin/modules/installer/packagelist.pm
+ + reads the packinfo_...
+ + we're missing a lang specific tweak to module = I think ...
+ + missing a 'LANGUAGEMODULE' tag somewhere ?
+ + on a gid ? ...
More information about the Libreoffice-commits
mailing list