[Cppunit-cvs] cppunit2 sconstruct,1.7,1.8

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

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

Modified Files:
	sconstruct 
Log Message:
* build platform must now be specified on the command-line: scons platform=mingw

Index: sconstruct
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/sconstruct,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sconstruct	4 Mar 2005 08:23:39 -0000	1.7
--- sconstruct	4 Mar 2005 22:23:20 -0000	1.8
***************
*** 2,6 ****
  import os.path
  
! platform = 'mingw'
  
  build_dir = os.path.join( '#buildscons', platform )
--- 2,11 ----
  import os.path
  
! options = Options()
! options.Add( 'platform', 'platform used to build cppunit 2: suncc, vacpp, mingw, msvc6, msvc7, msvc71', 'mingw' )
! 
! platform = ARGUMENTS.get( 'platform' )
! ##print ARGUMENTS
! ##print "PLATFORM=", platform
  
  build_dir = os.path.join( '#buildscons', platform )
***************
*** 17,35 ****
  SConsignFile( sconsign_path )
  
  if platform == 'suncc':
!    env = Environment( ENV = {'PATH' : os.environ['PATH']},
!                       CPPPATH = '#include',
!                       LIBPATH = '#libs',
!                       tools=['default','suncc'] )
  elif platform == 'vacpp':
!    env = Environment( ENV = {'PATH' : os.environ['PATH']},
!                       CCFLAGS = '-qrtti=all',
!                       tools=['default','aixcc'],
!                       CXX ='xlC_r',
!                       LINKFLAGS='-bh:5' )  # -bh:5 remove duplicate symbol warning
! elif platform == 'msvc':
!    env = Environment( CCFLAGS = '-GX -GR -nologo' )
  elif platform == 'mingw':
!    env = Environment( tools=['default','mingw'] )
  
  env.Append( CPPPATH = '#include',
--- 22,69 ----
  SConsignFile( sconsign_path )
  
+ ##if platform == 'suncc':
+ ##   env = Environment( ENV = {'PATH' : os.environ['PATH']},
+ ##                      tools=['default','suncc'] )
+ ##elif platform == 'vacpp':
+ ##   env = Environment( ENV = {'PATH' : os.environ['PATH']},
+ ##                      CCFLAGS = '-qrtti=all',
+ ##                      tools=['default','aixcc'],
+ ##                      CXX ='xlC_r',
+ ##                      LINKFLAGS='-bh:5' )  # -bh:5 remove duplicate symbol warning
+ ##elif platform == 'msvc':
+ ##   env = Environment( CCFLAGS = '-GX -GR -nologo' )
+ ##elif platform == 'mingw':
+ ##   env = Environment( tools=['default','mingw'] )
+ 
+ env = Environment( ENV = {'PATH' : os.environ['PATH']},
+                    tools=[] ) #, tools=['default'] )
+ 
  if platform == 'suncc':
!     env.Tools( 'suncc' )
  elif platform == 'vacpp':
!     env.Tool( 'default', 'aixcc' )
!     env.Append( CCFLAGS = '-qrtti=all',
!                 CXX ='xlC_r',   #scons does not pick-up the correct one !
!                 LINKFLAGS='-bh:5' )  # -bh:5 remove duplicate symbol warning
! elif platform == 'msvc6':
!     env['MSVS_VERSION']='6.0'
!     for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:
!         env.Tool( tool )
!     env['CXXFLAGS']='-GR -GX'
! elif platform == 'msvc70':
!     env['MSVS_VERSION']='7.0'
!     for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:
!         env.Tool( tool )
!     env['CXXFLAGS']='-GR -GX'
! elif platform == 'msvc71':
!     env['MSVS_VERSION']='7.1'
!     for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:
!         env.Tool( tool )
!     env['CXXFLAGS']='-GR -GX'
  elif platform == 'mingw':
!     env.Tool( 'mingw' )
! else:
!     print "UNSUPPORTED PLATFORM."
!     env.Exit(1)
  
  env.Append( CPPPATH = '#include',