Bug #1159: rearrange branches - LC2 - IN2P3-Forge

Actions

Copy link

Bug #1159

closed

rearrange branches

Added by Lafage Vincent over 14 years ago. Updated over 13 years ago.

Status:

Closed

Priority:

Normal

Assigned To:

Lafage Vincent

Target version:

Start date:

07/15/2010

Due date:

% Done:

100%

Estimated time:

Description

2010-07-15T19:41:10+0200

prune the unnecessary directory of https://forge.in2p3.fr/repositories/browse/lc2/branches/multithread
merge common files of gui directory
compile
test

Actions

Copy link

Updated by Lafage Vincent over 14 years ago

2010-09-13T04:40:28+0200
The simple part has been done today

svn rm svn://ipnnarval.in2p3.fr:/ALICE/LC2/branches/multithread/source/version
svn rm svn://ipnnarval.in2p3.fr:/ALICE/LC2/branches/multithread/source/ToolBox
svn rm source/common source/event source/xml source/Doxyfile source/Doxymodules.h config/ doc/ source/generator source/tests lc2-prepare-tar-source.sh 
svn mv  svn://ipnnarval.in2p3.fr:/ALICE/LC2/branches/multithread/daq-MCH-CROCUS.spec svn://ipnnarval.in2p3.fr:/ALICE/LC2/trunk

so only the following remains

$ svn ls  svn://ipnnarval.in2p3.fr:/ALICE/LC2/branches/multithread/
crocusFiles/
daq-MCH-CROCUS.spec
daq-MCH-LC2.spec
daq-MCH-LC2e.spec
scripts/
source/

$ svn ls  svn://ipnnarval.in2p3.fr:/ALICE/LC2/branches/multithread/source
ECSscripts/
GNUmakefile
config/
gui/
rorc/

Actions

Copy link

Updated by Lafage Vincent over 14 years ago

% Done changed from 0 to 70

2010-09-13T22:11:51+0200
some more today. Only the following remains:

$ svn ls  svn://ipnnarval.in2p3.fr:/ALICE/LC2/branches/multithread/
daq-MCH-LC2e.spec
source/

$ svn ls  svn://ipnnarval.in2p3.fr:/ALICE/LC2/branches/multithread/source
config/
gui/

The biggest remaining task:

$ svn -v log -r614  svn://ipnnarval.in2p3.fr:/ALICE/LC2/trunk/source/config
------------------------------------------------------------------------
r614 | sylvain | 2010-06-11 11:35:42 +0200 (ven. 11 juin 2010) | 1 ligne
Chemins modifiés :
   D /trunk/source/buildDdlLoaderFile
   M /trunk/source/config/include/Crocus/CrocusConfig.h
   M /trunk/source/config/include/Crocus/FrtConfig.h
   M /trunk/source/config/include/Crocus/FrtCrtConfig.h
   M /trunk/source/config/src/ConfigTypeManager.cxx
   M /trunk/source/config/src/FrtConfig.cxx
   M /trunk/source/config/src/FrtCrtConfig.cxx
   M /trunk/source/config/src/SysErrorManager.cxx

$ svn diff -r613:614  svn://ipnnarval.in2p3.fr:/ALICE/LC2/trunk/source/config/include/Crocus/FrtCrtConfig.h|lv
=> stable constructor extension
$ svn diff -r613:614  svn://ipnnarval.in2p3.fr:/ALICE/LC2/trunk/source/config/include/Crocus/FrtConfig.h|lv
=> stable constructor extension
=> appropriate use of structure
$ svn diff -r613:614  svn://ipnnarval.in2p3.fr:/ALICE/LC2/trunk/source/config/include/Crocus/CrocusConfig.h|lv
=> stable constructor extension
=> appropriate use of structure
$ svn diff -r613:614  svn://ipnnarval.in2p3.fr:/ALICE/LC2/trunk/source/config/src/SysErrorManager.cxx|lv
=> method change: ConfigMode::GetCmd => ConfigMode::Convert
$ svn diff -r613:614  svn://ipnnarval.in2p3.fr:/ALICE/LC2/trunk/source/config/src/ConfigTypeManager.cxx|lv
=> there's a small disagreement remaining here
=> one should also use
  const ui32 kuiMAX_MODULE_BY_PATCH_BUS       = 3;
  // Max number of PATCH BUS plugged to a frontend DSP
  const ui32 kuiMAX_PATCH_BUS_BY_FRTEND_DSP   = 5;
  // Max number of frontend DSP plugged to CRT DSP
  const ui32 kuiMAX_FRTEND_DSP_BY_FRTCRT_DSP = 5;
  // Max number of CRT DSP operating over a CROCUS system
  const ui32 kuiFRTCRT_DSP_NUMBER            = 2;
$ svn diff -r613:614  svn://ipnnarval.in2p3.fr:/ALICE/LC2/trunk/source/config/src/FrtConfig.cxx|lv
...
$ svn diff -r613:614  svn://ipnnarval.in2p3.fr:/ALICE/LC2/trunk/source/config/src/FrtCrtConfig.cxx|lv
...

No major problem

Confirm stability with the two last files anyway...
It must change copy constructor behavior...

Actions

Copy link