Difference between revisions of "Development:Planning:Branching for Camino 2.0"

From Camino Wiki
Jump to navigation Jump to search
(→‎Files: linky redux)
(→‎Other: more stuff)
Line 10: Line 10:
 
* mozilla/tools/tinderbox-configs/camino
 
* mozilla/tools/tinderbox-configs/camino
 
[http://pastebin.mozilla.org/659513]
 
[http://pastebin.mozilla.org/659513]
 +
 +
==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)
 +
* rsync Cm2-M1.9 to Cm2.1-M1.9 for "new" trunk on any tinderbox that will pull both
 +
* Update multi-config.pl to run the new trunk on any tinderbox
 +
* Update tinderbox-config checkout in Cm2-M1.9/ to pull 2.0 branch files
 +
** 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 version number on trunk to "2.1a1pre"
  
 
==Other==
 
==Other==
−
 
−
* Update cb-xserve01 and probably cb-minibinus01 to pull/build CAMINO_2_0_BRANCH code and tinder-configs
 
−
* Update 2.0 branch tinder-configs for branch name
 
−
* Update trunk tinder-configs for Cm2.1-M1.9
 
−
* Update version number on trunk to 2.1a1pre
 
 
* 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
 
* Socorro
 
* "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

Revision as of 10:01, 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) [1] [2] (for reference)
  • mozilla/camino
  • mozilla/tools/tinderbox-configs/camino

[3]

Tinderboxen and versioning

  • Update 2.0 branch tinder-configs for branch name (uncomment $BuildTag and set to "CAMINO_2_0_BRANCH", set $milestone to "2.0-M1.9", and set $BuildNameExtra 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
  • Update multi-config.pl to run the new trunk on any tinderbox
  • Update tinderbox-config checkout in Cm2-M1.9/ to pull 2.0 branch files
    • cb-xserve01 and probably cb-minibinus01 to pull/build CAMINO_2_0_BRANCH code and tinder-configs
  • Update trunk tinder-configs for new version ($BuildNameExtra to "Cm2.1-M1.9" and $milestone to "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
  • Socorro
  • "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
Retrieved from "http://wiki.caminobrowser.org/index.php?title=Development:Planning:Branching_for_Camino_2.0&oldid=10138"