FAQ

svn commit: r882993 - in /lucene/lucy/trunk: charmonizer/bin/ charmonizer/src/Charmonizer/ charmonizer/src/Charmonizer/Core/ charmonizer/src/Charmonizer/Probe/ charmonizer/src/Charmonizer/Test/ perl/buildlib/Lucy/

Marvin
Nov 21, 2009 at 9:15 pm
Author: marvin
Date: Sat Nov 21 21:15:05 2009
New Revision: 882993

URL: http://svn.apache.org/viewvc?rev=882993&view=rev
Log:
Commit the first stage of LUCY-71: move all charmonizer ".charm/.harm" files
to ".c/.h".

Added:
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.c
- copied unchanged from r882834, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/CompilerSpec.c
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/CompilerSpec.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/CompilerSpec.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/CompilerSpec.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Defines.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Defines.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Dir.c
- copied unchanged from r882834, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Dir.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Dir.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Dir.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.c
- copied unchanged from r882834, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.c
- copied unchanged from r882834, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.c
- copied unchanged from r882834, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.c
- copied unchanged from r882834, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.c
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.c
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/DirManip.c
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/DirManip.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/DirManip.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/DirManip.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Floats.c
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Floats.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Floats.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Floats.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.c
- copied unchanged from r882834, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.c
- copied unchanged from r882834, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.c
- copied unchanged from r882834, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.c
- copied unchanged from r882834, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.c
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.c
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test.c
- copied unchanged from r882834, lucene/lucy/trunk/charmonizer/src/Charmonizer/Test.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Test.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.c
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.h
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/DirManip.c
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/DirManip.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/FuncMacro.c
- copied unchanged from r882834, lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/FuncMacro.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/Headers.c
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/Headers.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/Integers.c
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/Integers.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/LargeFiles.c
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/LargeFiles.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/UnusedVars.c
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/UnusedVars.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/VariadicMacros.c
- copied unchanged from r880730, lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/VariadicMacros.charm
Removed:
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Compiler.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/CompilerSpec.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/CompilerSpec.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Defines.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Dir.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Dir.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/HeadCheck.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/ModHandler.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/OperSys.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Stat.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Core/Util.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/DirManip.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/DirManip.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Floats.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Floats.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/FuncMacro.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Headers.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/Integers.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/LargeFiles.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/UnusedVars.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Probe/VariadicMacros.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/AllTests.harm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/DirManip.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/FuncMacro.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/Headers.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/Integers.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/LargeFiles.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/UnusedVars.charm
lucene/lucy/trunk/charmonizer/src/Charmonizer/Test/VariadicMacros.charm
Modified:
lucene/lucy/trunk/charmonizer/bin/metaquote
lucene/lucy/trunk/perl/buildlib/Lucy/Build.pm

Modified: lucene/lucy/trunk/charmonizer/bin/metaquote
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/charmonizer/bin/metaquote?rev=882993&r1=882992&r2=882993&view=diff
==============================================================================
--- lucene/lucy/trunk/charmonizer/bin/metaquote (original)
+++ lucene/lucy/trunk/charmonizer/bin/metaquote Sat Nov 21 21:15:05 2009
@@ -19,7 +19,7 @@

# Validate Charmonizer source dir.
my $probe_path
- = File::Spec->catfile( $charm_src, 'Charmonizer', 'Probe.harm' );
+ = File::Spec->catfile( $charm_src, 'Charmonizer', 'Probe.h' );
die("Can't find Charmonizer source tree -- was 'src' specified correctly?")
unless -e $probe_path;

@@ -27,12 +27,12 @@
die "Must specify output directory" unless defined $outdir;
mkpath($outdir) unless -d $outdir;

-# Accumulate list of .harm/.charm files.
+# Accumulate list of .h/.c files.
my @charm_files;
find(
{ wanted => sub {
my $name = $File::Find::name;
- return unless $name =~ s/.*?(Charmonizer.+\.c?harm$)/$1/;
+ return unless $name =~ s/.*?(Charmonizer.+\.[ch]$)/$1/;
push @charm_files, $name;
},
no_chdir => 1,
@@ -44,8 +44,7 @@
process_file($_) for @charm_files;
exit;

-# Transfer a Charmonizer source file to the destination, transforming it from
-# a .charm/.harm to a .c/.h and replacing all metaquotes.
+# Transfer a Charmonizer source file to the destination, replacing all metaquotes.
sub process_file {
my $rel_path = shift;
return if $done{$rel_path};
@@ -54,7 +53,6 @@
my $content = slurp_file($src_path);
$content = replace_metaquotes($content);
my $dest_path = File::Spec->catfile( $outdir, $rel_path );
- $dest_path =~ s/(\.[ch])[^.]+$/$1/ or die "No match";

# Don't generate new file if current.
my $stat_orig = stat($src_path);
@@ -114,9 +112,8 @@

=head1 DESCRIPTION

-The C<metaquote> utility processes a directory of Charmonizer .harm/.charm
-source files, replacing METAQUOTE-delimited text with legal C double-quoted
-text and generating .h/.c files.
+The C<metaquote> utility processes a directory of Charmonizer source files,
+replacing METAQUOTE-delimited text with legal C double-quoted text.

=head1 ARGUMENTS


Modified: lucene/lucy/trunk/perl/buildlib/Lucy/Build.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/buildlib/Lucy/Build.pm?rev=882993&r1=882992&r2=882993&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/buildlib/Lucy/Build.pm (original)
+++ lucene/lucy/trunk/perl/buildlib/Lucy/Build.pm Sat Nov 21 21:15:05 2009
@@ -101,7 +101,7 @@
sub ACTION_metaquote {
my $self = shift;
my $charm_src_dir = catdir( $CHARMONIZER_ORIG_DIR, 'src' );
- my $orig_files = $self->rscan_dir( $charm_src_dir, qr/\.c?harm$/ );
+ my $orig_files = $self->rscan_dir( $charm_src_dir, qr/\.[ch]$/ );
my $dest_files = $self->rscan_dir( $CHARMONIZER_GEN_DIR, qr/\.[ch]$/ );
push @$dest_files, $CHARMONIZER_GEN_DIR;
if ( !$self->up_to_date( $orig_files, $dest_files ) ) {
reply

Search Discussions

Related Discussions

Discussion Navigation
viewthread | post

1 user in discussion

Marvin: 1 post