[lucy-commits] svn commit: r1349077 - in /lucy/trunk: charmonizer/buildbin/meld.pl perl/buildlib/Lucy/Build.pm

[ma...@apache.org]

Author: marvin
Date: Tue Jun 12 00:24:59 2012
New Revision: 1349077

URL: http://svn.apache.org/viewvc?rev=1349077&view=rev
Log:
Add some files to clean target, fix hidden problems.

A couple build products had were not being cleaned up, resulting in some
simple build bugs in meld.pl being hidden.

Modified:
    lucy/trunk/charmonizer/buildbin/meld.pl
    lucy/trunk/perl/buildlib/Lucy/Build.pm

Modified: lucy/trunk/charmonizer/buildbin/meld.pl
URL: http://svn.apache.org/viewvc/lucy/trunk/charmonizer/buildbin/meld.pl?rev=1349077&r1=1349076&r2=1349077&view=diff
==============================================================================
--- lucy/trunk/charmonizer/buildbin/meld.pl (original)
+++ lucy/trunk/charmonizer/buildbin/meld.pl Tue Jun 12 00:24:59 2012
@@ -139,7 +139,7 @@ sub pare_charm_file {
     # Remove pound-includes for files being inlined.
     $content =~ s/^#include "Charmonizer[^\n]+\n//msg;
 
-    print <<END_STUFF;
+    return <<END_STUFF;
 /***************************************************************************/
 
 $content

Modified: lucy/trunk/perl/buildlib/Lucy/Build.pm
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/buildlib/Lucy/Build.pm?rev=1349077&r1=1349076&r2=1349077&view=diff
==============================================================================
--- lucy/trunk/perl/buildlib/Lucy/Build.pm (original)
+++ lucy/trunk/perl/buildlib/Lucy/Build.pm Tue Jun 12 00:24:59 2012
@@ -110,12 +110,14 @@ sub ACTION_charmonize {
     my $self = shift;
     print "Building $CHARMONIZE_EXE_PATH...\n\n";
     my $meld_c = rel2abs("charmonize.c");
+    $self->add_to_cleanup($meld_c);
+    $self->add_to_cleanup($CHARMONIZE_EXE_PATH);
     my $charmonize_main = catfile( $CHARMONIZER_ORIG_DIR, 'charmonize.c' );
     $self->_run_make(
         dir  => $CHARMONIZER_ORIG_DIR,
         args => [ "meld", "PERL=$^X", "FILES=$charmonize_main", "OUT=$meld_c" ],
     );
-    if ( !$self->up_to_date( $CHARMONIZE_EXE_PATH, $meld_c ) ) {
+    if ( !$self->up_to_date( $meld_c, $CHARMONIZE_EXE_PATH ) ) {
         my $cc = $Config{cc};
         my $outflag = $cc =~ /cl\b/ ? "/Fe" : "-o ";
         system("$cc $meld_c $outflag$CHARMONIZE_EXE_PATH")