436926 - Change branding in CVS (1.9 branch) to "Gran Paradiso", and bump version to 3.0.1pre

Status: VERIFIED FIXED

(Firefox Build System :: General, defect, P2)

Description

[Samuel Sidler (old account; do not CC)]

On the 1.8 branch, nightly builds are known as "Bon Echo" which helps distinguish them from trunk nightlies which are known as "Minefield". We should do the same thing for 1.9.0.x and change the branding to "Gran Paradiso" from "Minefield".

Comment 2

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

We should also bump the version to 3.0.1pre/1.9.0.1pre on Tuesday.

Comment 3

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

Hmm, so we can set 
  ac_add_options --with-branding=browser/branding/unofficial 
in the mozconfig for the nightly tinderboxes, but that doesn't help anyone building for themselves. On Mozilla1.8, if you don't specify any branding options then you get Bon Echo. IIRC we also have three branding options on cvs HEAD (default - Minefield, browser/branding/unofficial - Gran Paradiso, other-licenses/branding/firefox/ - Firefox), versus two on the 1.8 branch. What is the desired outcome here ?

You can see from 
  http://mxr.mozilla.org/seamonkey/search?string=Minefield
that there are lots of other places we use Minefield, eg talos would need a tweak too.

Comment 4

[Benjamin Smedberg]

I don't think we care about the default branding you get when self-built, only the tinderbox builds.

Comment 5

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

Attachment: [checked in] Tinderbox configuration

This should get the tinderbox building using the Gran Paradiso branding.

Comment 6

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

Attachment: Talos changes to cope with bundle name changing on mac

I think this is touching cvs head builders another else. Would need to go into production about the time attachment 324953 [details] [diff] [review] landed.

Comment 7

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

Attachment: [checked in] Version bump to 3.0.1pre/1.9.0.1pre

Benjamin, is this the right change to make for the versioning ? (Can land separately to the other changes)

Comment 8

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

We might need to tweak 
  http://mxr.mozilla.org/seamonkey/source/browser/app/macbuild/license.r
too. There are 8 Minefields in there.

Comment 9

[alice nodelman [:alice] [:anode]]

Comment on attachment 324955 [details] [diff] [review]
Talos changes to cope with bundle name changing on mac

Will require a buildbot reconfig.  We'll have to make sure that we coordinate the change to avoid as much burning as we can.

Comment 10

[alice nodelman [:alice] [:anode]]

Talos change to cope with change.

/cvsroot/mozilla/tools/buildbot-configs/testing/talos/perfmaster/master.cfg,v  <--  master.cfg
new revision: 1.70; previous revision: 1.69
done
Checking in perf-staging/master.cfg;
/cvsroot/mozilla/tools/buildbot-configs/testing/talos/perf-staging/master.cfg,v  <--  master.cfg
new revision: 1.16; previous revision: 1.15
done

Comment 11

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

Comment on attachment 324953 [details] [diff] [review]
[checked in] Tinderbox configuration

Checking in linux/mozconfig;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/linux/mozconfig,v  <--  mozconfig
new revision: 1.18; previous revision: 1.17
done
Checking in macosx/mozconfig;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig,v  <--  mozconfig
new revision: 1.17; previous revision: 1.16
done
Checking in macosx/tinder-config.pl;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl,v  <--  tinder-config.pl
new revision: 1.47; previous revision: 1.46
done
Checking in win32/mozconfig;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/win32/mozconfig,v  <--  mozconfig
new revision: 1.23; previous revision: 1.22
done

and clobbered at the same time.

Comment 12

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

Comment on attachment 324957 [details] [diff] [review]
[checked in] Version bump to 3.0.1pre/1.9.0.1pre

Checking in browser/app/module.ver;
/cvsroot/mozilla/browser/app/module.ver,v  <--  module.ver
new revision: 1.28; previous revision: 1.27
done
Checking in browser/config/version.txt;
/cvsroot/mozilla/browser/config/version.txt,v  <--  version.txt
new revision: 1.20; previous revision: 1.19
done
Checking in config/milestone.txt;
/cvsroot/mozilla/config/milestone.txt,v  <--  milestone.txt
new revision: 3.43; previous revision: 3.42
done
Checking in tools/tinderbox-configs/monitoring/Firefox_trunk.txt;
/cvsroot/mozilla/tools/tinderbox-configs/monitoring/Firefox_trunk.txt,v  <--  Firefox_trunk.txt
new revision: 1.20; previous revision: 1.19
done
Checking in tools/tinderbox-configs/monitoring/XULRunner_trunk.txt;
/cvsroot/mozilla/tools/tinderbox-configs/monitoring/XULRunner_trunk.txt,v  <--  XULRunner_trunk.txt
new revision: 1.20; previous revision: 1.19
done

Comment 13

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

(In reply to comment #8)
> We might need to tweak 
>   http://mxr.mozilla.org/seamonkey/source/browser/app/macbuild/license.r
> too. There are 8 Minefields in there.

You want http://mxr.mozilla.org/seamonkey/source/browser/branding/unofficial/license.r for unoffical branding, no?  (That was the file used for GranParadiso branding for the early alphas.)

Comment 14

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

(In reply to comment #13)
> You want
> http://mxr.mozilla.org/seamonkey/source/browser/branding/unofficial/license.r
> for unoffical branding, no?  (That was the file used for GranParadiso branding
> for the early alphas.)

You're absolutely right, and that's the file the build system picks up. Just noise on my part.

I'm reopening this to fix up the l10n builds. In particular, the mac l10n builds were burning as they tried to sync out of Minefield.app instead of GranParadiso.app. Looks like that's happening because we didn't add
  ac_add_options --with-branding=browser/branding/unofficial
to the l10n mozconfig, but if you do then you get
  error: file '../../../../../l10n/af/browser/branding/unofficial/brand.dtd' doesn't exist at ../../../../config/make-jars.pl line 464, <STDIN> line 5.

Maybe we can set MOZ_APP_DISPLAYNAME in tinder-config.pl's $BuildLocalesArgs. I'll take a look tomorrow.

Comment 15

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

Linux and Windows builds are created ok but they're a bit confused, eg the app name is Minefield but they load 
  http://www.mozilla.org/projects/granparadiso/
on first run and use the plain globe icon.

Comment 16

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

(In reply to comment #15)
l10n builds, that is.

Comment 17

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

Attachment: [checked in] l10n tinderbox configs

Very similar to the en-US changes (attachment 324953 [details] [diff] [review]) only $ProductName isn't set for l10n. Requires the fix in bug 440431.

Comment 18

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

Comment on attachment 325776 [details] [diff] [review]
[checked in] l10n tinderbox configs

Checking in firefox/linux/mozconfig;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/linux/mozconfig,v  <--  mozconfig
new revision: 1.1.2.9; previous revision: 1.1.2.8
done
Checking in firefox/macosx/mozconfig;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig,v  <--  mozconfig
new revision: 1.2.6.8; previous revision: 1.2.6.7
done
Checking in firefox/win32/mozconfig;
/cvsroot/mozilla/tools/tinderbox-configs/firefox/win32/mozconfig,v  <--  mozconfig
new revision: 1.2.4.6; previous revision: 1.2.4.5
done

Leaving the bug open until we verify l10n is working.

Comment 19

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

l10n builds look fine.

Comment 20

[Henrik Skupin [:whimboo][⌚️UTC+1]]

I can verify the fix for en_US builds on OS X and Windows:

Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.4; en-US; rv:1.9.0.1pre) Gecko/2008062004 GranParadiso/3.0.1pre ID:2008062004

Do we need some more checks before marking this bug as VERIFIED?

Comment 21

[Axel Hecht [:Pike]]

I'd say that we should verify this for at least one localized build, too. And probably for all three platforms.

Comment 22

[Tony Chung [:tchung]]

Verified fix also on

Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.1pre) Gecko/2008070204 GranParadiso/3.0.1pre

Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.1pre) Gecko/2008070206 Minefield/3.0.1pre

Comment 23

[Tony Chung [:tchung]]

changing keyword to verified1.9.0.1

Comment 24

[Henrik Skupin [:whimboo][⌚️UTC+1]]

(In reply to comment #21)
> I'd say that we should verify this for at least one localized build, too. And
> probably for all three platforms.

We forgot a localized build. So everything is fine for DE with Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.0.2pre) Gecko/2008070706 GranParadiso/3.0.2pre ID:2008070706