lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject [lucy-commits] svn commit: r1334433 - in /lucy/trunk/devel/bin: lucytidy.pl release_commands.pl
Date Sat, 05 May 2012 15:47:04 GMT
Author: marvin
Date: Sat May  5 15:47:03 2012
New Revision: 1334433

URL: http://svn.apache.org/viewvc?rev=1334433&view=rev
Log:
Tidy release_commands.pl.

Make superficial changes that allow lucytidy.pl to be run on
release_commands.pl without wrecking it.

Modified:
    lucy/trunk/devel/bin/lucytidy.pl
    lucy/trunk/devel/bin/release_commands.pl

Modified: lucy/trunk/devel/bin/lucytidy.pl
URL: http://svn.apache.org/viewvc/lucy/trunk/devel/bin/lucytidy.pl?rev=1334433&r1=1334432&r2=1334433&view=diff
==============================================================================
--- lucy/trunk/devel/bin/lucytidy.pl (original)
+++ lucy/trunk/devel/bin/lucytidy.pl Sat May  5 15:47:03 2012
@@ -28,7 +28,6 @@ my $ignore = qr/(
     | \.git
     | c.t.000-sanity-check.t
     | clownfish.src.CFCLexHeader
-    | devel.bin.release_commands.pl
     | modules.analysis.snowstem.source
     | modules.unicode.utf8proc
     | lemon.lemon.c

Modified: lucy/trunk/devel/bin/release_commands.pl
URL: http://svn.apache.org/viewvc/lucy/trunk/devel/bin/release_commands.pl?rev=1334433&r1=1334432&r2=1334433&view=diff
==============================================================================
--- lucy/trunk/devel/bin/release_commands.pl (original)
+++ lucy/trunk/devel/bin/release_commands.pl Sat May  5 15:47:03 2012
@@ -20,8 +20,10 @@ use strict;
 use warnings;
 use Getopt::Long qw( GetOptions );
 
-my $usage
-    = qq|$0 --version=X.Y.Z-rcN --apache-id=APACHE_ID --name="FULL NAME"\n|;
+my $usage = join( ' ',
+    $0, qq|--version=X.Y.Z-rcN|, qq|--apache-id=APACHE_ID|,
+    qq|--name="FULL NAME"| )
+    . "\n";
 
 my ( $full_rc_version, $apache_id, $name );
 GetOptions(
@@ -37,9 +39,10 @@ $full_rc_version =~ m/^(\d+)\.(\d+)\.(\d
 my ( $major, $minor, $micro, $rc ) = ( $1, $2, $3, $4 );
 my $x_y_z_version = sprintf( "%d.%d.%d", $major, $minor, $micro );
 
-say qq|#######################################################################|;
-say qq|# Commands needed to execute ReleaseGuide for Apache Lucy $x_y_z_version RC $rc|;
-say qq|#######################################################################\n|;
+say qq|###############################################################|;
+say qq|# Commands to execute ReleaseGuide for |
+    . qq|Apache Lucy $x_y_z_version RC $rc|;
+say qq|###############################################################\n|;
 
 say qq|# If your code signing key is not already available from pgp.mit.edu|;
 say qq|# and <http://www.apache.org/dist/lucy/KEYS>, publish it.|;
@@ -48,32 +51,37 @@ say qq|[...]\n|;
 if ( $rc < 2 ) {
     say qq|# Since this is the first RC, run update_version.|;
     say qq|./devel/bin/update_version $x_y_z_version\n|;
-    say qq|# Update the the CHANGES file and associate release $x_y_z_version with today's
date.|;
+    say qq|# Update the the CHANGES file and associate release|;
+    say qq|# $x_y_z_version with today's date.|;
     say qq|[...]\n|;
     say qq|# Commit version bump and CHANGES.|;
-    say qq|svn commit -m "Updating CHANGES and version number for release $x_y_z_version."\n|;
+    say qq|svn commit -m "Updating CHANGES and version number |
+        . qq|for release $x_y_z_version."\n|;
 }
 
-if ( $micro == 0 && $rc < 2) {
-    say qq|# Since this is the first release in a series (i.e. X.Y.0), create a branch.|;
+if ( $micro == 0 && $rc < 2 ) {
+    say qq|# Since this is the first release in a series (i.e. X.Y.0),|;
+    say qq|# create a branch.|;
     say qq|svn copy https://svn.apache.org/repos/asf/lucy/trunk |
         . qq|https://svn.apache.org/repos/asf/lucy/branches/$major.$minor |
         . qq|-m "Branching for $x_y_z_version release"\n|;
 }
 
 say qq|# Create a tag for the release candidate.|;
-say
-    qq|svn copy https://svn.apache.org/repos/asf/lucy/branches/$major.$minor |
+say qq|svn copy |
+    . qq|https://svn.apache.org/repos/asf/lucy/branches/$major.$minor |
     . qq|https://svn.apache.org/repos/asf/lucy/tags/apache-lucy-$full_rc_version |
     . qq|-m "Tagging release candidate $rc for $x_y_z_version."\n|;
 
-
-say qq|# Export a pristine copy of the source from the release candidate tag.|;
-say qq|svn export https://svn.apache.org/repos/asf/lucy/tags/apache-lucy-$full_rc_version
|
- . qq|apache-lucy-$x_y_z_version\n|;
+say qq|# Export a pristine copy of the source from the release candidate|;
+say qq|# tag.|;
+say qq|svn export |
+    . qq|https://svn.apache.org/repos/asf/lucy/tags/apache-lucy-$full_rc_version |
+    . qq|apache-lucy-$x_y_z_version\n|;
 
 say qq|# Tar and gzip the export.|;
-say qq|tar -czf apache-lucy-$x_y_z_version.tar.gz apache-lucy-$x_y_z_version\n|;
+say qq|tar -czf |
+    . qq|apache-lucy-$x_y_z_version.tar.gz apache-lucy-$x_y_z_version\n|;
 
 say qq|# Generate checksums.|;
 say qq|perl -MDigest -e '\$d = Digest->new("MD5"); open \$fh, |
@@ -89,7 +97,7 @@ say qq|perl -MDigest -e '\$d = Digest->n
 
 say qq|# Sign the release.|;
 say qq|gpg --armor --output apache-lucy-$x_y_z_version.tar.gz.asc |
- . qq|--detach-sig apache-lucy-$x_y_z_version.tar.gz\n|;
+    . qq|--detach-sig apache-lucy-$x_y_z_version.tar.gz\n|;
 
 say qq|# Break out CHANGES as a separate file.|;
 say qq|cp -p apache-lucy-$x_y_z_version/CHANGES CHANGES-$x_y_z_version.txt\n|;
@@ -99,9 +107,9 @@ say qq|ssh $apache_id\@people.apache.org
 say qq|mkdir public_html/apache-lucy-$full_rc_version|;
 say qq|exit|;
 say qq|scp -p apache-lucy-$x_y_z_version.tar.gz* |
- . qq|$apache_id\@people.apache.org:~/public_html/apache-lucy-$full_rc_version|;
+    . qq|$apache_id\@people.apache.org:~/public_html/apache-lucy-$full_rc_version|;
 say qq|scp -p CHANGES-$x_y_z_version.txt |
- . qq|$apache_id\@people.apache.org:~/public_html/apache-lucy-$full_rc_version\n|;
+    . qq|$apache_id\@people.apache.org:~/public_html/apache-lucy-$full_rc_version\n|;
 
 say qq|# Modify permissions.|;
 say qq|ssh $apache_id\@people.apache.org|;
@@ -114,23 +122,24 @@ say qq|# Perform whatever QC seems prude
 say qq|# on test systems, etc.|;
 say qq|[...]\n|;
 
-say qq|#######################################################################|;
+say qq|###############################################################|;
 say qq|# Voting|;
-say qq|#######################################################################\n|;
+say qq|###############################################################\n|;
 
 say qq|# Call a release vote on the dev list, referring to the artifacts|;
 say qq|# made public in the previous step and using the boilerplate email|;
 say qq|# below.|;
 say qq|[...]\n|;
 
-say qq|#######################################################################|;
+say qq|###############################################################|;
 say qq|# After the vote has passed...|;
-say qq|#######################################################################\n|;
+say qq|###############################################################\n|;
 
 say qq|# Tag the release.|;
-say qq|svn copy https://svn.apache.org/repos/asf/lucy/tags/apache-lucy-$full_rc_version |
- . qq|https://svn.apache.org/repos/asf/lucy/tags/apache-lucy-$x_y_z_version |
- . qq|-m "Tagging release $x_y_z_version."\n|;
+say qq|svn copy |
+    . qq|https://svn.apache.org/repos/asf/lucy/tags/apache-lucy-$full_rc_version |
+    . qq|https://svn.apache.org/repos/asf/lucy/tags/apache-lucy-$x_y_z_version |
+    . qq|-m "Tagging release $x_y_z_version."\n|;
 
 say qq|# Copy release artifacts to dist directory, remove RC dir.|;
 say qq|ssh $apache_id\@people.apache.org|;
@@ -150,7 +159,8 @@ say qq|# permalink may or may not work, 
 say qq|# JIRA permissions to perform the required actions.  Please let the|;
 say qq|# dev list know if you encounter problems.)  Click the "release"|;
 say qq|# link for $x_y_z_version and input the date from the CHANGES file.|;
-say qq|https://issues.apache.org/jira/plugins/servlet/project-config/LUCY/versions\n|;
+say qq|https://issues.apache.org/jira/plugins/servlet/|
+    . qq|project-config/LUCY/versions\n|;
 
 say qq|# Once the release files are in place, update the download page|;
 say qq|# of the Lucy website. The easiest way to perform this action is to|;
@@ -161,7 +171,7 @@ say qq|# primary download links point at
 say qq|# files point at apache.org.|;
 say qq|[...]\n|;
 
-say qq|# [TODO: this action cannot yet be performed by the RM, so ignore.]|; 
+say qq|# [TODO: this action cannot yet be performed by the RM, so ignore.]|;
 say qq|# Publish HTML exports of the documentation for the new release on|;
 say qq|# the Lucy website.|;
 say qq|[...]\n|;
@@ -170,20 +180,20 @@ say qq|# Send emails announcing the rele
 say qq|#|;
 say qq|#     * The user list.|;
 say qq|#     * The dev list.|;
-say qq|#     * The announce\@a.o list.  Be sure to send from your apache.org|;
-say qq|#       address|;
+say qq|#     * The announce\@a.o list.  Be sure to send from your|;
+say qq|#       \@apache.org address|;
 say qq|#|;
 say qq|# Use the entry in the CHANGES file as the basis for your|;
 say qq|# email, or optionally, use the boilerplate announcement text below.|;
 say qq|[...]\n|;
 
-say qq|#######################################################################|;
+say qq|###############################################################|;
 say qq|# Boilerplate VOTE email for dev\@lucy.a.o|;
 say qq|# Suggested subject:|;
 say qq|#|;
 say qq|#    [VOTE] Apache Lucy $x_y_z_version RC $rc|;
 say qq|#|;
-say qq|#######################################################################\n|;
+say qq|###############################################################\n|;
 
 say <<END_LUCY_DEV_VOTE;
 Hello,
@@ -227,13 +237,13 @@ Here's my +1.
 Thanks!
 END_LUCY_DEV_VOTE
 
-say qq|#######################################################################|;
+say qq|###############################################################|;
 say qq|# Boilerplate ANNOUNCE email|;
 say qq|# Suggested subject:|;
 say qq|#|;
 say qq|#    [ANNOUNCE] Apache Lucy $x_y_z_version released|;
 say qq|#|;
-say qq|#######################################################################\n|;
+say qq|###############################################################\n|;
 
 say <<END_ANNOUNCE_EMAIL;
 Greetings,
@@ -260,5 +270,5 @@ $name, on behalf of the Apache Lucy deve
 
 END_ANNOUNCE_EMAIL
 
-say qq|#######################################################################|;
+say qq|###############################################################|;
 



Mime
View raw message