.mar generation should package universal build when the build is universal

RESOLVED FIXED

Status

()

Core
Build Config
RESOLVED FIXED
12 years ago
10 years ago

People

(Reporter: Mark Mentovai, Assigned: Mark Mentovai)

Tracking

({fixed1.8.0.2, fixed1.8.1})

Trunk
PowerPC
Mac OS X
fixed1.8.0.2, fixed1.8.1
Points:
---
Bug Flags:
blocking1.8.0.2 +

Firefox Tracking Flags

(Not tracked)

Details

(Whiteboard: [nvn-dl])

Attachments

(2 attachments)

(Assignee)

Description

12 years ago
I erroneously assumed that .mar generation was entirely out-of-process and relied on unpackaging.  I now see that's not the case.

When generating the complete .mar for a build that was universal, the universal build should be packaged into the .mar.  This is probably as simple as adding a check here:

http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/tools/update-packaging/Makefile.in&rev=1.7&mark=53#52

ifdef UNIVERSAL_BINARY
PACKAGE_DIR	= $(DIST)/universal/$(MOZ_PKG_APPNAME)/$(MOZ_APP_DISPLAYNAME).app
else
PACKAGE_DIR	= $(DIST)/$(MOZ_PKG_APPNAME)/$(MOZ_APP_DISPLAYNAME).app
endif

Are any other in-tree changes needed to support AUS?
(Assignee)

Updated

12 years ago
Flags: blocking1.8.0.2?
(Assignee)

Comment 1

12 years ago
Created attachment 212993 [details] [diff] [review]
Build universal .mar

This implements my proposed change, which works.
Attachment #212993 - Flags: review?(darin)

Updated

12 years ago
Attachment #212993 - Flags: review?(darin) → review+
(Assignee)

Updated

12 years ago
Attachment #212993 - Flags: approval1.8.0.2?
Attachment #212993 - Flags: approval-branch-1.8.1+
(Assignee)

Comment 2

12 years ago
Fixed on trunk.
Status: NEW → RESOLVED
Last Resolved: 12 years ago
Resolution: --- → FIXED
(Assignee)

Comment 3

12 years ago
This must be taken on the branch to produce .mar files for AUS in the universal universe.
(Assignee)

Updated

12 years ago
Attachment #212993 - Flags: approval1.8.0.2?
Attachment #212993 - Flags: approval-branch-1.8.1+
(Assignee)

Comment 4

12 years ago
Created attachment 213075 [details] [diff] [review]
Branch version

Checked in on MOZILLA_1_8_BRANCH.
Attachment #213075 - Flags: approval1.8.0.2?
Attachment #213075 - Flags: approval-branch-1.8.1+
Flags: blocking1.8.0.2? → blocking1.8.0.2+
(Assignee)

Updated

12 years ago
Keywords: fixed1.8.1
Comment on attachment 213075 [details] [diff] [review]
Branch version

approved for 1.8.9 branch, a=dveditz for drivers
Attachment #213075 - Flags: approval1.8.0.2? → approval1.8.0.2+
(Assignee)

Comment 6

12 years ago
I hope you don't mind that I checked it in on the 1.8.0 branch instead.
Keywords: fixed1.8.0.2

Updated

12 years ago
Whiteboard: [nvn-dl]

Updated

10 years ago
Blocks: 410627
You need to log in before you can comment on or make changes to this bug.