[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files The last change was a bad idea....

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4c61d4d5d0a5
branches:  trunk
changeset: 503127:4c61d4d5d0a5
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Nov 14 16:49:20 2005 +0000

description:
The last change was a bad idea. Reverted it partly. Now pkglint -I shows
the whole file with included files again, but the checks are only done
against the main Makefile.

diffstat:

 pkgtools/pkglint/files/pkglint.pl |  46 ++++++++++++++++++++------------------
 1 files changed, 24 insertions(+), 22 deletions(-)

diffs (154 lines):

diff -r 14b4342de208 -r 4c61d4d5d0a5 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Mon Nov 14 15:12:59 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Mon Nov 14 16:49:20 2005 +0000
@@ -11,7 +11,7 @@
 # Freely redistributable.  Absolutely no warranty.
 #
 # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp
-# $NetBSD: pkglint.pl,v 1.357 2005/11/14 13:03:32 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.358 2005/11/14 16:49:20 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -1298,9 +1298,9 @@
        checklines_multiple_patches($lines);
 }
 
-sub readmakefile($$$);
-sub readmakefile($$$) {
-       my ($file, $all_lines, $seen_Makefile_include) = @_;
+sub readmakefile($$$$);
+sub readmakefile($$$$) {
+       my ($file, $main_lines, $all_lines, $seen_Makefile_include) = @_;
        my $contents = "";
        my ($includefile, $dirname, $lines, $is_main_Makefile);
 
@@ -1309,14 +1309,15 @@
                return false;
        }
 
-       $is_main_Makefile = (@{$all_lines} == 0);
+       $is_main_Makefile = (@{$main_lines} == 0);
 
        foreach my $line (@{$lines}) {
                my $text = $line->text;
 
                if ($is_main_Makefile) {
-                       push(@{$all_lines}, $line);
+                       push(@{$main_lines}, $line);
                }
+               push(@{$all_lines}, $line);
 
                # try to get any included file
                my $is_include_line = false;
@@ -1363,7 +1364,7 @@
                                        $line->log_error("Cannot read $dirname/$includefile.");
                                } else {
                                        $line->log_info("Including \"$dirname/$includefile\".");
-                                       $contents .= readmakefile("$dirname/$includefile", $all_lines, $seen_Makefile_include);
+                                       $contents .= readmakefile("$dirname/$includefile", $main_lines, $all_lines, $seen_Makefile_include);
                                }
                        }
                } else {
@@ -2219,14 +2220,14 @@
        }
 }
 
-sub load_package_Makefile($$$) {
+sub load_package_Makefile($$$$) {
        my ($subr) = "load_package_Makefile";
-       my ($fname, $ref_whole, $ref_lines) = @_;
-       my ($whole, $lines);
+       my ($fname, $ref_whole, $ref_main_lines, $ref_all_lines) = @_;
+       my ($whole, $main_lines, $all_lines);
 
        log_info($fname, NO_LINE_NUMBER, "Checking package Makefile.");
 
-       $whole = readmakefile($fname, $lines = [], {});
+       $whole = readmakefile($fname, $main_lines = [], $all_lines = [], {});
        if (!$whole) {
                log_error($fname, NO_LINE_NUMBER, "Cannot be read.");
                return false;
@@ -2234,7 +2235,7 @@
 
        if ($opt_dumpmakefile) {
                print("OK: whole Makefile (with all included files) follows:\n");
-               foreach my $line (@{$lines}) {
+               foreach my $line (@{$all_lines}) {
                        printf("%s\n", $line->to_string());
                }
        }
@@ -2265,7 +2266,8 @@
        log_subinfo($subr, NO_FILE, NO_LINE_NUMBER, "PKGDIR=$pkgdir");
 
        ${$ref_whole} = $whole;
-       ${$ref_lines} = $lines;
+       ${$ref_main_lines} = $main_lines;
+       ${$ref_all_lines} = $all_lines;
        return true;
 }
 
@@ -2313,8 +2315,8 @@
        checklines_Makefile_varuse($lines);
 }
 
-sub checkfile_package_Makefile($$$) {
-       my ($fname, $rawwhole, $lines) = @_;
+sub checkfile_package_Makefile($$$$) {
+       my ($fname, $rawwhole, $main_lines, $lines) = @_;
        my ($distname, $category, $distfiles,
            $extract_sufx, $wrksrc);
        my ($whole, $tmp, $idx, @sections);
@@ -2335,7 +2337,7 @@
                }
        }
 
-       checklines_deprecated_variables($lines);
+       checklines_deprecated_variables($main_lines);
 
        #
        # whole file: INTERACTIVE_STAGE
@@ -2384,7 +2386,7 @@
                $opt_warn_vague && log_warning(NO_FILE, NO_LINE_NUMBER, "$1: no need to use '-' before command.");
        }
 
-       checklines_direct_tools($lines);
+       checklines_direct_tools($main_lines);
 
        if ($whole =~ /etc\/rc\.d/) {
                $opt_warn_vague && log_warning(NO_FILE, NO_LINE_NUMBER, "Use RCD_SCRIPTS mechanism to install rc.d ".
@@ -2585,10 +2587,10 @@
                        "discouraged. Redefine \"do-$1\" instead.");
        }
 
-       checklines_package_Makefile($lines);
+       checklines_package_Makefile($main_lines);
        # Disabled, as I don't like the current ordering scheme.
        #checklines_package_Makefile_varorder($lines);
-       checklines_Makefile_varuse($lines);
+       checklines_Makefile_varuse($main_lines);
 }
 
 sub checkfile($) {
@@ -2901,10 +2903,10 @@
 }
 
 sub checkdir_package() {
-       my ($whole, $lines, $have_distinfo, $have_patches);
+       my ($whole, $main_lines, $lines, $have_distinfo, $have_patches);
 
        # we need to handle the Makefile first to get some variables
-       if (!load_package_Makefile("${current_dir}/Makefile", \$whole, \$lines)) {
+       if (!load_package_Makefile("${current_dir}/Makefile", \$whole, \$main_lines, $lines)) {
                log_error("${current_dir}/Makefile", NO_LINE_NUMBER, "Cannot be read.");
                return;
        }
@@ -2924,7 +2926,7 @@
        $have_patches = false;
        foreach my $fname (@files) {
                if ($fname eq "${current_dir}/Makefile") {
-                       $opt_check_Makefile and checkfile_package_Makefile($fname, $whole, $lines);
+                       $opt_check_Makefile and checkfile_package_Makefile($fname, $whole, $main_lines, $lines);
                } else {
                        checkfile($fname);
                }