Commit 5a5e84f6 authored by Morten Welinder's avatar Morten Welinder Committed by Morten Welinder

Fix after s/config/gnumeric-config/ change. Also skip intl directory.

2002-01-07  Morten Welinder  <terra@diku.dk>

	* check-config-h.pl: Fix after s/config/gnumeric-config/ change.
	Also skip intl directory.
parent 4e0fc889
2002-01-07 Morten Welinder <terra@diku.dk>
* check-config-h.pl: Fix after s/config/gnumeric-config/ change.
Also skip intl directory.
2002-01-06 Jody Goldberg <jody@gnome.org>
* Release 1.0.1
......
......@@ -25,7 +25,7 @@
#
# check-config-h.pl: Search for .c files where someone forgot to
# put an include for <config.h> in.
# put an include for <gnumeric-config.h> in.
use diagnostics;
use strict;
......@@ -33,16 +33,17 @@ use strict;
use Getopt::Long;
my $exitcode = 0;
my $configfile = "gnumeric-config.h";
my $configfileregexp = '[' . join ('][', split (//, $configfile)) . ']';
my $edit = 0;
&GetOptions("edit" => \$edit);
# default to all the files starting from the current directory
if (!@ARGV)
{
@ARGV = `find . -name '*.c' -type f -print`;
if (!@ARGV) {
@ARGV = `find . '(' -name intl -type d -prune ')' -o '(' -name '*.c' -type f -print ')'`;
foreach (@ARGV) { chomp; }
}
}
# locate all of the target lines
my @missing_files;
......@@ -50,49 +51,41 @@ FILE: foreach my $file (@ARGV)
{
local (*FILE);
open FILE, "< $file" or die "can't open $file: $!\n";
while (<FILE>)
{
while (<FILE>) {
next FILE if /generated by/;
next FILE if /^\s*\#\s*include\s*[<\"]config\.h[>\"]/;
}
next FILE if /^\s*\#\s*include\s*[<\"]$configfileregexp[>\"]/;
}
close FILE;
push @missing_files, $file;
}
if (@missing_files)
{
print "\n", scalar(@missing_files), " C files don't have <config.h> includes:\n\n";
if (!$edit)
{
if (@missing_files) {
print "\n", scalar (@missing_files), " C files don't have <$configfile> includes:\n\n";
if (!$edit) {
print join("\n", @missing_files), "\n";
$exitcode = 1;
}
else
{
foreach my $file (@missing_files)
{
} else {
foreach my $file (@missing_files) {
local (*OLD);
local (*NEW);
open OLD, "< $file" or die "can't open $file: $!\n";
open NEW, "> $file.new" or die "can't open $file.new: $!\n";
while (<OLD>)
{
if (/^\s*\#\s*include\s*/)
{
print NEW "$&<config.h>\n";
while (<OLD>) {
if (/^\s*\#\s*include\s*/) {
print NEW "$&$<$configfile>\n";
print NEW;
last;
}
}
print NEW;
}
}
print NEW <OLD>;
close NEW;
close OLD;
rename "$file.new", $file or die "can't rename $file: $!\n";
print "Edited $file\n";
}
}
}
}
}
}
exit $exitcode;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment