Patch from Sebastien Vincent
diff --git a/SConstruct b/SConstruct
index 2c216cc..0043523 100644
--- a/SConstruct
+++ b/SConstruct
@@ -76,8 +76,8 @@
JSONCPP_VERSION = '0.1'
DIST_DIR = '#dist'
-options = Options()
-options.Add( EnumOption('platform',
+options = Variables()
+options.Add( EnumVariable('platform',
'Platform (compiler/stl) used to build the project',
'msvc71',
allowed_values='suncc vacpp mingw msvc6 msvc7 msvc71 msvc80 linux-gcc'.split(),
@@ -190,11 +190,11 @@
env['SRCDIST_TARGET'] = os.path.join( DIST_DIR, 'jsoncpp-src-%s.tar.gz' % env['JSONCPP_VERSION'] )
env['SRCDIST_BUILDER'] = env.TarGz
-env_testing = env.Copy( )
+env_testing = env.Clone( )
env_testing.Append( LIBS = ['json_${LIB_NAME_SUFFIX}'] )
def buildJSONExample( env, target_sources, target_name ):
- env = env.Copy()
+ env = env.Clone()
env.Append( CPPPATH = ['#'] )
exe = env.Program( target=target_name,
source=target_sources )
@@ -250,6 +250,6 @@
buildProjectInDirectory( 'src/jsontestrunner' )
buildProjectInDirectory( 'src/lib_json' )
-#buildProjectInDirectory( 'doc' ) # THIS IS BROKEN.
+buildProjectInDirectory( 'doc' )
#print env.Dump()
diff --git a/scons-tools/doxygen.py b/scons-tools/doxygen.py
index a03314e..927fd29 100644
--- a/scons-tools/doxygen.py
+++ b/scons-tools/doxygen.py
@@ -80,8 +80,9 @@
'DOXYFILE_FILE'
]
- doxyfile_action = SCons.Action.Action( Doxyfile_Builder, doxyfile_message,
- doxyfile_variables )
+ #doxyfile_action = SCons.Action.Action( Doxyfile_Builder, doxyfile_message,
+ # doxyfile_variables )
+ doxyfile_action = SCons.Action.Action( Doxyfile_Builder, doxyfile_message)
doxyfile_builder = SCons.Builder.Builder( action = doxyfile_action,
emitter = Doxyfile_emitter )