Skip to content

Commit eadc478

Browse files
blepblep
committed
Fixed typo: amalga*ma*te. Replaced macro JSON_IS_AMALGATED with JSON_IS_AMALGAMATION
1 parent 1837a1c commit eadc478

File tree

13 files changed

+47
-47
lines changed

13 files changed

+47
-47
lines changed

‎NEWS.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
Notes: you need to setup the environment by running vcvars32.bat
1414
(e.g. MSVC 2008 command prompt in start menu) before running scons.
1515

16-
- Added support for amalgated source and header generation (a la sqlite).
17-
Refer to README.txt section "Generating amalgated source and header"
16+
- Added support for amalgamated source and header generation (a la sqlite).
17+
Refer to README.txt section "Generating amalgamated source and header"
1818
for detail.
1919

2020
* Value

‎README.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,30 +90,30 @@ Notes that the documentation is also available for download as a tarball.
9090
The documentation of the latest release is available online at:
9191
http://jsoncpp.sourceforge.net/
9292

93-
* Generating amalgated source and header
94-
======================================
93+
* Generating amalgamated source and header
94+
========================================
9595

9696
JsonCpp is provided with a script to generate a single header and a single
9797
source file to ease inclusion in an existing project.
9898

99-
The amalgated source can be generated at any time by running the following
99+
The amalgamated source can be generated at any time by running the following
100100
command from the top-directory (requires python 2.6):
101101

102-
python amalgate.py
102+
python amalgamate.py
103103

104104
It is possible to specify header name. See -h options for detail. By default,
105105
the following files are generated:
106106
- dist/jsoncpp.cpp: source file that need to be added to your project
107107
- dist/json/json.h: header file corresponding to use in your project. It is
108-
equivalent to including json/json.h in non-amalgated source. This header
108+
equivalent to including json/json.h in non-amalgamated source. This header
109109
only depends on standard headers.
110110
- dist/json/json-forwards.h: header the provides forward declaration
111111
of all JsonCpp types. This typically what should be included in headers to
112112
speed-up compilation.
113113

114-
The amalgated sources are generated by concatenating JsonCpp source in the
115-
correct order and defining macro JSON_IS_AMALGATED to prevent inclusion of
116-
other headers.
114+
The amalgamated sources are generated by concatenating JsonCpp source in the
115+
correct order and defining macro JSON_IS_AMALGAMATION to prevent inclusion
116+
of other headers.
117117

118118
* Using json-cpp in your project:
119119
===============================

amalgate.py renamed to amalgamate.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import os.path
1010
import sys
1111

12-
class AmalagatedFile:
12+
class AmalgamationFile:
1313
def __init__( self, top_dir ):
1414
self.top_dir = top_dir
1515
self.blocks = []
@@ -47,17 +47,17 @@ def write_to( self, output_path ):
4747
f.write( self.get_value() )
4848
f.close()
4949

50-
def amalgate_source( source_top_dir=None,
51-
target_source_path=None,
52-
header_include_path=None ):
50+
def amalgamate_source( source_top_dir=None,
51+
target_source_path=None,
52+
header_include_path=None ):
5353
"""Produces amalgated source.
5454
Parameters:
5555
source_top_dir: top-directory
5656
target_source_path: output .cpp path
5757
header_include_path: generated header path relative to target_source_path.
5858
"""
5959
print 'Amalgating header...'
60-
header = AmalagatedFile( source_top_dir )
60+
header = AmalgamationFile( source_top_dir )
6161
header.add_text( '/// Json-cpp amalgated header (http://jsoncpp.sourceforge.net/).' )
6262
header.add_text( '/// It is intented to be used with #include <%s>' % header_include_path )
6363
header.add_file( 'LICENSE', wrap_in_comment=True )
@@ -81,7 +81,7 @@ def amalgate_source( source_top_dir=None,
8181
base, ext = os.path.splitext( header_include_path )
8282
forward_header_include_path = base + '-forwards' + ext
8383
print 'Amalgating forward header...'
84-
header = AmalagatedFile( source_top_dir )
84+
header = AmalgamationFile( source_top_dir )
8585
header.add_text( '/// Json-cpp amalgated forward header (http://jsoncpp.sourceforge.net/).' )
8686
header.add_text( '/// It is intented to be used with #include <%s>' % forward_header_include_path )
8787
header.add_text( '/// This header provides forward declaration for all JsonCpp types.' )
@@ -101,7 +101,7 @@ def amalgate_source( source_top_dir=None,
101101
header.write_to( target_forward_header_path )
102102

103103
print 'Amalgating source...'
104-
source = AmalagatedFile( source_top_dir )
104+
source = AmalgamationFile( source_top_dir )
105105
source.add_text( '/// Json-cpp amalgated source (http://jsoncpp.sourceforge.net/).' )
106106
source.add_text( '/// It is intented to be used with #include <%s>' % header_include_path )
107107
source.add_file( 'LICENSE', wrap_in_comment=True )
@@ -134,9 +134,9 @@ def main():
134134
parser.enable_interspersed_args()
135135
options, args = parser.parse_args()
136136

137-
msg = amalgate_source( source_top_dir=options.top_dir,
138-
target_source_path=options.target_source_path,
139-
header_include_path=options.header_include_path )
137+
msg = amalgamate_source( source_top_dir=options.top_dir,
138+
target_source_path=options.target_source_path,
139+
header_include_path=options.header_include_path )
140140
if msg:
141141
sys.stderr.write( msg + '\n' )
142142
sys.exit( 1 )

‎include/json/config.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
/// If defined, indicates that the source file is amalgated
3232
/// to prevent private header inclusion.
3333
/// Remarks: it is automatically defined in the generated amalgated header.
34-
// #define JSON_IS_AMALGATED
34+
// #define JSON_IS_AMALGAMATION
3535

3636

3737
# ifdef JSON_IN_CPPTL

‎include/json/features.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#ifndef CPPTL_JSON_FEATURES_H_INCLUDED
77
# define CPPTL_JSON_FEATURES_H_INCLUDED
88

9-
#if !defined(JSON_IS_AMALGATED)
9+
#if !defined(JSON_IS_AMALGAMATION)
1010
# include "forwards.h"
11-
#endif // if !defined(JSON_IS_AMALGATED)
11+
#endif // if !defined(JSON_IS_AMALGAMATION)
1212

1313
namespace Json {
1414

‎include/json/forwards.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#ifndef JSON_FORWARDS_H_INCLUDED
77
# define JSON_FORWARDS_H_INCLUDED
88

9-
#if !defined(JSON_IS_AMALGATED)
9+
#if !defined(JSON_IS_AMALGAMATION)
1010
# include "config.h"
11-
#endif // if !defined(JSON_IS_AMALGATED)
11+
#endif // if !defined(JSON_IS_AMALGAMATION)
1212

1313
namespace Json {
1414

‎include/json/reader.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
#ifndef CPPTL_JSON_READER_H_INCLUDED
77
# define CPPTL_JSON_READER_H_INCLUDED
88

9-
#if !defined(JSON_IS_AMALGATED)
9+
#if !defined(JSON_IS_AMALGAMATION)
1010
# include "features.h"
1111
# include "value.h"
12-
#endif // if !defined(JSON_IS_AMALGATED)
12+
#endif // if !defined(JSON_IS_AMALGAMATION)
1313
# include <deque>
1414
# include <stack>
1515
# include <string>

‎include/json/value.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#ifndef CPPTL_JSON_H_INCLUDED
77
# define CPPTL_JSON_H_INCLUDED
88

9-
#if !defined(JSON_IS_AMALGATED)
9+
#if !defined(JSON_IS_AMALGAMATION)
1010
# include "forwards.h"
11-
#endif // if !defined(JSON_IS_AMALGATED)
11+
#endif // if !defined(JSON_IS_AMALGAMATION)
1212
# include <string>
1313
# include <vector>
1414

‎include/json/writer.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#ifndef JSON_WRITER_H_INCLUDED
77
# define JSON_WRITER_H_INCLUDED
88

9-
#if !defined(JSON_IS_AMALGATED)
9+
#if !defined(JSON_IS_AMALGAMATION)
1010
# include "value.h"
11-
#endif // if !defined(JSON_IS_AMALGATED)
11+
#endif // if !defined(JSON_IS_AMALGAMATION)
1212
# include <vector>
1313
# include <string>
1414
# include <iostream>

‎makerelease.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import os
2424
import time
2525
from devtools import antglob, fixeol, tarball
26-
import amalgate
26+
import amalgamate
2727

2828
SVN_ROOT = 'https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/'
2929
SVN_TAG_ROOT = SVN_ROOT + 'tags/jsoncpp'
@@ -323,13 +323,13 @@ def main():
323323
print 'Generating source tarball to', source_tarball_path
324324
tarball.make_tarball( source_tarball_path, [export_dir], export_dir, prefix_dir=source_dir )
325325

326-
amalgated_tarball_path = 'dist/%s-amalgated.tar.gz' % source_dir
327-
print 'Generating amalgated source tarball to', amalgated_tarball_path
328-
amalgated_dir = 'dist/amalgated'
329-
amalgate.amalgate_source( export_dir, '%s/jsoncpp.cpp' % amalgated_dir, 'json/json.h' )
330-
amalgated_source_dir = 'jsoncpp-src-amalgated' + release_version
331-
tarball.make_tarball( amalgated_tarball_path, [amalgated_dir],
332-
amalgated_dir, prefix_dir=amalgated_source_dir )
326+
amalgamation_tarball_path = 'dist/%s-amalgamation.tar.gz' % source_dir
327+
print 'Generating amalgamation source tarball to', amalgamation_tarball_path
328+
amalgamation_dir = 'dist/amalgamation'
329+
amalgamate.amalgamate_source( export_dir, '%s/jsoncpp.cpp' % amalgamation_dir, 'json/json.h' )
330+
amalgamation_source_dir = 'jsoncpp-src-amalgamation' + release_version
331+
tarball.make_tarball( amalgamation_tarball_path, [amalgamation_dir],
332+
amalgamation_dir, prefix_dir=amalgamation_source_dir )
333333

334334
# Decompress source tarball, download and install scons-local
335335
distcheck_dir = 'dist/distcheck'

0 commit comments

Comments
 (0)