buffering_output feature (nfc)

[subdirmk.git] / subdirmk / generate

diff --git a/subdirmk/generate b/subdirmk/generate
index ae5db303ea79c56504b76070a29f018ab4c9b23f..f353702fbb78a5277591bec73e505fbcf499afee 100755 (executable)
--- a/subdirmk/generate
+++ b/subdirmk/generate
@@ -2,17 +2,14 @@
 #
 # $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] [--] SUBDIR...
 #
-# generates in each subdirectory
-#   Subdir.mk.tmp
-#   Makefile
-# and in toplevel
-#   main.mk.tmp
-# from in each subdirectory
-#   Subdir.mk.in
-# and at toplevel
-#   Perdir.mk.in
+# generates in each subdirectory       from in each subdirectory
+#     Subdir.mk.tmp                        Subdir.mk.in
+#     Makefile
+# and in toplevel                      and in toplevel
+#     main.mk.tmp                          Perdir.mk.in
 
 use strict;
+use POSIX;
 
 print "$0 @ARGV\n" or die $!;
 
@@ -55,6 +52,7 @@ sub target_varname ($$) {
 }
 
 our $writing_output;
+our $buffering_output;
 our %output_files;
 
 sub close_any_output_file() {
@@ -65,6 +63,10 @@ sub close_any_output_file() {
 }
 
 sub o {
+    if (defined $buffering_output) {
+       $buffering_output .= $_ foreach @_;
+       return;
+    }
     die unless defined $writing_output;
     print O @_ or die "error writing $writing_output.tmp: $!\n";
 }
@@ -101,28 +103,30 @@ Makefile FORCE-ALWAYS-RUN:
 END
 }
 
-sub filter_subdir_mk ($$$$$) {
+sub process_input_mk ($$$$$$$);
+sub process_input_mk ($$$$$$$) {
     my ($dir_prefix, $dir_suffix, $dir_name,
-       $var_prefix, $targets) = @_;
-
-    #use Data::Dumper;
-    #print STDERR "filter @_\n";
+       $var_prefix, $targets,
+       $f, $esclitr) = @_;
 
-    my $in = "${dir_prefix}Subdir.mk.in";
     my $caps_re = qr{[A-Z][0-9_A-Z]*(?=\W)};
     my $lc_re = qr{[a-z][-+,0-9_a-z]*(?=\W)};
-    my $esclit = '&';
-    my $esc = '\\&';
 
-    for my $f ($in, "Perdir.mk.in") {
-      open I, '<', $f or die "open $f: $!\n";
-      while (<I>) {
+    my $esc;
+    my $set_esc = sub {
+       $esc = $$esclitr;
+       $esc =~ s/\W/\\$&/g;
+    };
+    $set_esc->();
+
+    open I, '<', $f or die "open $f: $!\n";
+    while (<I>) {
        for (;;) {
            unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
            o $1;
-           if ($2) { o $esclit; next; }
+           if ($2) { o $$esclitr; next; }
            s{^$esc}{} or die "$_ ?";
-           if (s{^$esc}{}) { o "$esclit$esclit" }
+           if (s{^$esc}{}) { o "$$esclitr$$esclitr" }
            elsif (s{^TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
                my $t = $1 // 'all';
                o target_varname($var_prefix, $t);
@@ -151,15 +155,29 @@ sub filter_subdir_mk ($$$$$) {
                o $_;
                $_ = '';
            } elsif (s{^!(\S+)(?:[ \t]+|$)}{}) {
-               $esclit = $1;
-               $esc = $esclit;
-               $esc =~ s/\W/\\$&/g;
+               $$esclitr = $1;
+               $set_esc->();
            } else {
-               die "bad escape $esclit$_ ";
+               die "bad escape $$esclitr$_ ";
            }
        }
-      }
-      I->error and die "read $f: $!\n";
+    }
+    I->error and die "read $f: $!\n";
+}
+
+sub filter_subdir_mk ($$$$$) {
+    my ($dir_prefix, $dir_suffix, $dir_name,
+       $var_prefix, $targets) = @_;
+
+    #use Data::Dumper;
+    #print STDERR "filter @_\n";
+
+    my $esclit = '&';
+    for my $f ("${srcdir}/${dir_prefix}Subdir.mk.in",
+              "${srcdir}/Perdir.mk.in") {
+       process_input_mk($dir_prefix, $dir_suffix, $dir_name,
+                        $var_prefix, $targets,
+                        $f, \$esclit);
     }
 }
 
@@ -183,6 +201,7 @@ sub process_subtree ($$) {
     foreach my $child (@{ $node->[1] }) {
        my @childpath = (@$path, $child->[0]);
        my $child_subdir = join '/', @childpath;
+       mkdir $child_subdir or $!==EEXIST or die "mkdir $child_subdir: $!";
        push @{ $targets{$_} }, $child_subdir foreach
            process_subtree($child, \@childpath);
     }