412778 - Installer repackaging and installation of venkman language packs

Status: RESOLVED FIXED

(SeaMonkey :: Installer, defect)

Description

[Robert Kaiser]

Bug 394633 gave us venkman language packs and packages them into tarballs and zips in the locale repackaging step, but we also want to pack them into installer and install them together with venkman.

Comment 1

[Robert Kaiser]

Attachment: patch: repackage langpack into installer and install langpack

Here's a patch, I hope it works - I have no Windows build system around here so I can't test it...

You can test this by first building a normal Windows installer and checking out l10n/de in parallel to mozilla/ (either by setting mk_add_options MOZ_CO_LOCALES=de in mozconfig or checking out from cvs(-mirror).mozilla.org:/l10n manually), then cd to $(objdir)/suite/locales and "make repackage-win32-installer-de".

Comment 2

[Frank Wein [:mcsmurf]]

Comment on attachment 297546 [details] [diff] [review]
patch: repackage langpack into installer and install langpack

>Index: mozilla/suite/installer/windows/nsis/custom.nsi
>===================================================================
>RCS file: /cvsroot/mozilla/suite/installer/windows/nsis/custom.nsi,v
>retrieving revision 1.2
>diff -u -7 -p -r1.2 custom.nsi
>--- mozilla/suite/installer/windows/nsis/custom.nsi	2 Sep 2007 11:08:56 -0000	1.2
>+++ mozilla/suite/installer/windows/nsis/custom.nsi	17 Jan 2008 14:58:43 -0000
>@@ -125,15 +125,20 @@
>     WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Left   "15"
>     WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Right  "-1"
>     WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Top    "$R2"
>     WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Bottom "$R3"
>     WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" State  "1"
>     WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Flags  "GROUP"
>     ${GetSize} "$EXEDIR\optional\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}" "/S=0K" $0 $8 $9
>-    SectionSetSize 4 $0
>+    ${If} ${FileExists} "$EXEDIR\optional\extensions\langpack-${AB_CD}@venkman.mozilla.org"
>+      ${GetSize} "$EXEDIR\optional\extensions\langpack-${AB_CD}@venkman.mozilla.org" "/S=0K" $1 $8 $9
>+      SectionSetSize 4 $0 + $1
>+    ${Else}
>+      SectionSetSize 4 $0
>+    ${EndIf}

This won't compile. You need to use something like this here for the first SectionSetSize call:
IntOp $0 $0 + $1
SectionSetSize 4 $0

Then you can also move around the If(-Else-)EndIf call so that it only includes the IntOp call.


>Index: mozilla/suite/installer/windows/nsis/installer.nsi
>===================================================================
>RCS file: /cvsroot/mozilla/suite/installer/windows/nsis/installer.nsi,v
>retrieving revision 1.7
>diff -u -7 -p -r1.7 installer.nsi
>--- mozilla/suite/installer/windows/nsis/installer.nsi	18 Sep 2007 02:47:35 -0000	1.7
>+++ mozilla/suite/installer/windows/nsis/installer.nsi	17 Jan 2008 14:58:43 -0000

>@@ -607,19 +611,27 @@ FunctionEnd
> 
> Function installVenkman
>   ${If} ${FileExists} "$EXEDIR\optional\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}"
>     SetDetailsPrint textonly
>     DetailPrint $(STATUS_INSTALL_OPTIONAL)
>     SetDetailsPrint none
>     ${RemoveDir} "$INSTDIR\extensions\{f13b157f-b174-47e7-a34d-4815ddfdfeb8}"
>+    ${If} ${FileExists} "$EXEDIR\optional\extensions\langpack-${AB_CD}@venkman.mozilla.org"
>+      ${RemoveDir} "$INSTDIR\extensions\langpack-${AB_CD}@venkman.mozilla.org"
>+    ${EndIf}

No need to check if the file exists with FileExists here as the RemoveDir macro already does that (see macro in common.nsh).

r+ with that.

Comment 3

[Robert Kaiser]

I landed this on 2008-01-19, apparently forgot to mark the bug FIXED.