Release test-0.6.0

Author: blep

makerelease.py

@@ -6,7 +6,7 @@
 python makerelease.py --platform=msvc6,msvc71,msvc80,msvc90,mingw -ublep 0.6.0 0.7.0-dev
 
 When testing this script:
-python makerelease.py --force --retag --platform=msvc6,msvc71,msvc80,mingw -ublep test-0.5.0 test-0.6.0-dev
+python makerelease.py --force --retag --platform=msvc6,msvc71,msvc80,mingw -ublep test-0.6.0 test-0.6.1-dev
 
 Example of invocation when doing a release:
 python makerelease.py 0.5.0 0.6.0-dev
@@ -23,6 +23,7 @@
 import os
 import time
 from devtools import antglob, fixeol, tarball
+import amalgate
 
 SVN_ROOT = 'https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/'
 SVN_TAG_ROOT = SVN_ROOT + 'tags/jsoncpp'
@@ -322,6 +323,14 @@ def main():
         print 'Generating source tarball to', source_tarball_path
         tarball.make_tarball( source_tarball_path, [export_dir], export_dir, prefix_dir=source_dir )
 
+        amalgated_tarball_path = 'dist/%s-amalgated.tar.gz' % source_dir
+        print 'Generating amalgated source tarball to', amalgated_tarball_path
+        amalgated_dir = 'dist/amalgated'
+        amalgate.amalgate_source( export_dir, '%s/jsoncpp.cpp' % amalgated_dir, 'json/json.h' )
+        amalgated_source_dir = 'jsoncpp-src-amalgated' + release_version
+        tarball.make_tarball( amalgated_tarball_path, [amalgated_dir],
+                              amalgated_dir, prefix_dir=amalgated_source_dir )
+
         # Decompress source tarball, download and install scons-local
         distcheck_dir = 'dist/distcheck'
         distcheck_top_dir = distcheck_dir + '/' + source_dir

version

@@ -1 +1 @@
-0.6.0-dev
+test-0.6.0