Mailing List Archive

Author: creamyg
Date: 2008-08-19 08:01:33 -0700 (Tue, 19 Aug 2008)
New Revision: 3735

Modified:
trunk/perl/buildlib/Lucy/Build.pm
Log:
Update code for generating typemap.


Modified: trunk/perl/buildlib/Lucy/Build.pm
===================================================================
--- trunk/perl/buildlib/Lucy/Build.pm 2008-08-19 14:34:00 UTC (rev 3734)
+++ trunk/perl/buildlib/Lucy/Build.pm 2008-08-19 15:01:33 UTC (rev 3735)
@@ -544,21 +544,12 @@
if ( -e 'typemap' and $self->up_to_date( $pm_filepaths, 'typemap' ) );

# build up a list of C-struct classes
- my $h_filepaths = $self->rscan_dir( $C_SOURCE_DIR, qr/\.h$/ );
my @struct_classes;
- for my $h_path (@$h_filepaths) {
- open( my $h_fh, '<', $h_path ) or die "Can't open '$h_path': $!";
- my $content = do { local $/; <$h_fh> };
- # minor violation of encapsulation, but will fail catastrophically
- while ( $content =~ /^$PREFIX(?:FINAL_)?CLASS\(\s*"([^"]+)"/mgs ) {
- push @struct_classes, $1;
- }
- }
my $bp_filepaths = $self->rscan_dir( $C_SOURCE_DIR, qr/\.bp$/ );
for my $bp_path (@$bp_filepaths) {
open( my $bp_fh, '<', $bp_path ) or die "Can't open '$bp_path': $!";
my $content = do { local $/; <$bp_fh> };
- while ( $content =~ /class\s+([\w:]+)/mgs ) {
+ while ( $content =~ /class\s+(\w+::[\w:]+)/mgs ) {
push @struct_classes, $1;
}
}


_______________________________________________
kinosearch-commits mailing list
kinosearch-commits@rectangular.com
http://www.rectangular.com/mailman/listinfo/kinosearch-commits