Differences between revisions 5 and 10 (spanning 5 versions)
Revision 5 as of 2008-06-20 10:58:39
Size: 2443
Editor: NielsMeyer
Comment:
Revision 10 as of 2009-06-16 18:32:16
Size: 2428
Editor: localhost
Comment: converted to 1.6 markup
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
= Hcal Repositories and Builds = = Hcal Repositories and Builds at FLC =
Line 3: Line 3:
The central CALICE code authority is a [http://www-zeuthen.desy.de/linear_collider CVS repository hosted bey DESY Zeuthen]. We keep semi-private daughter repository in the FLC AFS space to channel Hcal code developments before release to the official repository. In addition, three different builds of these repositories are provided. Thus only people developing central code have to [:HCAL_Calice_Quickstart:check out and compile] the reconstruction software, while people doing analysis can run from the central builds. The central CALICE code authority is a [[http://www-zeuthen.desy.de/linear_collider|CVS repository hosted bey DESY Zeuthen]]. We keep semi-private daughter repository in the FLC AFS space to channel Hcal code developments before release to the official repository. In addition, three different builds of these repositories are provided. Thus only people developing central code have to [[HCAL Calice Quickstart|check out and compile]] the reconstruction software, while people doing analysis can run from the central builds.
Line 19: Line 19:
 * A master branch 'cvs-sync', which is kept in sync with the CALICE CVS on a daily basis (cron-jobs), so the tip of the master branch is identical to the HEAD of CVS with a maximum latency of 24h. The latest CVS tag, so the basis of the 'stable' build, is a well defined point of this branch, while the 'pro' build is automatically compiled from the branch's tip every day.
 * A development branch 'hcal-development', which is automatically rebased to the 'cvs-copy' branch and contains additional commits of Hcal developments. The 'pro_test' build is automatically compiled from this branch's tip every day.
 * A master branch 'master', which is kept in sync with the CALICE CVS on a daily basis (cron-jobs), so the tip of the master branch is identical to the HEAD of CVS with a maximum latency of 24h. The latest CVS tag, so the basis of the 'stable' build, is a well defined point of this branch, while the 'pro' build is automatically compiled from the branch's tip every day.
 * A development branch 'devel', which is automatically rebased to the 'master' branch and contains additional commits of Hcal developments. The 'pro_test' build is automatically compiled from this branch's tip every day.
Line 25: Line 25:
The default way of new developed code (including major upgrades and changes) is The default path of newly developed code (including major upgrades and changes) is
Line 27: Line 27:
 2. hcal-development branch of the FLC repository
 3. cvs-sync branch of the FLC repository
 2. devel branch of the FLC repository
 3. master branch of the FLC repository

Hcal Repositories and Builds at FLC

The central CALICE code authority is a CVS repository hosted bey DESY Zeuthen. We keep semi-private daughter repository in the FLC AFS space to channel Hcal code developments before release to the official repository. In addition, three different builds of these repositories are provided. Thus only people developing central code have to check out and compile the reconstruction software, while people doing analysis can run from the central builds.

NM 2008-06-20: The following does not exactly describe the current status, but rather the plans for clean-ups comming up the following days.

Builds

Three different builds of all CALICE code are provided:

  • stable - corresponding to the latest tagged version of the CVS repository
  • pro - corresponding to the current HEAD of the CVS repository
  • pro_test - corresponding to the CVS HEAD plus internally released developments

Repositories

For each package of the CALICE code, one git repository is available with following structure:

  • A master branch 'master', which is kept in sync with the CALICE CVS on a daily basis (cron-jobs), so the tip of the master branch is identical to the HEAD of CVS with a maximum latency of 24h. The latest CVS tag, so the basis of the 'stable' build, is a well defined point of this branch, while the 'pro' build is automatically compiled from the branch's tip every day.
  • A development branch 'devel', which is automatically rebased to the 'master' branch and contains additional commits of Hcal developments. The 'pro_test' build is automatically compiled from this branch's tip every day.

Code migration policies

The default path of newly developed code (including major upgrades and changes) is

  1. private development repository
  2. devel branch of the FLC repository
  3. master branch of the FLC repository
  4. Official CVS repository

Migration from 1. to 2. is done on request of the developer. Step 2. to 3. requires tests and discussions inside the Hcal group. Step 3. to 4. happens automatically. The FLC repository is not writable for everybody, so steps 2. and 3. need coordination with the maintainer (currently Angela).

For simple and urgent changes (e.g. bug fixes), step 2. can be omitted - everybody is encouraged to act responsible here!

HCAL Repos_and_Builds (last edited 2009-06-16 18:32:16 by localhost)