[Libreoffice-commits] .: 3 commits - doc/nsis-broffice.txt

Michael Meeks michael at kemper.freedesktop.org
Tue Nov 30 09:01:30 PST 2010


 doc/nsis-broffice.txt |   78 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

New commits:
commit 09cfe5f63f2896c9fc12e3668e2b2277439127cd
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Nov 30 17:01:47 2010 +0000

    more nsis notes

diff --git a/doc/nsis-broffice.txt b/doc/nsis-broffice.txt
index 8577ffa..9b4dbe2 100644
--- a/doc/nsis-broffice.txt
+++ b/doc/nsis-broffice.txt
@@ -254,4 +254,12 @@ 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 ...
+	+ localise/source/lngex.cxx
+	* -but- the %PRODUCTNAME is still present in the translated output...
+
+	* The substitution is done with download.pm (get_translation_file)'s
+	  call to replace_variables ... on all the variables.
+		+ ergo we just need to add PRODUCTNAME_BR to the mix.
 
commit 3bee9971be55a08c1b057e101f591dfa16be39f3
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Nov 29 22:05:35 2010 +0000

    cleanup docs

diff --git a/doc/nsis-broffice.txt b/doc/nsis-broffice.txt
index e215e06..8577ffa 100644
--- a/doc/nsis-broffice.txt
+++ b/doc/nsis-broffice.txt
@@ -40,13 +40,8 @@ Function SetupBranding
 	atEnd:
 FunctionEnd
 
-* Trying to detect BrOffice as a binary name:
-
-
-
-    System::Call 'kernel32::GetModuleFileName() i .r0'
-    messageBox MB_OK "not admin: $0"
 
+# missing a call to: !insertmacro MUI_INSERT [!] ...
 
 cf. http://nsis.sourceforge.net/Docs/Modern%20UI/Readme.html
 
commit b9a9e07429ed727985b9aaa1085cee941c7cc0e6
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Nov 29 17:28:43 2010 +0000

    more research and pain with NSIS ...

diff --git a/doc/nsis-broffice.txt b/doc/nsis-broffice.txt
index 38778cf..e215e06 100644
--- a/doc/nsis-broffice.txt
+++ b/doc/nsis-broffice.txt
@@ -1,6 +1,81 @@
 TODO:
 	+ remove obsolete go-oo artwork from:
 		+ setup_native/source/win32/nsis/
+	+ template pre-processing needs to substitute:
+		+ 'is broffice' as a define ... - can we use it ?
+	+ PRODUCT_PUBLISHER
+	+ PRODUCT_WEBSITE
+		+ set to Sun and http:// - still [!] wow ...
+		+ cf. downloadtemplate.nsi
+		+ PUBLISHERPLACEHOLDER
+		+ WEBSITEPLACEHOLDER
+
+* fix the install [!]
+	+ incremental builds -should- work ...
+
+* Thoughts:
+	+ can we set the side-bar icon twice - and thus not have
+	  to clobber the template ?
+
+	+ we can clobber the branding after the fact:
+
+!define MUI_CUSTOMFUNCTION_GUIINIT     SetupBranding
+!define MUI_CUSTOMFUNCTION_UNGUIINIT   SetupBranding
+
+Function SetupBranding
+	File "/oname=$PLUGINSDIR\modern-header.bmp" ${MUI_HEADERIMAGE_BITMAP}
+	File "/oname=$PLUGINSDIR\modern-bro-header.bmp" "Q:\build\libreoffice-3.2.99.3\solver\330\wntmsci12.pro\bin\brobanner.bmp"
+
+	; use broffice specific branding if executable name begins BrOffice
+	; cf. Sources/Build.cpp for list of built-in variable names
+	StrCpy $0 $EXEFILE 8
+	StrCmp $0 "BrOffice" BrOfficeSplash DefaultSplash
+
+	DefaultSplash:
+	       SetBrandingImage "$PLUGINSDIR\modern-header.bmp"
+		GoTo atEnd
+	BrOfficeSplash:
+	       SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-bro-header.bmp"
+		GoTo atEnd
+	atEnd:
+FunctionEnd
+
+* Trying to detect BrOffice as a binary name:
+
+
+
+    System::Call 'kernel32::GetModuleFileName() i .r0'
+    messageBox MB_OK "not admin: $0"
+
+
+cf. http://nsis.sourceforge.net/Docs/Modern%20UI/Readme.html
+
+** GetModuleFileName ...
+	[ easier to test ? ... ;-]
+
+
+		MUI_HEADERIMAGE_INIT (UNINSTALLER) as a param ...
+
+	defined as: MUI_GUIINIT_BASIC ? ...
+
+
+	* we do not want 'RESIZETOFIT' - we want this:
+
+        File "/oname=$PLUGINSDIR\modern-header.bmp" "${MUI_HEADERIMAGE_${UNINSTALLER}
+        SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
+
+	System::Call 'kernel32::GetSystemDefaultLangID() i .r0'
+	StrCmp $R0 "error" OldFashionedWay Finish
+	\b Default $LANGUAGE value is now based on user's UI language instead
+	of locale (\W{http://sourceforge.net/support/tracker.php?aid=1324734}{bug #1324734})
+
+
+
+
+	* Do we build one of these per language ?
+		perhaps it is pre-processed ?
+		+ if so - we only need ~if
+
 
 Notes on nsis installer - and bitmap foo ...
 	+ script.cpp: update_bitmap (IDB_BITMAP1 ...)


More information about the Libreoffice-commits mailing list