Closed
Bug 339714
Opened 18 years ago
Closed 18 years ago
Locale repackaging to support the NSIS installer
Categories
(Firefox :: Installer, defect, P1)
Tracking
()
RESOLVED
FIXED
Firefox 2 beta1
People
(Reporter: robert.strong.bugs, Assigned: benjamin)
References
Details
(Keywords: fixed1.8.1, Whiteboard: 181b1+)
Attachments
(5 files, 1 obsolete file)
3.60 KB,
patch
|
robert.strong.bugs
:
review+
|
Details | Diff | Splinter Review |
10.16 KB,
patch
|
robert.strong.bugs
:
review+
|
Details | Diff | Splinter Review |
919 bytes,
patch
|
mattwillis
:
review+
|
Details | Diff | Splinter Review |
1.14 KB,
patch
|
Pike
:
review+
|
Details | Diff | Splinter Review |
18.41 KB,
patch
|
beltzner
:
approval1.8.1+
|
Details | Diff | Splinter Review |
The build scripts will need to be updated to support locale repackaging for the NSIS installer implemented in bug 326580.
Assignee | ||
Updated•18 years ago
|
Assignee: nobody → benjamin
Priority: -- → P1
Target Milestone: --- → Firefox 2 beta1
Assignee | ||
Updated•18 years ago
|
Flags: blocking-firefox2+
Assignee | ||
Comment 1•18 years ago
|
||
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.
Attachment #227268 -
Flags: review?(robert.bugzilla)
Reporter | ||
Updated•18 years ago
|
Attachment #227268 -
Flags: review?(robert.bugzilla) → review+
Comment 3•18 years ago
|
||
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•18 years ago
|
||
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•18 years ago
|
||
(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•18 years ago
|
||
> 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
Updated•18 years ago
|
Whiteboard: 181b1+
Comment 8•18 years ago
|
||
(In reply to comment #7) > Created an attachment (id=227347) [edit] > patch to fix regression Patch checked in on _trunk_only_.
Comment 9•18 years ago
|
||
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.
Reporter | ||
Comment 10•18 years ago
|
||
Comment on attachment 227315 [details] [diff] [review] Repack it!, rev. 1 very nice
Attachment #227315 -
Flags: review?(robert.bugzilla) → review+
Reporter | ||
Comment 11•18 years ago
|
||
Changes needed for calendar
Attachment #227390 -
Flags: review?(mattwillis)
Comment 12•18 years ago
|
||
> 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 :)
Assignee | ||
Comment 13•18 years ago
|
||
Attachment #227440 -
Flags: review?(l10n)
Reporter | ||
Comment 14•18 years ago
|
||
Comment on attachment 227390 [details] [diff] [review] patch for calendar Opened bug 343024 for Calendar
Attachment #227390 -
Attachment is obsolete: true
Attachment #227390 -
Flags: review?(mattwillis)
Comment 15•18 years ago
|
||
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.
Attachment #227440 -
Flags: review?(l10n) → review+
Comment 16•18 years ago
|
||
To verify that this is fixed, we actually need nsis on the tinderboxens, filed bug 343055.
Depends on: 343055
Assignee | ||
Comment 17•18 years ago
|
||
Attachment #227577 -
Flags: approval1.8.1?
Comment 18•18 years ago
|
||
Comment on attachment 227577 [details] [diff] [review] 1.8 branch merge, rev. 1 approved as per 181drivers
Attachment #227577 -
Flags: approval1.8.1? → approval1.8.1+
Updated•18 years ago
|
Whiteboard: 181b1+ → 181b1+ [checkin needed]
Assignee | ||
Comment 19•18 years ago
|
||
Woot, trunk and 1.8
Updated•18 years ago
|
Whiteboard: 181b1+ [checkin needed] → 181b1+
You need to log in
before you can comment on or make changes to this bug.
Description
•