Modified: subversion/branches/fs-py/tools/dev/unix-build/Makefile.svn URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/tools/dev/unix-build/Makefile.svn?rev=1157811&r1=1157810&r2=1157811&view=diff ============================================================================== --- subversion/branches/fs-py/tools/dev/unix-build/Makefile.svn (original) +++ subversion/branches/fs-py/tools/dev/unix-build/Makefile.svn Mon Aug 15 12:32:42 2011 @@ -1448,12 +1448,11 @@ svn-check-swig-py: # We add the svn prefix to PATH here because the ruby tests # attempt to start an svnserve binary found in PATH. svn-check-swig-rb: - (cd $(svn_builddir)/subversion/bindings/swig/ruby/test && \ + (cd $(svn_builddir) && \ env RUBYLIB=$(RUBYLIB) \ LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \ PATH=$(SVN_PREFIX)/bin:$$PATH \ - $(PREFIX)/ruby/bin/ruby run-test.rb \ - --verbose=verbose 2>&1) | \ + make check-swig-rb 2>&1) | \ tee $(svn_builddir)/tests.log.bindings.rb svn-check-javahl:
Modified: subversion/branches/fs-py/tools/dist/release.py URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/tools/dist/release.py?rev=1157811&r1=1157810&r2=1157811&view=diff ============================================================================== --- subversion/branches/fs-py/tools/dist/release.py (original) +++ subversion/branches/fs-py/tools/dist/release.py Mon Aug 15 12:32:42 2011 @@ -513,12 +513,42 @@ def clean_dist(args): #---------------------------------------------------------------------- +# Move to dist + +def move_to_dist(args): + 'Move candidate artifacts to the distribution directory.' + + if not args.dist_dir: + assert_people() + args.dist_dir = people_dist_dir + + if args.target: + target = args.target + else: + target = os.path.join(os.getenv('HOME'), 'public_html', 'svn', + str(args.version), 'deploy') + + if args.code_name: + dirname = args.code_name + else: + dirname = 'deploy' + + logging.info('Moving %s to dist dir \'%s\'' % (str(args.version), + args.dist_dir) ) + filenames = glob.glob(os.path.join(target, + 'subversion-%s.*' % str(args.version))) + for filename in filenames: + shutil.copy(filename, args.dist_dir) + + +#---------------------------------------------------------------------- # Write announcements def write_news(args): 'Write text for the Subversion website.' data = { 'date' : datetime.date.today().strftime('%Y%m%d'), 'date_pres' : datetime.date.today().strftime('%Y-%m-%d'), + 'major-minor' : args.version.base[:3], 'version' : str(args.version), 'version_base' : args.version.base, } @@ -695,6 +725,24 @@ def main(): subparser.add_argument('--dist-dir', help='''The directory to clean.''') + # The move-to-dist subcommand + subparser = subparsers.add_parser('move-to-dist', + help='''Move candiates and signatures from the temporary + post location to the permanent distribution + directory. If no dist-dir is given, this command + will assume it is running on people.apache.org.''') + subparser.set_defaults(func=move_to_dist) + subparser.add_argument('version', type=Version, + help='''The release label, such as '1.7.0-alpha1'.''') + subparser.add_argument('--dist-dir', + help='''The directory to clean.''') + subparser.add_argument('--code-name', + help='''A whimsical name for the release, used only for + naming the download directory.''') + subparser.add_argument('--target', + help='''The full path to the destination used in + 'post-candiates'..''') + # The write-news subcommand subparser = subparsers.add_parser('write-news', help='''Output to stdout template text for use in the news Modified: subversion/branches/fs-py/tools/dist/templates/rc-news.ezt URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/tools/dist/templates/rc-news.ezt?rev=1157811&r1=1157810&r2=1157811&view=diff ============================================================================== --- subversion/branches/fs-py/tools/dist/templates/rc-news.ezt (original) +++ subversion/branches/fs-py/tools/dist/templates/rc-news.ezt Mon Aug 15 12:32:42 2011 @@ -10,7 +10,7 @@ Please see the <a href="">release announcement</a> for more information about this release, and the - <a href="/docs/release-notes/[version_base].html">release notes</a> and + <a href="/docs/release-notes/[major-minor].html">release notes</a> and <a href="http://svn.apache.org/repos/asf/subversion/tags/[version]/CHANGES";> change log</a> for information about what will eventually be in the [version_base] release.</p>
