Changeset 60:68e3c3f3e0ac in rrlib_util


Ignore:
Timestamp:
17.07.2012 11:31:26 (8 years ago)
Author:
Bernd-Helge Schaefer <schaefer@…>
Branch:
default
Parents:
58:85175cb69afa (diff), 59:b7d576f653e4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

merged with changes from rrlib.org

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • make.xml

    r58 r60  
    1919      tAutoRegister.h 
    2020      tTime.cpp 
     21      tTransformTime.cpp 
    2122      tFPSComputer.cpp 
    2223    </sources> 

  • make.xml

    r59 r60  
    33<targets> 
    44 
    5   <rrlib name="util" 
     5  <rrlib name="util"> 
     6    <sources> 
     7      final_class.h 
     8      join.h 
     9      tTypeList.h 
     10      type_list/* 
     11    </sources> 
     12  </rrlib> 
     13 
     14  <rrlib name="util_legacy" 
    615         libs="boost_iostreams"> 
    716    <sources> 
    8       join.h 
    917      sFileIOUtils.cpp 
    1018      sStringUtils.cpp 
    1119      tAutoRegister.h 
    12       tDoubleDispatcher.h 
    1320      tTime.cpp 
    1421      tTransformTime.cpp 
    15       tTypeList.h 
    16       type_list/* 
    1722      tFPSComputer.cpp 
    1823    </sources> 
    1924  </rrlib> 
    20  
     25   
    2126  <rrlib name="util_unit_tests" 
    2227        libs="cppunit"> 
    2328    <sources> 
    2429      tUnitTestSuite.cpp 
    25     </sources> 
    26   </rrlib> 
    27  
    28   <rrlib name="util_patterns"> 
    29     <sources> 
    30       patterns/* 
    31       patterns/command/** 
    32       patterns/factory/** 
    33       patterns/singleton/** 
    3430    </sources> 
    3531  </rrlib> 
    … …  
    4743  </rrlib> 
    4844 
    49   <testprogram name="command_pattern"> 
    50     <sources> 
    51       test/test_command_pattern.cpp 
    52     </sources> 
    53   </testprogram> 
    54  
    55   <testprogram name="factory_pattern"> 
    56     <sources> 
    57       test/test_factory_pattern.cpp 
    58     </sources> 
    59   </testprogram> 
    60  
    6145  <testprogram name="final_class_pattern"> 
    6246    <sources> 
    6347      test/test_final_class_pattern.cpp 
    64     </sources> 
    65   </testprogram> 
    66   
    67   <testprogram name="singleton_pattern"> 
    68     <sources> 
    69       test/test_singleton_pattern.cpp 
    7048    </sources> 
    7149  </testprogram> 
    … …  
    7755  </testprogram> 
    7856 
    79   <testprogram name="double_dispatcher"> 
    80     <sources> 
    81       test/test_double_dispatcher.cpp 
    82     </sources> 
    83   </testprogram> 
    84  
    8557</targets> 
Note: See TracChangeset for help on using the changeset viewer.