SctRodDaq Wiki: Merge-C4-C5

 First

Freeze SctRodDaq_3_0_BRANCH
- Chris sent mail 13th August asking all developers to cease commitals till this part of the merge is complete.
Tag SctRodDaq_3_0_BRANCH in frozen state as MERGE_POINT_B1
- Done
Freeze HEAD
- Chris sent mail 13th August asking all developers to cease commitals till this part of the merge is complete.
Tag HEAD in its pre-merge frozen state as MERGE_POINT_C4
- Done
Tag point at which SctRodDaq_3_0_BRANCH split from HEAD as MERGE_POINT_C1
- Done by Alan.

 Then

Merge all (not already merged) changes between MERGE_POINT_C1 and MERGE_POINT_B1 into HEAD, one package at a time. Keep a record of progress below:

package	who merging	status	Note1	Note2	Note3
AnalysisService	Chris	Done15		Needs new trigger test files?
ArchivingService	Chris	Done 16
build	Chris	Done 1
CalibrationController	Chris	Done 10
config
daq-1	Chris	Done 2	No changes
decodeTestStand
docs
exampleSetup.csh	Chris	Done 0		more onl21 changes should be introduced into this example script, though
exampleSetup.sh	Chris	Done 0		more onl21 changes should be introduced into this example script, though
FittingService	Chris	Done 13	No changes	Needs new trigger test files? What about FullBypass? new files?
GuiComponents?	Chris	Done 17
logs
Makefile	Chris	Done 0
MiniUtils	Chris	Done 21
README	Chris	Done 0
SCT	Chris	Done 3
SctApi	Chris	Done 8
SctApiIPC?	Chris	Done 9
sctConf	Chris	Done 4
sctConfIPC	Chris	Done 5
SCTData	Chris	Done 6
SctDataDisplay?	Chris	Done 20	Not sure whether the dependencies in the make file are right. This package has both .cpp and .cxx files, but the makefile seems to only make dependancies for one of them. Is this intentional Alan? (Chris)
sctddc-00-00-02	Chris	Done 7
sctGUI	Chris	Done 19
SctService	Chris	Done 12	No changes
SCTTestAPI?	Chris	Done 11	No changes
setup.csh	Chris	Done 0
setup.sh	Chris	Done 0
start	Chris	Done 0
SummaryWriter?	Chris	Done 14		Needs new trigger test files?
SystemTests	Chris	Doing 22
TestGUI?	Chris	Done 18	No changes

 Then

 Then celebrate!