[Cppunit-cvs] cppunit2 sconstruct,1.19,1.20
Brought to you by:
blep
From: Baptiste L. <bl...@us...> - 2005-11-10 09:05:50
|
Update of /cvsroot/cppunit/cppunit2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30485 Modified Files: sconstruct Log Message: - added check_cpput and check_opentest alias to build script to run unit tests. Index: sconstruct =================================================================== RCS file: /cvsroot/cppunit/cppunit2/sconstruct,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** sconstruct 8 Nov 2005 21:44:54 -0000 1.19 --- sconstruct 10 Nov 2005 09:05:41 -0000 1.20 *************** *** 22,39 **** 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'] ) --- 22,25 ---- *************** *** 67,70 **** --- 53,61 ---- env.Tool( tool ) env['CXXFLAGS']='-GR -GX /nologo' + elif platform == 'msvc80': + env['MSVS_VERSION']='8.0' + for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']: + env.Tool( tool ) + env['CXXFLAGS']='-GR -GX /nologo' elif platform == 'mingw': env.Tool( 'mingw' ) *************** *** 89,93 **** source=target_sources ) global bin_dir ! env.Install( bin_dir, exe ) def buildLibary( env, target_sources, target_name ): --- 80,85 ---- source=target_sources ) global bin_dir ! return env.Install( bin_dir, exe ) ! def buildLibary( env, target_sources, target_name ): *************** *** 97,102 **** env.Install( lib_dir, static_lib ) ! def buildLibraryUnitTest( env, target_sources, target_name ): ! buildCppUnitExample( env, target_sources, target_name ) def buildQTApplication( env, ui_sources, target_sources, target_name ): --- 89,96 ---- env.Install( lib_dir, static_lib ) ! def buildLibraryUnitTest( env, target_sources, target_name, check_alias_name ): ! exe = buildCppUnitExample( env, target_sources, target_name ) ! target_check_alias = env.Alias( check_alias_name, exe, exe[0].abspath ) ! env.AlwaysBuild( target_check_alias ) def buildQTApplication( env, ui_sources, target_sources, target_name ): |