You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/06/19 03:42:50 UTC
[lucy-commits] svn commit: r1137273 - /incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm
Author: marvin
Date: Sun Jun 19 01:42:50 2011
New Revision: 1137273
URL: http://svn.apache.org/viewvc?rev=1137273&view=rev
Log:
Move around a build target to reflect chronological order of tasks.
Modified:
incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm
Modified: incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm?rev=1137273&r1=1137272&r2=1137273&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm (original)
+++ incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm Sun Jun 19 01:42:50 2011
@@ -173,26 +173,6 @@ sub ACTION_charmonizer {
}
-# Build the charmonizer tests.
-sub ACTION_charmonizer_tests {
- my $self = shift;
-
- $self->dispatch('charmony');
-
- print "Building Charmonizer Tests...\n\n";
-
- my $flags = $self->config('ccflags') . ' ' . $self->extra_ccflags . ' -I../perl';
-
- my $dir = getcwd();
- chdir $CHARMONIZER_ORIG_DIR;
- my $rv = system($self->config('cc') eq 'cl' ? 'nmake' : 'make',
- "CC=". $self->config('cc'), "DEFS=$flags",
- $self->config('cc') eq 'cl' ? ("-f", "Makefile.win") : (), "tests");
- $rv and confess("Make failed");
- chdir $dir;
-
-}
-
# Run the charmonizer executable, creating the charmony.h file.
sub ACTION_charmony {
my $self = shift;
@@ -223,6 +203,25 @@ sub ACTION_charmony {
}
}
+# Build the charmonizer tests.
+sub ACTION_charmonizer_tests {
+ my $self = shift;
+
+ $self->dispatch('charmony');
+
+ print "Building Charmonizer Tests...\n\n";
+
+ my $flags = $self->config('ccflags') . ' ' . $self->extra_ccflags . ' -I../perl';
+
+ my $dir = getcwd();
+ chdir $CHARMONIZER_ORIG_DIR;
+ my $rv = system($self->config('cc') eq 'cl' ? 'nmake' : 'make',
+ "CC=". $self->config('cc'), "DEFS=$flags",
+ $self->config('cc') eq 'cl' ? ("-f", "Makefile.win") : (), "tests");
+ $rv and confess("Make failed");
+ chdir $dir;
+}
+
sub _compile_clownfish {
my $self = shift;