362418 - Version/config bumps for Gecko1.9a1

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Robert Helmer [:rhelmer]]

Need to create a "-Release" build dir for each platform, and check in new mozconfig/tinder-configs for the release build to use.

Comment 1

[Robert Helmer [:rhelmer]]

Attachment: proposed mozconfig/tinder-config changes

Note that it pulls a "GECKO_1_9a1" tag instead of using a pull date, let me know if this is ok.

Comment 2

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Comment on attachment 247113 [details] [diff] [review]
proposed mozconfig/tinder-config changes


It looks like you're missing the win32 changes? r=me for these, I think these are ok, but I'm not sure if there's anything else that should be in there for a release build.

>RCS file: /cvsroot/mozilla/tools/tinderbox-configs/firefox/linux/mozconfig,v
>retrieving revision 1.1
>diff -u -r1.1 mozconfig
>--- linux/mozconfig	6 Nov 2006 20:11:03 -0000	1.1
>+++ linux/mozconfig	1 Dec 2006 00:09:36 -0000
>@@ -10,7 +10,7 @@
> mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging mozilla/tools/codesighs"
> ac_add_options --enable-application=browser
> 
>-ac_add_options --enable-update-channel=nightly
>+ac_add_options --enable-update-channel=beta
> ac_add_options --enable-update-packaging
> 
> ac_add_options --enable-optimize
>@@ -26,4 +26,5 @@
> ac_add_options --enable-static
> ac_add_options --disable-shared
> 
>-ac_add_options --enable-codesighs
>\ No newline at end of file
>+ac_add_options --enable-codesighs
>+ac_add_options --with-branding=browser/branding/unofficial

No codesighs.


>RCS file: /cvsroot/mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig,v
>retrieving revision 1.2
>diff -u -r1.2 mozconfig
>--- macosx/mozconfig	10 Aug 2006 22:18:11 -0000	1.2
>+++ macosx/mozconfig	1 Dec 2006 00:09:36 -0000
>@@ -11,7 +11,7 @@
> mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../build/universal
> 
> ac_add_options --enable-application=browser
>-ac_add_options --enable-update-channel=nightly
>+ac_add_options --enable-update-channel=beta
> ac_add_options --enable-optimize="-O2 -g"
> ac_add_options --disable-debug
> ac_add_options --disable-tests
>@@ -23,3 +23,4 @@
> ac_add_app_options ppc --enable-prebinding
> ac_add_options --enable-svg
> ac_add_options --enable-canvas
>+ac_add_options --with-branding=browser/branding/unofficial

This looks ok.

Comment 3

[Robert Helmer [:rhelmer]]

Comment on attachment 247113 [details] [diff] [review]
proposed mozconfig/tinder-config changes

new one coming up

Comment 4

[Robert Helmer [:rhelmer]]

Attachment: proposed mozconfig/tinder-config changes

another shot. disable codesighs, use MOZILLA_1_8_1a1_RELEASE tag, include win32.

Comment 5

[Robert Helmer [:rhelmer]]

Attachment: diffs between 1.8 branch mozconfigs and proposed trunk mozconfigs

difference between trunk and 1.8 branch release mozconfigs.. seem reasonable?

Comment 6

[Robert Helmer [:rhelmer]]

*** Bug 362416 has been marked as a duplicate of this bug. ***

Comment 7

[J. Paul Reed [:preed]]

Comment on attachment 247115 [details] [diff] [review]
proposed mozconfig/tinder-config changes


>-#$BuildTag = '';
>+$BuildTag = 'MOZILLA_1_8_1a1_RELEASE';

Wrong tag.

Comment 8

[J. Paul Reed [:preed]]

Comment on attachment 247115 [details] [diff] [review]
proposed mozconfig/tinder-config changes

Few other things:
 
> # Extra build name, if needed.
>-$BuildNameExtra = 'Universal Nightly';
>+$BuildNameExtra = 'Universal Release';

You can set this to 'Release'; Universal is a useless modifier, now that everything is Universal. If you want to be proactive, and change it for the nightly configs, too, by my guest.

>-# Build XForms
>-$BuildXForms = 1;

Should set $BuildXForms = 0 for all platforms.

Also, is firefox3.0a1 the right milestone? Might ask Vlad, but better milestone might be "mozilla1.9a1".

Comment 9

[Robert Helmer [:rhelmer]]

Attachment: mozconfig/tinderconfig changes - fix tag plus preed's suggestions

Thanks for catching the tag, here is a fix for that plus the other changes you proposed. Went ahead and changed firefox3.0a1 to mozilla1.9a1 (this is just for the dated dir it will be copied into AFAIK).

Comment 10

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Comment on attachment 247116 [details] [diff] [review]
diffs between 1.8 branch mozconfigs and proposed trunk mozconfigs

r=me with some changes:

>Index: linux/mozconfig

>+ac_add_options --enable-optimize
> ac_add_options --disable-debug
>-ac_add_options --enable-optimize="-Os -freorder-blocks -fno-reorder-functions -gstabs+"

We should keep this --enable-optimize for linux.

>Index: macosx/mozconfig
>===================================================================
>RCS file: /cvsroot/mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig,v
>retrieving revision 1.2.10.1
>diff -u -r1.2.10.1 mozconfig
>--- macosx/mozconfig	8 Nov 2006 01:04:22 -0000	1.2.10.1
>+++ macosx/mozconfig	1 Dec 2006 00:32:09 -0000
>@@ -1,20 +1,17 @@
> #
>-## hostname: bm-xserve02.mozilla.or 
>-## uname: Darwin bm-xserve02.mozilla.org 8.7.0 Darwin Kernel Version 8.7.0: Fri May 26 15:20:53 PDT 2006; root:xnu-792.6.76.obj~1/RELEASE_PPC Power Macintosh powerpc
>+## hostname: xserve03.build.mozilla.org
>+## uname: Darwin xserve03.build.mozilla.org 8.1.0 Darwin Kernel Version 8.1.0: Tue May 10 18:16:08 PDT 2005; root:xnu-792.1.5.obj~4/RELEASE_PPC Power Macintosh powerpc
> #
> 
>-# . $topsrcdir/browser/config/mozconfig
>-
> . $topsrcdir/build/macosx/universal/mozconfig
> 
> mk_add_options MOZ_MAKE_FLAGS="-j4"
> mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
> mk_add_options MOZ_CO_PROJECT="browser"
>-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../build
>+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../build/universal
> 
> ac_add_options --enable-application=browser
>-ac_add_options --enable-update-channel="release"
>-ac_add_options --enable-official-branding
>+ac_add_options --enable-update-channel=beta
> ac_add_options --enable-optimize="-O2 -g"
> ac_add_options --disable-debug
> ac_add_options --disable-tests
>@@ -22,6 +19,8 @@
> 
> ac_add_options --enable-static
> ac_add_options --disable-shared
>+# ac_add_options --enable-official-branding
> ac_add_app_options ppc --enable-prebinding
> ac_add_options --enable-svg
> ac_add_options --enable-canvas
>+ac_add_options --with-branding=browser/branding/unofficial

OSX looks fine.

>Index: win32/mozconfig
>===================================================================
>RCS file: /cvsroot/mozilla/tools/tinderbox-configs/firefox/win32/mozconfig,v
>retrieving revision 1.2.8.1
>diff -u -r1.2.8.1 mozconfig
>--- win32/mozconfig	8 Nov 2006 02:30:18 -0000	1.2.8.1
>+++ win32/mozconfig	1 Dec 2006 00:32:09 -0000

>+ac_add_options --enable-places

Eeeek, no places!

Comment 11

[Robert Helmer [:rhelmer]]

Attachment: address vlad and preed's comments

Added vlad's changes for the mozconfigs, and preed pointed out in irc:

* $BuildXForms specified twice in Linux tinder-config
* "argo" should be "argo-vm" in Linux tinder-config

Comment 12

[J. Paul Reed [:preed]]

Comment on attachment 247125 [details] [diff] [review]
address vlad and preed's comments

r=preed, with the one following change:

Remove all commented out options in the mozconfig.

It's really easy to miss in a diff that the first character is a '#', so if they're turned off, just delete them entirely from the mozconfig.

Comment 13

[Robert Helmer [:rhelmer]]

Attachment: $UseTimeStamp should be off for release builds

$UseTimeStamp should be off for release builds

Comment 14

[J. Paul Reed [:preed]]

Comment on attachment 247134 [details] [diff] [review]
$UseTimeStamp should be off for release builds

This is obviously necessary; while we're at it, can you take a look at:

cvs diff -wu -rMOZILLA_1_8_BRANCH_release -rMOZILLA_1_9a1_RELEASE

run in mozilla/tools/tinderbox-configs/firefox, and see if anything else jumps out at you?

Comment 15

[Robert Helmer [:rhelmer]]

(In reply to comment #14)
> (From update of attachment 247134 [details] [diff] [review] [edit])
> This is obviously necessary; while we're at it, can you take a look at:
> 
> cvs diff -wu -rMOZILLA_1_8_BRANCH_release -rMOZILLA_1_9a1_RELEASE
> 
> run in mozilla/tools/tinderbox-configs/firefox, and see if anything else jumps
> out at you?
 
Good idea.. I don't see anything besides little consistency things (variables in different locations, using defaults instead of explicits etc.). I'd really like to make a pass through and move everything to a standard config, at some point; not right now, but soon.

Comment 16

[Robert Helmer [:rhelmer]]

Attachment: use GranParadiso instead of Minefield as per mconnor

Comment 17

[Robert Helmer [:rhelmer]]

Attachment: remove unsupported optimizations

remove unsupported optimizations, r=vlad in irc

Comment 18

[Robert Helmer [:rhelmer]]

Attachment: disable update_packaging and checkout of update tools

Comment 19

[Robert Helmer [:rhelmer]]

Attachment: do not remove update tools checkout from mozconfig as per preed

also fix the header in the linux mozconfig

Comment 20

[J. Paul Reed [:preed]]

Comment on attachment 247190 [details] [diff] [review]
do not remove update tools checkout from mozconfig as per preed

Ship it! (And let's see what breaks *this* time. :-)

Comment 21

[Robert Helmer [:rhelmer]]

Attachment: disable tests other than AliveTest

Comment 22

[Robert Helmer [:rhelmer]]

Attachment: bump to 3.0a2pre/1.9a2pre

Comment 23

[Robert Helmer [:rhelmer]]

*** Bug 364251 has been marked as a duplicate of this bug. ***

Comment 24

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

Attachment: Version bumps in nightly files monitoring config

Bumps Firefox & XULRunner versions in the Nagios configs

Comment 25

[Robert Helmer [:rhelmer]]

Comment on attachment 249018 [details] [diff] [review]
Version bumps in nightly files monitoring config

good catch on the xulrunner configs.

Comment 26

[J. Paul Reed [:preed]]

Comment on attachment 249016 [details] [diff] [review]
bump to 3.0a2pre/1.9a2pre

Looks good!

Comment 27

[Robert Helmer [:rhelmer]]

(In reply to comment #26)
> (From update of attachment 249016 [details] [diff] [review] [edit])
> Looks good!

Landed, thanks:

Checking in browser/app/module.ver;
/cvsroot/mozilla/browser/app/module.ver,v  <--  module.ver
new revision: 1.15; previous revision: 1.14
done
Checking in browser/config/version.txt;
/cvsroot/mozilla/browser/config/version.txt,v  <--  version.txt
new revision: 1.7; previous revision: 1.6
done
Checking in config/milestone.txt;
/cvsroot/mozilla/config/milestone.txt,v  <--  milestone.txt
new revision: 3.30; previous revision: 3.29
done

Comment 28

[Peter van der Woude [:Peter6]]

Latest FF shows: 

Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.9a1) Gecko/20061218 Minefield/3.0a2pre

i/o of with rv:1.9a2pre

Comment 29

[Benjamin Smedberg]

Attachment: Fix testerbox config, rev. 1

Comment 30

[Mike Connor [:mconnor]]

Comment on attachment 249114 [details] [diff] [review]
Fix testerbox config, rev. 1

r=mconnor

Comment 31

[Benjamin Smedberg]

Checking in linux/tinder-config.pl;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl,v  <-- tinder-config.pl
new revision: 1.1.6.6; previous revision: 1.1.6.5
done
Checking in win32/tinder-config.pl;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl,v  <-- tinder-config.pl
new revision: 1.2.6.6; previous revision: 1.2.6.5
done

Probably need to add this to a checklist somewhere.