339714 - Locale repackaging to support the NSIS installer

Status: RESOLVED FIXED

(Firefox :: Installer, defect, P1)

Description

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

The build scripts will need to be updated to support locale repackaging for the NSIS installer implemented in bug 326580.

Comment 1

[Benjamin Smedberg]

Attachment: Make setup.exe generation separate, rev. 1

This is a prerequisite small patch which separates out the building of setup.exe into a separate target from that which builds the entire installer.

Comment 2

[Benjamin Smedberg]

Attachment: Repack it!, rev. 1

Woot!

Comment 3

[Matthew (lilmatt) Willis]

Checked in browser/installer/windows/Makefile.in change to calendar/installer/windows/Makefile.in also

Reminder to bsmedberg per IRC discussion to land this on branch eventually, as calendar's NSIS stuff is also on branch at this time.

Comment 4

[Axel Hecht [:Pike]]

I wonder what we do about README.txt, which I recall not being in localized, 
and where do the spellcheck dictionaries end up right now?
I guess for now, we would like to keep the en-US dict in there, but that's likely an offline discussion.

Those comments without a windows env, so I haven't applied and tested the patch.

Comment 5

[Matthew (lilmatt) Willis]

(In reply to comment #4)
> I wonder what we do about README.txt, which I recall not being in localized

Unless I'm looking at the wrong thing, README.txt is localized (although the filename itself is not.)

http://lxr.mozilla.org/mozilla/source/browser/locales/en-US/README.txt

Comment 6

[Matthew (lilmatt) Willis]

> Created an attachment (id=227268) [edit]
> Make setup.exe generation separate, rev. 1

With this checkin, I'm now getting errors when building the installer because ABS_CONFIG_DIR is empty, so 7zip is trying to put the app in /app.7zs. 

I'm seeing "/bin/sh: line 0: cd: instgen: No such file or directory" when the $shell command that sets ABS_CONFIG_DIR executes in toolkit/mozapps/installer/windows/nsis/makensis.mk

Comment 7

[Matthew (lilmatt) Willis]

Attachment: patch to fix regression

patch by bsmedberg, r=lilmatt

Comment 8

[Matthew (lilmatt) Willis]

(In reply to comment #7)
> Created an attachment (id=227347) [edit]
> patch to fix regression

Patch checked in on _trunk_only_.

Comment 9

[Axel Hecht [:Pike]]

filed bug 342938 on the README.txt issue.
We add it to the localized files at 
http://lxr.mozilla.org/mozilla1.8/source/browser/locales/Makefile.in#90 as
part of the libs target.

Comment 10

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

Comment on attachment 227315 [details] [diff] [review]
Repack it!, rev. 1

very nice

Comment 11

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

Attachment: patch for calendar

Changes needed for calendar

Comment 12

[Matthew (lilmatt) Willis]

> Created an attachment (id=227390) [edit]
> patch for calendar

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

Um, no.


-#ifdef MOZ_SUNBIRD
-APP_VERSION = $(SUNBIRD_VERSION)
-DEFINES += -DAPP_VERSION="$(APP_VERSION)"
-#endif
+APP_VERSION := $(shell cat $(srcdir)/../config/version.txt)

Is this necessary for the patch to work? We've been on a mission to use $SUNBIRD_VERSION rather than catting version.txt everywhere. 


 DEFINES += \
-    -DAB_CD=$(AB_CD) \
-    -DMOZ_LANGPACK_EID=langpack-$(AB_CD)@sunbird.mozilla.org \
-    -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-    -DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \
-    -DPKG_BASENAME=$(PKG_BASENAME) \
-    $(NULL)
+	-DAB_CD=$(AB_CD) \
+	-DMOZ_LANGPACK_EID=langpack-$(AB_CD)@sunbird.mozilla.org \
+	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+	-DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \
+	-DPKG_BASENAME=$(PKG_BASENAME) \
+	$(NULL)

Pull this bit so as to not hose CVS blame. Besides, you only NEED tabs inside the makefile targets :)

Comment 13

[Benjamin Smedberg]

Attachment: Fix branding, rev. 1

Comment 14

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

Comment on attachment 227390 [details] [diff] [review]
patch for calendar

Opened bug 343024 for Calendar

Comment 15

[Axel Hecht [:Pike]]

Comment on attachment 227440 [details] [diff] [review]
Fix branding, rev. 1

looks good to me, and makes sense with the error log we have for ga-IE, too.

Comment 16

[Axel Hecht [:Pike]]

To verify that this is fixed, we actually need nsis on the tinderboxens, filed bug
343055.

Comment 17

[Benjamin Smedberg]

Attachment: 1.8 branch merge, rev. 1

Comment 18

[Mike Beltzner [:beltzner, not reading bugmail]]

Comment on attachment 227577 [details] [diff] [review]
1.8 branch merge, rev. 1

approved as per 181drivers

Comment 19

[Benjamin Smedberg]

Woot, trunk and 1.8