Closed
Bug 481680
Opened 16 years ago
Closed 16 years ago
[Mac OSX] Beta 3 build 1 are showing "Mozilla Firefox3.1b3" in window title
Categories
(Firefox Build System :: General, defect)
Tracking
(Not tracked)
VERIFIED
FIXED
mozilla3.1b3
People
(Reporter: tchung, Assigned: robert.strong.bugs)
References
Details
(Keywords: regression)
Attachments
(3 files, 1 obsolete file)
(deleted),
image/png
|
Details | |
(deleted),
patch
|
Details | Diff | Splinter Review | |
(deleted),
patch
|
mconnor
:
review+
|
Details | Diff | Splinter Review |
As a result of bug 468197, its seems that the beta 3 build 1 builds, are showing "Mozilla Firefox3.1b3" in the title of every new tab.
Compared to Beta 2, new tabs there display "Mozilla Firefox 3.1 Beta 2"
Flags: blocking-firefox3.1?
Assignee | ||
Comment 1•16 years ago
|
||
The only thing I can think of that would cause this is Mac OS X not liking the new lines in Makefile.in here
http://mxr.mozilla.org/mozilla-central/source/browser/base/Makefile.in#58
Reporter | ||
Comment 2•16 years ago
|
||
Comment 3•16 years ago
|
||
I cannot see this on windows. Seems like os x (linux) only.
Summary: Beta 3 build 1 are showing "Mozilla Firefox3.1b3" in new tabs → Beta 3 build 1 are showing "Mozilla Firefox3.1b3" in window title
Comment 4•16 years ago
|
||
On Linux (Ubuntu 8.10) the window title says: "Mozilla Firefox 3.1 Beta 3" when I focus on a new (Untitled) tab.
Comment 5•16 years ago
|
||
(In reply to comment #1)
> The only thing I can think of that would cause this is Mac OS X not liking the
> new lines in Makefile.in here
> http://mxr.mozilla.org/mozilla-central/source/browser/base/Makefile.in#58
Given the previous comments it sounds like you're right about this.
Comment 6•16 years ago
|
||
Indeed:
bitters-2:tmp bhearsum$ echo "3.1b3" | \
> sed -e '/pre/s/.*//g' -e '/[ab][0-9]/!s/.*//g' \
> -e 's/\(.*[0-9]\)a\([0-9]\+\)/ \1 Alpha \2/g' \
> -e 's/\(.*[0-9]\)b\([0-9]\+\)/ \1 Beta \2/g'
3.1b3
(Run on my Mac)
Reporter | ||
Comment 7•16 years ago
|
||
sounds like a fix for mac only in build 2. Thanks for the investigation folks.
Summary: Beta 3 build 1 are showing "Mozilla Firefox3.1b3" in window title → [Mac OSX] Beta 3 build 1 are showing "Mozilla Firefox3.1b3" in window title
Comment 8•16 years ago
|
||
So we're confirmed that Linux and Windows are properly titled?
Reporter | ||
Comment 9•16 years ago
|
||
(In reply to comment #8)
> So we're confirmed that Linux and Windows are properly titled?
Yes. it's a mac-issue only.
Assignee | ||
Comment 10•16 years ago
|
||
bhearsum, could you verify the following works since I don't have a Mac?
PRE_RELEASE_SUFFIX = $(shell cat $(srcdir)/../config/version.txt | \
sed -e '/pre/s/.*//g' -e '/[ab][0-9]/!s/.*//g' | \
sed -e 's/\(.*[0-9]\)a\([0-9]\+\)/ \1 Alpha \2/g' | \
sed -e 's/\(.*[0-9]\)b\([0-9]\+\)/ \1 Beta \2/g')
Comment 11•16 years ago
|
||
No good:
bitters-2:tmp bhearsum$ echo "3.1b3" | sed -e '/pre/s/.*//g' -e '/[ab][0-9]/!s/.*//g' | sed -e 's/\(.*[0-9]\)a\([0-9]\+\)/ \1 Alpha \2/g' | sed -e 's/\(.*[0-9]\)b\([0-9]\+\)/ \1 Beta \2/g'
3.1b3
FWIW, the regexes here are confirmed to work on all 3 platforms:
http://mxr.mozilla.org/mozilla-central/source/toolkit/mozapps/installer/package-name.mk#120
Assignee | ||
Comment 12•16 years ago
|
||
Comment 13•16 years ago
|
||
For something this complex, you will get better results using perl or python: sed is only portable for fairly trivial examples.
Assignee | ||
Comment 14•16 years ago
|
||
(In reply to comment #11)
> No good:
> bitters-2:tmp bhearsum$ echo "3.1b3" | sed -e '/pre/s/.*//g' -e
> '/[ab][0-9]/!s/.*//g' | sed -e 's/\(.*[0-9]\)a\([0-9]\+\)/ \1 Alpha \2/g' | sed
> -e 's/\(.*[0-9]\)b\([0-9]\+\)/ \1 Beta \2/g'
> 3.1b3
>
> FWIW, the regexes here are confirmed to work on all 3 platforms:
> http://mxr.mozilla.org/mozilla-central/source/toolkit/mozapps/installer/package-name.mk#120
The only real difference between the patch (e.g. comment #10) and package-name.mk is package-name.mk uses |\ and the patch uses | \ for the new lines
After Beta 3 a version is python can be committed... there is already one in an obsoleted patch in bug 468197.
For Beta 3 let's just hardcode it to set PRE_RELEASE_SUFFIX to Beta 3... patch coming up
Assignee | ||
Comment 15•16 years ago
|
||
Assignee: nobody → robert.bugzilla
Comment 16•16 years ago
|
||
Interestingly, I couldn't make the package-name.mk version work outside of a Makefile. However, even after putting your latest regex in a Makefile it still didn't work Rob:
bitters-2:a bhearsum$ cat Makefile
VER = 3.1b3
PRE_RELEASE_SUFFIX = $(shell echo $(VER) | \
sed -e '/pre/s/.*//g' -e '/[ab][0-9]/!s/.*//g' | \
sed -e 's/\(.*[0-9]\)a\([0-9]\+\)/ \1 Alpha \2/g' | \
sed -e 's/\(.*[0-9]\)b\([0-9]\+\)/ \1 Beta \2/g')
foo:
echo $(PRE_RELEASE_SUFFIX)
bitters-2:a bhearsum$ make -f Makefile
echo 3.1b3
3.1b3
bitters-2:a bhearsum$ cat Makefile2
VER = 3.1b3
MOZ_PKG_LONGVERSION = $(shell echo $(VER) |\
sed -e 's/a\([0-9][0-9]*\)$$/ Alpha \1/' |\
sed -e 's/b\([0-9][0-9]*\)$$/ Beta \1/' |\
sed -e 's/rc\([0-9][0-9]*\)$$/ RC \1/')
foo:
echo $(MOZ_PKG_LONGVERSION)
bitters-2:a bhearsum$ make -f Makefile2
echo 3.1 Beta 3
3.1 Beta 3
Assignee | ||
Comment 17•16 years ago
|
||
Attachment #365696 -
Attachment is obsolete: true
Assignee | ||
Comment 18•16 years ago
|
||
(In reply to comment #16)
> Interestingly, I couldn't make the package-name.mk version work outside of a
> Makefile. However, even after putting your latest regex in a Makefile it still
> didn't work Rob:
> bitters-2:a bhearsum$ cat Makefile
> VER = 3.1b3
> PRE_RELEASE_SUFFIX = $(shell echo $(VER) | \
> sed -e '/pre/s/.*//g' -e '/[ab][0-9]/!s/.*//g' | \
> sed -e 's/\(.*[0-9]\)a\([0-9]\+\)/ \1 Alpha \2/g' | \
> sed -e 's/\(.*[0-9]\)b\([0-9]\+\)/ \1 Beta \2/g')
> foo:
> echo $(PRE_RELEASE_SUFFIX)
> bitters-2:a bhearsum$ make -f Makefile
> echo 3.1b3
> 3.1b3
That is strange... it works for me and it isn't obvious what could be different about sed's handling on Mac OS X could be in this instance
Assignee | ||
Updated•16 years ago
|
Attachment #365702 -
Flags: review?(mconnor)
Comment 19•16 years ago
|
||
sed on mac is BSD sed, not GNU sed. There are a host of differences.
Assignee | ||
Comment 20•16 years ago
|
||
Thanks Benjamin, I filed bug 481703 to use python to create the string.
Comment 21•16 years ago
|
||
Comment on attachment 365702 [details] [diff] [review]
actually hardcode the correct string
tested on Mac, works fine. We should take this on the relbranch only.
Attachment #365702 -
Flags: review?(mconnor) → review+
Comment 22•16 years ago
|
||
(In reply to comment #17)
> Created an attachment (id=365702) [details]
> actually hardcode the correct string
Pushed to the relbranch:
https://hg.mozilla.org/releases/mozilla-1.9.1/rev/3d9704097cd8
Updated•16 years ago
|
Comment 23•16 years ago
|
||
Filed bug 481708 for a real fix to this.
Updated•16 years ago
|
Keywords: regression
Comment 24•16 years ago
|
||
Verified fixed on the 1.9.1 branch using Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1b3) Gecko/20090305 Firefox/3.1b3 (Build 2). I checked the same build on Mac Tiger and it looks fine on there as well - it properly shows "Mozilla Firefox 3.1 Beta 3" - without the quotes of course.
Keywords: fixed1.9.1 → verified1.9.1
Comment 25•16 years ago
|
||
This is relbranch only so marking as verified too.
Status: RESOLVED → VERIFIED
Updated•16 years ago
|
Flags: blocking-firefox3.1?
Updated•6 years ago
|
Component: Build Config → General
Product: Firefox → Firefox Build System
Updated•6 years ago
|
Keywords: regression,
verified1.9.1
Target Milestone: Firefox 3.1b3 → mozilla3.1b3
Updated•6 years ago
|
Keywords: regression
You need to log in
before you can comment on or make changes to this bug.
Description
•