tests/filter: New test framework for generate

[subdirmk.git] / generate

diff --git a/generate b/generate
index 178754614ea417bcf9e4d319482615f93dd55a5d..14deda4e281dc35c42272019a76af253bec22b3e 100755 (executable)
--- a/generate
+++ b/generate
@@ -32,8 +32,8 @@ our @subdirs = @ARGV;
 
 s{/+$}{} foreach @subdirs;
 
-our $root = [ '.', [ ] ];
-# each node is [ 'relative subdir name', \@children ]
+our $root = [ '.', [ ], 1 ];
+# each node is [ 'relative subdir name', \@children, $mentioned ]
 
 sub build_tree () {
     foreach my $subdir (@subdirs) {
@@ -47,6 +47,7 @@ sub build_tree () {
            }
            $node = $c;
        }
+       $node->[2] = 1;
     }
 }
 
@@ -97,14 +98,18 @@ sub write_makefile ($$) {
     #print STDERR "write_makefile @_\n";
     start_output_file("${dir_prefix}Makefile");
     my $cd = $depth ? join('/', ('..',) x $depth) : '.';
+    my $suppress_templates=
+       '$(if $(filter-out clean real-clean, $(subdirmk_targets)),,'.
+       ' MAKEFILE_TEMPLATES=)';
     o <<END;
 default: all
-\$(MAKECMDGOALS) all: FORCE-ALWAYS-RUN
+\$(filter-out all,\$(MAKECMDGOALS)) all: run-main.mk
        \@:
-Makefile FORCE-ALWAYS-RUN:
-       \$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(or \$(MAKECMDGOALS),all))
+subdirmk_targets:=\$(or \$(MAKECMDGOALS),all)
+Makefile run-main.mk:
+       \$(MAKE) -C $cd -f main.mk \$(addprefix ${dir_prefix},\$(subdirmk_targets))$suppress_templates
 .SUFFIXES:
-.PHONY:        FORCE-ALWAYS-RUN
+.PHONY:        run-main.mk
 END
 }
 
@@ -240,8 +245,18 @@ sub process_subtree ($$) {
     }
     start_output_file("${dir_prefix}Subdir.mk.tmp");
 
-    filter_subdir_mk($dir_prefix, $dir_suffix, $dir_name,
-                    $var_prefix, \%targets);
+    if ($node->[2]) {
+       filter_subdir_mk($dir_prefix, $dir_suffix, $dir_name,
+                        $var_prefix, \%targets);
+    } else {
+       my $sdmk = "${dir_prefix}Subdir.sd.mk";
+       if (stat $sdmk) {
+           die "$sdmk unexpectedly exists (${dir_prefix} not mentioned)";
+       } elsif ($!==ENOENT) {
+       } else {
+           die "stat $sdmk: $!";
+       }
+    }
 
     o "\n";
 
@@ -254,6 +269,11 @@ sub process_subtree ($$) {
        }
        print O "\n";
     }
+    if (@targets) {
+       print O ".PHONY:";
+       print O " ${dir_prefix}${_}" foreach @targets;
+       print O "\n";
+    }
 
     return @targets;
 }
@@ -273,7 +293,7 @@ sub process_tree() {
     foreach my $input (sort keys %input_files) {
        o "MAKEFILE_TEMPLATES += $input\n";
     }
-    o "include \$(SUBDIRMK_MAKEFILES)";
+    o "include \$(SUBDIRMK_MAKEFILES)\n";
 }
 
 build_tree();