Browse files

(bug#3314841) Fixed JSON_IS_AMALGAMATION. Using os.path for OSX filen…

…ame compatibility.

git-svn-id: https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk@242 1f120ed1-78a5-a849-adca-83f0a9e25bb6
  • Loading branch information...
1 parent 4dbdcd8 commit 3bbad3be335d01948f76a3cc5d8f549ce3d7769d christopherdunn committed with rjeczalik Jun 22, 2011
Showing with 9 additions and 8 deletions.
  1. +9 −8 jsoncpp/amalgamate.py
View
17 jsoncpp/amalgamate.py
@@ -65,7 +65,7 @@ def amalgamate_source( source_top_dir=None,
header.add_text( '# define JSON_AMALGATED_H_INCLUDED' )
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_AMALGATED' )
+ header.add_text( '#define JSON_IS_AMALGAMATION' )
header.add_file( 'include/json/config.h' )
header.add_file( 'include/json/forwards.h' )
header.add_file( 'include/json/features.h' )
@@ -90,7 +90,7 @@ def amalgamate_source( source_top_dir=None,
header.add_text( '# define JSON_FORWARD_AMALGATED_H_INCLUDED' )
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_AMALGATED' )
+ header.add_text( '#define JSON_IS_AMALGAMATION' )
header.add_file( 'include/json/config.h' )
header.add_file( 'include/json/forwards.h' )
header.add_text( '#endif //ifndef JSON_FORWARD_AMALGATED_H_INCLUDED' )
@@ -108,12 +108,13 @@ def amalgamate_source( source_top_dir=None,
source.add_text( '' )
source.add_text( '#include <%s>' % header_include_path )
source.add_text( '' )
- source.add_file( 'src/lib_json\json_tool.h' )
- source.add_file( 'src/lib_json\json_reader.cpp' )
- source.add_file( 'src/lib_json\json_batchallocator.h' )
- source.add_file( 'src/lib_json\json_valueiterator.inl' )
- source.add_file( 'src/lib_json\json_value.cpp' )
- source.add_file( 'src/lib_json\json_writer.cpp' )
+ lib_json = 'src/lib_json'
+ source.add_file( os.path.join(lib_json, 'json_tool.h') )
+ source.add_file( os.path.join(lib_json, 'json_reader.cpp') )
+ source.add_file( os.path.join(lib_json, 'json_batchallocator.h') )
+ source.add_file( os.path.join(lib_json, 'json_valueiterator.inl') )
+ source.add_file( os.path.join(lib_json, 'json_value.cpp') )
+ source.add_file( os.path.join(lib_json, 'json_writer.cpp') )
print 'Writing amalgated source to %r' % target_source_path
source.write_to( target_source_path )

0 comments on commit 3bbad3b

Please sign in to comment.