[Cppunit-cvs] cppunit2 sconstruct,1.25,1.26

[Baptiste L. <bl...@us...>]

Update of /cvsroot/cppunit/cppunit2
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20596

Modified Files:
	sconstruct 
Log Message:
* added CppTL:SmallMap, a std::map like container that use a sorted vector to hold item.

Index: sconstruct
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/sconstruct,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** sconstruct	7 Mar 2006 23:02:56 -0000	1.25
--- sconstruct	5 Jun 2006 12:02:56 -0000	1.26
***************
*** 3,11 ****
  
  options = Options()
! options.Add( 'platform', 'platform used to build cppunit 2: suncc, vacpp, mingw, msvc6, msvc7, msvc71, msvc80, linux-gcc', 'mingw' )
  
! platform = ARGUMENTS.get( 'platform' )
! ##print ARGUMENTS
! ##print "PLATFORM=", platform
  
  build_dir = os.path.join( '#buildscons', platform )
--- 3,20 ----
  
  options = Options()
! ##options.Add( 'platform', 'platform used to build cppunit 2: suncc, vacpp, mingw, msvc6, msvc7, msvc71, msvc80, linux-gcc', 'mingw' )
! options.Add( EnumOption('platform',
!                         'Platform (compiler/stl) used to build the project',
!                         'msvc71',
!                         allowed_values='suncc vacpp mingw msvc6 msvc7 msvc71 msvc80 linux-gcc'.split(),
!                         ignorecase=2) )
  
! try:
!     platform = ARGUMENTS['platform']
! except KeyError:
!     print 'You must specify a "platform"'
!     sys.exit(2)
! 
! print "Building using PLATFORM =", platform
  
  build_dir = os.path.join( '#buildscons', platform )
***************
*** 70,78 ****
  env.Append( CPPPATH = ['#include'],
              LIBPATH = lib_dir )
                        
  env_testing = env.Copy( )
  env_testing.Append( LIBS = ['cpput','opentest','cpptl'] )
  
! def buildCppUnitExample( env, target_sources, target_name ):
      env = env.Copy()
      env.Append( CPPPATH = ['#'] )
--- 79,91 ----
  env.Append( CPPPATH = ['#include'],
              LIBPATH = lib_dir )
+ env.Append( CPPDEFINES = [ "CPPTL_NO_AUTOLINK" ] )  # naming convention are not respected
                        
  env_testing = env.Copy( )
  env_testing.Append( LIBS = ['cpput','opentest','cpptl'] )
  
! env_cpptl = env.Copy()
! env_cpptl.Append( LIBS = ['cpptl'] )
! 
! def buildExample( env, target_sources, target_name ):
      env = env.Copy()
      env.Append( CPPPATH = ['#'] )
***************
*** 81,85 ****
      global bin_dir
      return env.Install( bin_dir, exe )
!     
  
  def buildLibary( env, target_sources, target_name ):
--- 94,99 ----
      global bin_dir
      return env.Install( bin_dir, exe )
! 
! buildCppUnitExample = buildExample
  
  def buildLibary( env, target_sources, target_name ):
***************
*** 113,117 ****
      env.Install( bin_dir, exe )
  
! Export( 'env env_testing buildCppUnitExample buildLibary buildLibraryUnitTest buildQTApplication' )
  
  def buildProjectInDirectory( target_directory ):
--- 127,131 ----
      env.Install( bin_dir, exe )
  
! Export( 'env env_testing env_cpptl buildExample buildCppUnitExample buildLibary buildLibraryUnitTest buildQTApplication' )
  
  def buildProjectInDirectory( target_directory ):
***************
*** 128,131 ****
--- 142,146 ----
  buildProjectInDirectory( 'src/cpputtest' )
  buildProjectInDirectory( 'src/opentesttest' )
+ buildProjectInDirectory( 'src/jsontestrunner' )
  #buildProjectInDirectory( 'examples/input_based_test' )
  buildProjectInDirectory( 'examples/parametrized_test' )