3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-27 11:21:02 +08:00
Code Issues Projects Releases Wiki Activity

Patch from Sebastien Vincent

Browse Source
This commit is contained in:
Christopher Dunn 2009-05-24 22:22:08 +00:00
parent 8f5ddcfa8d
commit 060c45a38d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SConstruct
View File

@ -76,8 +76,8 @@ import sys
JSONCPP_VERSION = '0.1' JSONCPP_VERSION = '0.1'
DIST_DIR = '#dist' DIST_DIR = '#dist'
options = Options() options = Variables()
options.Add( EnumOption('platform', options.Add( EnumVariable('platform',
'Platform (compiler/stl) used to build the project', 'Platform (compiler/stl) used to build the project',
'msvc71', 'msvc71',
allowed_values='suncc vacpp mingw msvc6 msvc7 msvc71 msvc80 linux-gcc'.split(), allowed_values='suncc vacpp mingw msvc6 msvc7 msvc71 msvc80 linux-gcc'.split(),
@ -190,11 +190,11 @@ env['SRCDIST_ADD'] = SrcDistAdder( env )
env['SRCDIST_TARGET'] = os.path.join( DIST_DIR, 'jsoncpp-src-%s.tar.gz' % env['JSONCPP_VERSION'] ) env['SRCDIST_TARGET'] = os.path.join( DIST_DIR, 'jsoncpp-src-%s.tar.gz' % env['JSONCPP_VERSION'] )
env['SRCDIST_BUILDER'] = env.TarGz env['SRCDIST_BUILDER'] = env.TarGz
env_testing = env.Copy( ) env_testing = env.Clone( )
env_testing.Append( LIBS = ['json_${LIB_NAME_SUFFIX}'] ) env_testing.Append( LIBS = ['json_${LIB_NAME_SUFFIX}'] )
def buildJSONExample( env, target_sources, target_name ): def buildJSONExample( env, target_sources, target_name ):
env = env.Copy() env = env.Clone()
env.Append( CPPPATH = ['#'] ) env.Append( CPPPATH = ['#'] )
exe = env.Program( target=target_name, exe = env.Program( target=target_name,
source=target_sources ) source=target_sources )
@ -250,6 +250,6 @@ env.Alias( 'src-dist', srcdist_cmd )
buildProjectInDirectory( 'src/jsontestrunner' ) buildProjectInDirectory( 'src/jsontestrunner' )
buildProjectInDirectory( 'src/lib_json' ) buildProjectInDirectory( 'src/lib_json' )
#buildProjectInDirectory( 'doc' ) # THIS IS BROKEN. buildProjectInDirectory( 'doc' )
#print env.Dump() #print env.Dump()

5
scons-tools/doxygen.py
View File

@ -80,8 +80,9 @@ def generate(env):
'DOXYFILE_FILE' 'DOXYFILE_FILE'
] ]
doxyfile_action = SCons.Action.Action( Doxyfile_Builder, doxyfile_message, #doxyfile_action = SCons.Action.Action( Doxyfile_Builder, doxyfile_message,
doxyfile_variables ) # doxyfile_variables )
doxyfile_action = SCons.Action.Action( Doxyfile_Builder, doxyfile_message)
doxyfile_builder = SCons.Builder.Builder( action = doxyfile_action, doxyfile_builder = SCons.Builder.Builder( action = doxyfile_action,
emitter = Doxyfile_emitter ) emitter = Doxyfile_emitter )