Difference between revisions of "Development:Planning:Branching for Camino 2.0"
Jump to navigation
Jump to search
(→Other: more stuff) |
(→Other: bug) |
||
| (5 intermediate revisions by the same user not shown) | |||
| Line 6: | Line 6: | ||
==Files== | ==Files== | ||
| − | * mozilla/client.mk (will need to track any Core changes following branching) [http:// | + | * mozilla/client.mk (will need to track any Core changes following branching) - client.mk changes: [http://bonsai.mozilla.org/cvsview2.cgi?diff_mode=context&whitespace_mode=show&subdir=mozilla&command=DIFF_FRAMESET&file=client.mk&rev1=1.393&rev2=1.393.4.1&root=/cvsroot] |
* mozilla/camino | * mozilla/camino | ||
* mozilla/tools/tinderbox-configs/camino | * mozilla/tools/tinderbox-configs/camino | ||
| − | + | * mozilla/build/macosx/universal (needed to prevent breaking user builds) | |
==Tinderboxen and versioning== | ==Tinderboxen and versioning== | ||
* Update 2.0 branch tinder-configs for branch name (uncomment <code>$BuildTag</code> and set to "CAMINO_2_0_BRANCH", set <code>$milestone</code> to "2.0-M1.9", and set <code>$BuildNameExtra</code> to "Cm2-M1.9" if it isn't already correct) | * Update 2.0 branch tinder-configs for branch name (uncomment <code>$BuildTag</code> and set to "CAMINO_2_0_BRANCH", set <code>$milestone</code> to "2.0-M1.9", and set <code>$BuildNameExtra</code> to "Cm2-M1.9" if it isn't already correct) | ||
| − | * rsync Cm2-M1.9 to Cm2.1-M1.9 for "new" trunk on any tinderbox that will pull both | + | * rsync Cm2-M1.9 to Cm2.1-M1.9 for "new" trunk on any tinderbox that will pull both, or where the "tree" directory needs to be renamed ([[Releases:Branch_Tag_Build_Release#Make_Tinderbox_build_it|link]]) |
| − | * Update multi-config.pl to run the new trunk on any tinderbox | + | * Update multi-config.pl to run the new trunk on any tinderbox ([[Releases:Branch_Tag_Build_Release#Make_Tinderbox_build_it|link]] - "relevant snippet") |
| − | * Update tinderbox-config checkout in Cm2-M1.9/ to pull 2.0 branch files | + | * Update tinderbox-config checkout in Cm2-M1.9/ to pull 2.0 branch files ([[IT:Setting_up_Camino_Tinderboxen#Setting_up_Tinderbox|link]] - cvs co -d) |
** cb-xserve01 and probably cb-minibinus01 to pull/build CAMINO_2_0_BRANCH code and tinder-configs | ** cb-xserve01 and probably cb-minibinus01 to pull/build CAMINO_2_0_BRANCH code and tinder-configs | ||
* Update trunk tinder-configs for new version (<code>$BuildNameExtra</code> to "Cm2.1-M1.9" and <code>$milestone</code> to "2.1-M1.9", which controls the ftp dir) | * Update trunk tinder-configs for new version (<code>$BuildNameExtra</code> to "Cm2.1-M1.9" and <code>$milestone</code> to "2.1-M1.9", which controls the ftp dir) | ||
| Line 23: | Line 23: | ||
==Other== | ==Other== | ||
* Committers should use a local wrapper for cross-commit to provide branch args | * Committers should use a local wrapper for cross-commit to provide branch args | ||
| − | * Socorro | + | * Get 2.1a1pre into Socorro search field - {{bug|504206}} |
* "Branch" field in Bugzilla will need something for 2.0.x branch | * "Branch" field in Bugzilla will need something for 2.0.x branch | ||
* Update status whiteboard docs for [camino-2.0] whiteboard entries | * Update status whiteboard docs for [camino-2.0] whiteboard entries | ||
* Update website's "nightly" page to pull desired branch | * Update website's "nightly" page to pull desired branch | ||
| + | * Update pref dashboard for new branch builders | ||
| + | * Update [[Development:Building]] with which boxen to watch | ||
Latest revision as of 16:31, 14 July 2009
This page exists to provide a repository for requirements, notes, and other information relating to branching CVS trunk in order to support ongoing development for features out-of-scope for Camino 2 while providing a stable branch for the completion for Camino 2 and its subsequent security and stability updates.
Schedule
- Mid-late June, following the end of releasemania
Files
- mozilla/client.mk (will need to track any Core changes following branching) - client.mk changes: [1]
- mozilla/camino
- mozilla/tools/tinderbox-configs/camino
- mozilla/build/macosx/universal (needed to prevent breaking user builds)
Tinderboxen and versioning
- Update 2.0 branch tinder-configs for branch name (uncomment
$BuildTagand set to "CAMINO_2_0_BRANCH", set$milestoneto "2.0-M1.9", and set$BuildNameExtrato "Cm2-M1.9" if it isn't already correct) - rsync Cm2-M1.9 to Cm2.1-M1.9 for "new" trunk on any tinderbox that will pull both, or where the "tree" directory needs to be renamed (link)
- Update multi-config.pl to run the new trunk on any tinderbox (link - "relevant snippet")
- Update tinderbox-config checkout in Cm2-M1.9/ to pull 2.0 branch files (link - cvs co -d)
- cb-xserve01 and probably cb-minibinus01 to pull/build CAMINO_2_0_BRANCH code and tinder-configs
- Update trunk tinder-configs for new version (
$BuildNameExtrato "Cm2.1-M1.9" and$milestoneto "2.1-M1.9", which controls the ftp dir) - Update version number on trunk to "2.1a1pre"
Other
- Committers should use a local wrapper for cross-commit to provide branch args
- Get 2.1a1pre into Socorro search field - Bug 504206
- "Branch" field in Bugzilla will need something for 2.0.x branch
- Update status whiteboard docs for [camino-2.0] whiteboard entries
- Update website's "nightly" page to pull desired branch
- Update pref dashboard for new branch builders
- Update Development:Building with which boxen to watch
