From 3585477f33926d72a2a5e485883be166cc5e4fb8 Mon Sep 17 00:00:00 2001 From: eightnoteight Date: Mon, 14 Jul 2014 11:11:14 +0530 Subject: [PATCH] add file version.h temporarily commented | header include path modified --- amalgamate.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/amalgamate.py b/amalgamate.py index 5222655..4f1c23c 100644 --- a/amalgamate.py +++ b/amalgamate.py @@ -66,7 +66,7 @@ def amalgamate_source( source_top_dir=None, header.add_text( '/// If defined, indicates that the source file is amalgated' ) header.add_text( '/// to prevent private header inclusion.' ) header.add_text( '#define JSON_IS_AMALGAMATION' ) - header.add_file( 'include/json/version.h' ) + #header.add_file( 'include/json/version.h' ) header.add_file( 'include/json/config.h' ) header.add_file( 'include/json/forwards.h' ) header.add_file( 'include/json/features.h' ) @@ -105,10 +105,10 @@ def amalgamate_source( source_top_dir=None, print 'Amalgating source...' source = AmalgamationFile( source_top_dir ) source.add_text( '/// Json-cpp amalgated source (http://jsoncpp.sourceforge.net/).' ) - source.add_text( '/// It is intented to be used with #include <%s>' % header_include_path ) + source.add_text( '/// It is intented to be used with #include "%s"' % target_source_path ) source.add_file( 'LICENSE', wrap_in_comment=True ) source.add_text( '' ) - source.add_text( '#include <%s>' % header_include_path ) + source.add_text( '#include "%s"' % header_include_path ) source.add_text( '' ) lib_json = 'src/lib_json' source.add_file( os.path.join(lib_json, 'json_tool.h') )