545431 - Make xulrunner support MOZ_PKG_PRETTYNAMES

Status: RESOLVED FIXED

(Toolkit Graveyard :: Build Config, defect, P3)

Description

[Rail Aliiev [:rail]]

Attachment: Proposed fix

Working on bug 497803 I get the following error:

make -f client.mk sdk
....
cd ../../dist && gtar -c --owner=0 --group=0 --numeric-owner --mode="go-w" -f - xulrunner-sdk | bzip2 -vf > linux-i686/en-US/xulrunner-3.6.sdk.tar.bz2
/bin/sh: linux-i686/en-US/xulrunner-3.6.sdk.tar.bz2: No such file or directory

Seems like make-sdk target requires additional step.

Please review the following patch and consider to land it to branches too.

Comment 1

[Rail Aliiev [:rail]]

Ted,

thanks a lot for your review.

I would like to retitle this bug and obsolete the patch with another one.

Xulrunner uses its own directory layout and naming convention for releases (when MOZ_PKG_PRETTYNAMES is set). See the current directory layout:
http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2rc1/

Please review the following patch and consider to land it to branches.

Comment 2

[Rail Aliiev [:rail]]

Attachment: Proposed patch v2

Comment 3

[(not currently active) Ted Mielczarek]

You are of course free to do what you like with your own bugs.

Comment 4

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

ted: ping on the r?

Comment 5

[(not currently active) Ted Mielczarek]

Sorry, queue is backed up a bit again. Will tend to it monday or so.

Comment 6

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

(In reply to comment #5)
> Sorry, queue is backed up a bit again. Will tend to it monday or so.
ping?

Comment 7

[(not currently active) Ted Mielczarek]

Comment on attachment 426649 [details] [diff] [review]
Proposed patch v2

Ok, this looks fine, sorry for the delay.

Comment 8

[(not currently active) Ted Mielczarek]

Rail pointed me at: https://wiki.mozilla.org/Releases/Firefox_3.5.7/BuildNotes#XULRunner_build

which is the notes on how the directory structure is currently generated by hand(!)

Comment 9

[(not currently active) Ted Mielczarek]

Pushed to m-c:
http://hg.mozilla.org/mozilla-central/rev/cdd4b50a322f

Comment 10

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

1) Ted: thanks for landing this on mozilla-central.

2) We need this landed on each branch where we are providing xulrunner releases, hence the requests for 191, 192.

Comment 11

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

this time with the flags, lost during mid-air-collision.

Comment 12

[Daniel Veditz [:dveditz]]

Not blocking, ask for approval on the patch if you want to get it in.

Comment 13

[Nick Thomas [:nthomas] (UTC+12)]

I think this bug regressed the naming of the SDKs. Previously we had 
  xulrunner-1.9.3a3pre.en-US.mac-i386.sdk.tar.bz2
and now its
  xulrunner.en-US.mac-i386.sdk.tar.bz2

Looks like 
  http://hg.mozilla.org/mozilla-central/rev/cdd4b50a322f#l2.22
left out a -$(MOZ_PKG_VERSION).

Comment 14

[Rail Aliiev [:rail]]

Attachment: fix-mac-sdk-name.diff

Comment 15

[Nick Thomas [:nthomas] (UTC+12)]

Comment on attachment 430520 [details] [diff] [review]
fix-mac-sdk-name.diff

http://hg.mozilla.org/mozilla-central/rev/e93efbc87c88

Verifying this fix relies on bug 552339 giving us back XULRunner nightlies.

Comment 16

[Rail Aliiev [:rail]]

(In reply to comment #15)
> (From update of attachment 430520 [details] [diff] [review])
> http://hg.mozilla.org/mozilla-central/rev/e93efbc87c88
> 
> Verifying this fix relies on bug 552339 giving us back XULRunner nightlies.

In other words, everything is OK after applying both patches.

Comment 17

[Daniel Veditz [:dveditz]]

Comment on attachment 430520 [details] [diff] [review]
fix-mac-sdk-name.diff

Please get us a combined branch-merged patch of what you want us to approve for branches.

Comment 18

[Rail Aliiev [:rail]]

Attachment: combined patch for 1.9.1

Comment 19

[Rail Aliiev [:rail]]

Attachment: combined patch for 1.9.2

Comment 20

[(not currently active) Ted Mielczarek]

You don't need re-review unless you've made significant changes. Just merging two patches into one is fine. If that's all you had to do, then feel free to simply request approval on these pathes.

Comment 21

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

Comment on attachment 436428 [details] [diff] [review]
combined patch for 1.9.2

a=beltzner for 1.9.2.4 and 1.9.1.10

Comment 22

[Reed Loden [:reed]]

http://hg.mozilla.org/releases/mozilla-1.9.2/rev/45ee15e1d407

Comment 23

[Reed Loden [:reed]]

http://hg.mozilla.org/releases/mozilla-1.9.1/rev/a2f5c0776892