| <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> |
| <html> |
| <head> |
| <title>OpenOffice.org - Branch Index</title> |
| <meta name="AUTHOR" content="Ken Foskey"> |
| <meta http-equiv="content-type" content="text/html; charset=UTF-8"> |
| </head> |
| <body> |
| <h1>Branches and Their Descriptions</h1> |
| <p>The following page describes the various names that we use for |
| OpenOffice.org and the abilities of those branches. This list is not |
| meant to be comprehensive it is just a quick snapshot.</p> |
| <h2>childworkspace (cws) branches</h2> |
| <table style="background-color: rgb(240, 240, 240); width: 100%;" |
| border="0" cellpadding="4" cellspacing="0"> |
| <tbody> |
| <tr> |
| <td colspan="6" bgcolor="#00315a" width="100%"> |
| <p align="center"><font color="#ffffff" face="Arial, Helvetica" |
| size="2"> <b>List of Current Active branches</b></font></p> |
| </td> |
| </tr> |
| <tr align="left"> |
| <th bgcolor="#99ccff"> |
| <p><font color="#00315a" face="Arial, Helvetica" size="2"> <b>Branch |
| (tag)</b></font></p> |
| </th> |
| <th bgcolor="#99ccff"> |
| <p><font color="#00315a" face="Arial, Helvetica" size="2"> <b>Description</b></font></p> |
| </th> |
| <th bgcolor="#99ccff"> |
| <p><font color="#00315a" face="Arial, Helvetica" size="2"> <b>Status</b></font></p> |
| </th> |
| <th bgcolor="#99ccff"> |
| <p><font color="#00315a" face="Arial, Helvetica" size="2"> <b>Type</b></font></p> |
| </th> |
| <th bgcolor="#99ccff"> |
| <p><font color="#00315a" face="Arial, Helvetica" size="2"> <b>SCM</b></font></p> |
| </th> |
| <th bgcolor="#99ccff"> |
| <p><font color="#00315a" face="Arial, Helvetica" size="2"><b>Termination</b></font></p> |
| </th> |
| </tr> |
| <tr> |
| <td>cws_ooo300_aquavcl01</td> |
| <td>Mac specific for 3.0 release<br> |
| </td> |
| <td>Open</td> |
| <td><a href="#developer">Developer</a></td> |
| <td style="vertical-align: top;">CVS<br> |
| </td> |
| <td><br> |
| </td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top;">http://svn.services.openoffice.org/ooo/cws/appleremote01/<br> |
| </td> |
| <td style="vertical-align: top;">Apple remote control support |
| (3.1 target release)<br> |
| </td> |
| <td style="vertical-align: top;">Open<br> |
| </td> |
| <td style="vertical-align: top;"><br> |
| </td> |
| <td style="vertical-align: top;">SVN<br> |
| </td> |
| <td style="vertical-align: top;"><br> |
| </td> |
| <td style="vertical-align: top;"><br> |
| </td> |
| <td style="vertical-align: top;"><br> |
| </td> |
| </tr> |
| </tbody> |
| </table> |
| <p>All branches support the following platforms: </p> |
| <ul> |
| <li>Windows</li> |
| <li>Linux (x86 and x86-64)</li> |
| <li>Solaris (sparc), x86 <br> |
| </li> |
| <li>MacOSX<br> |
| </li> |
| <li>FreeBSD - We need a <a href="#tinderbox">tinderbox</a></li> |
| </ul> |
| <p>All branches support the following compilers: </p> |
| <ul> |
| <li>gcc 3.3 and higher<br> |
| </li> |
| <li>jdk 1.5 and higher<br> |
| </li> |
| </ul> |
| <h2>Active branches for developers on the bleeding edge</h2> |
| <p>This is the area for the brave and experienced developers. These |
| branches are open for creating the next feature set. They are always |
| flaky and almost never build without adding patches. You have been |
| warned.</p> |
| <table bgcolor="#f0f0f0" border="0" cellpadding="4" cellspacing="0" |
| width="100%"> |
| <tbody> |
| <tr> |
| <td colspan="8" bgcolor="#00315a" width="100%"> |
| <p align="center"><font color="#ffffff" face="Arial, Helvetica" |
| size="2"> <b>Bleeding Edge branches</b></font></p> |
| </td> |
| </tr> |
| <tr align="left"> |
| <th bgcolor="#99ccff"> <font color="#00315a" |
| face="Arial, Helvetica" size="2"> <b>CVS tag</b></font> </th> |
| <th bgcolor="#99ccff"> <font color="#00315a" |
| face="Arial, Helvetica" size="2"> <b>Description</b></font> </th> |
| <th bgcolor="#99ccff"> |
| <p><font color="#00315a" face="Arial, Helvetica" size="2"> <b>Status</b></font></p> |
| </th> |
| <th bgcolor="#99ccff"> <font color="#00315a" |
| face="Arial, Helvetica" size="2"> <b>Type</b></font> </th> |
| <th bgcolor="#99ccff"> <font color="#00315a" |
| face="Arial, Helvetica" size="2"> <b>Mac OS</b></font> </th> |
| </tr> |
| <tr valign="top"> |
| <td>mws_ooo300</td> |
| <td>Master workspace for OOO300 cws (3.0 codeline)</td> |
| <td>Stable</td> |
| <td><a href="#master">Master</a></td> |
| <td>Yes</td> |
| </tr> |
| <tr valign="top"> |
| <td>http://svn.services.openoffice.org/ooo/trunk/<br> |
| </td> |
| <td>Master workspace for DEV300 cws (3.x codeline)</td> |
| <!-- <td>Ongoing/Internal</td> --> <td>Under development<br> |
| </td> |
| <td><a href="#master">Master</a></td> |
| <td>Yes<br> |
| </td> |
| </tr> |
| </tbody> |
| </table> |
| <h2>Archived Builds</h2> |
| <p>This is just a tracking for those that are looking up the mailing |
| lists. </p> |
| <table bgcolor="#f0f0f0" border="0" cellpadding="4" cellspacing="0" |
| width="100%"> |
| <tbody> |
| <tr> |
| <td colspan="3" bgcolor="#00315a" width="100%"> |
| <p align="center"><font color="#ffffff" face="Arial, Helvetica" |
| size="2"> <b>Archived branches</b></font></p> |
| </td> |
| </tr> |
| <tr align="left"> |
| <th bgcolor="#99ccff"> <font color="#00315a" |
| face="Arial, Helvetica" size="2"> <b>CVS tag</b></font> </th> |
| <th bgcolor="#99ccff"> <font color="#00315a" |
| face="Arial, Helvetica" size="2"> <b>Description</b></font> </th> |
| <th bgcolor="#99ccff"> <font color="#00315a" |
| face="Arial, Helvetica" size="2"> <b>Type</b></font> </th> |
| </tr> |
| <tr> |
| <td style="vertical-align: top;">mws_ooo300<br> |
| </td> |
| <td style="vertical-align: top;">OpenOffice.org 3.0.x<br> |
| </td> |
| <td style="vertical-align: top;">Stable<br> |
| </td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top;">mws_ooh680<br> |
| </td> |
| <td style="vertical-align: top;">OpenOffice.org 2.4.x<br> |
| </td> |
| <td style="vertical-align: top;">Stable<br> |
| </td> |
| </tr> |
| <tr> |
| <td>cws_src680_ooo20040704</td> |
| <td>Ongoing Version 2.0 fixes (0620 not integrated)</td> |
| <td><a href="#developer">Developer</a></td> |
| </tr> |
| <tr> |
| <td>cws_src680_ooo20040815</td> |
| <td>Ongoing Version 2.0 fixes and patches</td> |
| <td><a href="#developer">Developer</a></td> |
| </tr> |
| <tr> |
| <td>cws_src680_gcc340fixes01</td> |
| <td>cws for first round of gcc 3.4 fixes</td> |
| <td><a href="#developer">Developer</a></td> |
| </tr> |
| <tr> |
| <td>cws_srx645_ooo113fix2</td> |
| <td>Preparing for 1.1.3 release</td> |
| <td><a href="#stable">Stable</a></td> |
| </tr> |
| <tr> |
| <td>cws_src680_ooo20040509</td> |
| <td>Ongoing Version 2.0 fixes</td> |
| <td><a href="#developer">Developer</a></td> |
| </tr> |
| <tr> |
| <td>cws_src680_ooo680</td> |
| <td>cws developer build including source and solver tar balls</td> |
| <td><a href="#developer">Developer</a></td> |
| </tr> |
| <tr> |
| <td>cws_src680_ooo20040329</td> |
| <td>ongoing Version 2 fixes</td> |
| <td><a href="#developer">Developer</a></td> |
| </tr> |
| <tr> |
| <td>cws_srx645_ooo111fix3</td> |
| <td>final for 1.1.1 Release</td> |
| <td><a href="#stable">Stable</a></td> |
| </tr> |
| <tr> |
| <td>cws_src680_ooo20031216</td> |
| <td>Clean up warnings, Windows compiler release</td> |
| <td><a href="#developer">Developer</a></td> |
| </tr> |
| <tr> |
| <td>cws_fix645_ooo111fix2</td> |
| <td>fixes for 1.1.1 Release</td> |
| <td><a href="#stable">Stable</a></td> |
| </tr> |
| <tr> |
| <td>cws_srx645_ooo111fix1</td> |
| <td>fixes for 1.1.1 Release</td> |
| <td><a href="#stable">Stable</a></td> |
| </tr> |
| <tr> |
| <td>cws_src680_ooo20031110</td> |
| <td>early development for 2.0</td> |
| <td><a href="#developer">Developer</a>/QA</td> |
| </tr> |
| <tr> |
| <td>OOO_STABLE_1</td> |
| <td>Bugfix release OOo 1.0.x</td> |
| <td><a href="#stable">Stable</a></td> |
| </tr> |
| </tbody> |
| </table> |
| <h2><a name="developer">Developers branch</a></h2> |
| <p>A developers branch is where most hacking is done. This has the |
| most open policy for applying patches and it is typically where new |
| features are developed and debugged.</p> |
| <p>The good side to this is that you have the latest features, the |
| down side is that you get the side effects of the changes. We don't |
| discourage you from working here but you can expect problems at times.</p> |
| <p>Developer releases are merged back to stable on a semi regular |
| basis. All features migrated to <a href="#stable">stable</a> must be |
| exactly that. </p> |
| <h2><a name="stable">Stable branch</a></h2> |
| <p>A stable branch is base for a release build of the OpenOffice.org |
| product. This is where bug fix tracking takes place. The policy on |
| these |
| branches are to fix functional errors only.</p> |
| <p>The good side is that any patches are more thoroughly vetted before |
| going into a stable release therefore you have fewer mystery bugs. The |
| downside is that there are fewer features and some bug fixes are |
| already |
| in the developer release.</p> |
| <h2><a name="master">Master workspace branch</a></h2> |
| <p>This branch, with the name mws_srx<i>NNN</i>, is the place where |
| work from developers is integrated into the main codeline. Developers |
| work in child workspaces with names cws_srx<i>NNN</i>_<i>workspace_Name</i>, |
| and this work is then merged into the corresponding master workspace. <a |
| href="http://download.openoffice.org/680/">Developer |
| snapshots</a> are released from this branch at regular intervals. </p> |
| <h2><a name="port">Porting branch</a></h2> |
| <p>This is where a lot of <a href="http://porting.openoffice.org">porting</a> |
| to new platforms occurs. There are few features added in these branches |
| and sometimes they are very outdated in terms of functionality as a |
| port |
| needs some stability so that they are not solving new problems but |
| working to an end goal together.</p> |
| <p>Features that are added are to help support that platform for |
| example adding a new way of calling windowing functions for example |
| coding Mac OS aqua calls instead of X windows calls.</p> |
| <p> </p> |
| <p>This is a branch used for platforms that are not yet part of the |
| official release platforms, including Mac OSX, Irix, Linux s390.</p> |
| <p>Some platforms have problems with the gcc version 3 compilers, for |
| example <a href="http://porting.openoffice.org/irix/">Irix</a> and <a |
| href="http://porting.openoffice.org/mac/">Mac</a>. Please investigate |
| the respective porting pages before trying anything.</p> |
| <h1>Related information</h1> |
| <h2><a name="tinderbox">Tinderbox build</a></h2> |
| <p>A <a href="http://ooo.ximian.com/tinderbox-setup.html">tinderbox</a> |
| build can be any one of the above branch types. It is executed |
| repeatedly on your machine. This ensures that the particular branch is |
| working on all platforms that it is supposed to work on.</p> |
| <p>The reason that a build may break on a branch is that a developer |
| committed a patch that did not take into account another platforms. A |
| patch that works fine on windows but breaks a Linux build and vice |
| versa.</p> |
| <h2>Comments and updates</h2> |
| <p>This document is a work in progress, any comments <a |
| href="mailto:mh@openoffice.org">Martin Hollmichel</a></p> |
| </body> |
| </html> |