342407 - Freshen installer to new NSIS code

Status: VERIFIED FIXED

(Calendar :: General, defect, P4)

Description

[Matthew (lilmatt) Willis]

rob_strong has been doing lots of work on the installer for Ff. We should take advantage of it too.

Comment 1

[Joey Minta]

Let's wait til triage meetings to actually set 0.3blocking to +

Comment 2

[Stefan Sitter [:ssitter]]

See the following bugs for work that had to be done for other products (Maybe we can learn from them):
Bug 339061 - Firefox NSIS installer
Bug 339135 - Thunderbird NSIS installer

Comment 3

[Robert Strong (they/them - no direct email)]

I should probably have a patch sometime this weekend for this.

Comment 4

[Robert Strong (they/them - no direct email)]

Attachment: watermark image for installer

Comment 5

[Robert Strong (they/them - no direct email)]

Attachment: LTR header image for installer

Comment 6

[Robert Strong (they/them - no direct email)]

Attachment: RTL header image for installer

Comment 7

[Robert Strong (they/them - no direct email)]

Attachment: 7-Zip stub modified for Sunbird

This will need to be located in other-licenses/7zstub/sunbird

Comment 8

[Robert Strong (they/them - no direct email)]

Attachment: patch

I'm not sure who would be best to review this and even after this there is still more to be done for Sunbird to handle files passed to the exe.

Besides applying the patch and placing the 7-zip stub in the correct location you will need both 7-Zip and NSIS installed and in your path. After Sunbird has finished compiling you can make installer in the objdir/calendar/installer to make an installer. The finished installer will be located in objdir/dist/install/sea/

Comment 9

[Robert Strong (they/them - no direct email)]

Attachment: packages-static diff

I forgot to include the changes to packages-static in the first patch. I'm not sure what is and what is not needed so I included just about everything from objdir/dist/bin

Comment 10

[Reed Loden [:reed]]

Comment on attachment 226908 [details] [diff] [review]
patch

s/Sunbord/Sunbird/ in a few comments

Comment 11

[Robert Strong (they/them - no direct email)]

That's just incentive to get command line handling of files working... or if it is working to let me know what the command line is. :P

Comment 12

[Matthew (lilmatt) Willis]

Rob,
It appears we're missing /m/c/installer/windows/nsis/SetProgramAccess.nsi
as my test build fails looking for that.

I'm not sure what changes need to be made from the Ff or Tb one. Could you attach one for Sunbird?

Comment 13

[Robert Strong (they/them - no direct email)]

It isn't needed for Calendar as far as I can tell so remove the following from calendar/installer/windows/Makefile.in
+INSTALLER_FILES = \

The method to set a default browser requires the app set several settings while for other apps they are defined in the Clients reg key... see the code that is commented out in installer.nsi

Comment 14

[Robert Strong (they/them - no direct email)]

bah! I didn't copy the right line. remove the following
+	nsis/SetProgramAccess.nsi \

Comment 15

[Robert Strong (they/them - no direct email)]

Attachment: patch

Comment 16

[Matthew (lilmatt) Willis]

Attachment: Firefox EULA with (essentially) s/Firefox/Sunbird/g

License to use instead of Firefox's

Comment 17

[Robert Strong (they/them - no direct email)]

btw: there is a typo in other-licenses/branding/sunbird/Makefile.in
+	cp $(srcdir)/wizWatermark.bmp  $(DIST)/branding/Watermrk.bmp
should be
+	cp $(srcdir)/wizWatermark.bmp  $(DIST)/branding/Watermark.bmp

Shouldn't affect compiling since Sunbird doesn't have the official branding env var iird

Comment 18

[Robert Strong (they/them - no direct email)]

Attachment: patch for review

This should be good to go... crosses fingers

Comment 19

[Matthew (lilmatt) Willis]

> Created an attachment (id=227030) [edit]


Index: calendar/installer/windows/packages-static
===================================================================
-; Package file for Win32 static Sunbird build. 
+; Package file for Win32 static Firefox build. 

This line shouldn't change.


Some of the lines that you added don't exist in the build, or they're referring to items that are removed in removed-files.in. I'm seeing the following errors when I try building:

Warning: package error or possible missing or unnecessary file: bin/Microsoft.VC80.CRT.manifest (packages-static, 35).
Warning: package error or possible missing or unnecessary file: bin/msvcm80.dll (packages-static, 36).
Warning: package error or possible missing or unnecessary file: bin/msvcp80.dll (packages-static, 37).
Warning: package error or possible missing or unnecessary file: bin/msvcr80.dll (packages-static, 38).
Warning: package error or possible missing or unnecessary file: bin/AccessibleMarshal.dll (packages-static, 49).
Warning: package error or possible missing or unnecessary file: bin/components/accessibility-msaa.xpt (packages-static, 50).
Warning: package error or possible missing or unnecessary file: bin/components/accessibility.xpt (packages-static, 51).
Warning: package error or possible missing or unnecessary file: bin/components/nsBackgroundUpdateService.js (packages-static, 192).
Warning: package error or possible missing or unnecessary file: bin/res/platform-forms.css (packages-static, 248).
Warning: package error or possible missing or unnecessary file: bin/res/EditorOverride.css (packages-static, 249).
Warning: package error or possible missing or unnecessary file: bin/res/table-add-column-after-active.gif (packages-static, 250).
Warning: package error or possible missing or unnecessary file: bin/res/table-add-column-after-hover.gif (packages-static, 251).
Warning: package error or possible missing or unnecessary file: bin/res/table-add-column-after.gif (packages-static, 252).
Warning: package error or possible missing or unnecessary file: bin/res/table-add-column-before-active.gif (packages-static, 253).
Warning: package error or possible missing or unnecessary file: bin/res/table-add-column-before-hover.gif (packages-static, 254).
Warning: package error or possible missing or unnecessary file: bin/res/table-add-column-before.gif (packages-static, 255).
Warning: package error or possible missing or unnecessary file: bin/res/table-add-row-after-active.gif (packages-static, 256).
Warning: package error or possible missing or unnecessary file: bin/res/table-add-row-after-hover.gif (packages-static, 257).
Warning: package error or possible missing or unnecessary file: bin/res/table-add-row-after.gif (packages-static, 258).
Warning: package error or possible missing or unnecessary file: bin/res/table-add-row-before-active.gif (packages-static, 259).
Warning: package error or possible missing or unnecessary file: bin/res/table-add-row-before-hover.gif (packages-static, 260).
Warning: package error or possible missing or unnecessary file: bin/res/table-add-row-before.gif (packages-static, 261).
Warning: package error or possible missing or unnecessary file: bin/res/table-remove-column-active.gif (packages-static, 262).
Warning: package error or possible missing or unnecessary file: bin/res/table-remove-column-hover.gif (packages-static, 263).
Warning: package error or possible missing or unnecessary file: bin/res/table-remove-column.gif (packages-static, 264).
Warning: package error or possible missing or unnecessary file: bin/res/table-remove-row-active.gif (packages-static, 265).
Warning: package error or possible missing or unnecessary file: bin/res/table-remove-row-hover.gif (packages-static, 266).
Warning: package error or possible missing or unnecessary file: bin/res/table-remove-row.gif (packages-static, 267).
Warning: package error or possible missing or unnecessary file: bin/res/grabber.gif (packages-static, 269).
Warning: package error or possible missing or unnecessary file: bin/res/mathml.css (packages-static, 271).


Index: calendar/installer/windows/Makefile.in
===================================================================

+	cp $(topsrcdir)/browser/EULA instgen/license.txt

Please add the attached EULA as /mozilla/calendar/EULA.txt and use that here. We don't necessarily have browser/EULA checked out when we build Sunbird, and we shouldn't use Firefox's anyway.

Comment 20

[Robert Strong (they/them - no direct email)]

Thanks lilmatt, what about the vc 8 c runtime files when building from the trunk?

Comment 21

[Stefan Sitter [:ssitter]]

(In reply to comment #20)
> Thanks lilmatt, what about the vc 8 c runtime files when building from the
> trunk?

This files are required for Sunbird and should be included in the installer too. (See also Bug 342699.)

Comment 22

[Matthew (lilmatt) Willis]

(In reply to comment #20)
> Thanks lilmatt, what about the vc 8 c runtime files when building from the
> trunk?

As Stefan mentioned, apparently we need those too. I just wasn't setting the environment variable to have them added on build.

Since you're doing such an overhaul to packages-static, could you also remove the remaining ";!4sunbird " lines as well? 

Comment 23

[Robert Strong (they/them - no direct email)]

(In reply to comment #19)
> -; Package file for Win32 static Sunbird build. 
> +; Package file for Win32 static Firefox build. 
oops and fixed.

> Warning: package error or possible missing or unnecessary file:
> bin/AccessibleMarshal.dll (packages-static, 49).
> Warning: package error or possible missing or unnecessary file:
> bin/components/accessibility-msaa.xpt (packages-static, 50).
> Warning: package error or possible missing or unnecessary file:
> bin/components/accessibility.xpt (packages-static, 51).
These are available in my trunk build

> Warning: package error or possible missing or unnecessary file:
> bin/components/nsBackgroundUpdateService.js (packages-static, 192).
> Warning: package error or possible missing or unnecessary file:
> bin/res/platform-forms.css (packages-static, 248).
> Warning: package error or possible missing or unnecessary file:
> bin/res/EditorOverride.css (packages-static, 249).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-add-column-after-active.gif (packages-static, 250).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-add-column-after-hover.gif (packages-static, 251).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-add-column-after.gif (packages-static, 252).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-add-column-before-active.gif (packages-static, 253).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-add-column-before-hover.gif (packages-static, 254).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-add-column-before.gif (packages-static, 255).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-add-row-after-active.gif (packages-static, 256).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-add-row-after-hover.gif (packages-static, 257).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-add-row-after.gif (packages-static, 258).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-add-row-before-active.gif (packages-static, 259).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-add-row-before-hover.gif (packages-static, 260).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-add-row-before.gif (packages-static, 261).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-remove-column-active.gif (packages-static, 262).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-remove-column-hover.gif (packages-static, 263).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-remove-column.gif (packages-static, 264).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-remove-row-active.gif (packages-static, 265).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-remove-row-hover.gif (packages-static, 266).
> Warning: package error or possible missing or unnecessary file:
> bin/res/table-remove-row.gif (packages-static, 267).
> Warning: package error or possible missing or unnecessary file:
> bin/res/grabber.gif (packages-static, 269).
> Warning: package error or possible missing or unnecessary file:
> bin/res/mathml.css (packages-static, 271).
Removed

> Index: calendar/installer/windows/Makefile.in
> ===================================================================
> 
> +       cp $(topsrcdir)/browser/EULA instgen/license.txt
> 
> Please add the attached EULA as /mozilla/calendar/EULA.txt and use that here.
> We don't necessarily have browser/EULA checked out when we build Sunbird, and
> we shouldn't use Firefox's anyway.
Fixed

Comment 24

[Robert Strong (they/them - no direct email)]

Attachment: patch

I left the accessibility files in packages-static since they built for me on trunk and included the EULA.txt in this patch.

Comment 25

[Matthew (lilmatt) Willis]

Please check in the 3 bitmaps to both

/mozilla/other-licenses/branding/sunbird
and
/mozilla/calendar/installer/windows

We'll eventually replace the latter with a generic image once we split branding

Comment 26

[Robert Strong (they/them - no direct email)]

Checked in on trunk. I'm going to wait on the 1.8.1 tree to go green before checking in.

Comment 27

[Robert Strong (they/them - no direct email)]

Checked in to the MOZILLA_1_8_BRANCH

Comment 28

[Marcia Knous [:marcia]]

Mass move of all Installer bugs to General per ctalbert.

Comment 29

[Reed Loden [:reed]]

The bugspam monkeys have been set free and are feeding on Calendar :: General. Be afraid for your sanity!