generate: Make many dir vars globals

[subdirmk.git] / generate

diff --git a/generate b/generate
index ba66f8677fba472bc90a7ddd44b42693ab1b632a..a3c8b4f96cc688a5f86ed2bba31ed85f73e3a168 100755 (executable)
--- a/generate
+++ b/generate
@@ -6,11 +6,11 @@
 #
 # $(srcdir)/subdirmk/generate [--srcdir=SRCDIR] [--] SUBDIR...
 #
-# generates in each subdirectory       from in each subdirectory
-#     Subdir.mk.tmp                        Subdir.sd.mk
-#     Makefile                          and included files
-# and in toplevel                      and in toplevel
-#     main.mk.tmp                          Perdir.sd.mk
+# generates in each subdirectory
+#     Subdir.mk.tmp
+#     Makefile
+# and in toplevel
+#     main.mk.tmp
 
 use strict;
 use POSIX;
@@ -114,11 +114,26 @@ Makefile run-main.mk:
 END
 }
 
-sub process_input_mk ($$$$$$$$$);
-sub process_input_mk ($$$$$$$$$) {
-    my ($dir_prefix, $dir_suffix, $dir_name,
-       $var_prefix, $var_prefix_name, $targets,
-       $f, $esclitr, $enoent_ok) = @_;
+our ($dir_prefix, $dir_suffix, $dir_name,
+     $var_prefix, $var_prefix_name);
+
+sub dir_prefix ($) {
+    my ($path) = @_;
+    join '', map { "$_/" } @$path;
+}
+
+sub set_dir_vars ($) {
+    my ($path) = @_;
+    $dir_prefix = dir_prefix($path);
+    $dir_suffix = join '', map { "/$_" } @$path;
+    $dir_name = join '/', @$path ? @$path : '.';
+    $var_prefix_name = join '_', @$path ? @$path : qw(TOP);
+    $var_prefix = "${var_prefix_name}_";
+}
+
+sub process_input_mk ($$$$);
+sub process_input_mk ($$$$) {
+    my ($targets, $f, $esclitr, $enoent_ok) = @_;
 
     my $caps_re = qr{[A-Z]};
     my $lc_re = qr{[a-z]};
@@ -147,21 +162,28 @@ sub process_input_mk ($$$$$$$$$) {
     $pfxmap{$_} = $srcdirmap{$_}.'/' foreach keys %srcdirmap;
 
     while (<$input>) {
-       if (s#^\s*$esc\:##) {
+       if (s#^\s*$esc\:changequote\s+(\S+)\s+$##) {
+           $$esclitr = $1;
+           $set_esc->();
+           next;
+       } elsif (s#^\s*$esc\:(?=(-?)include)##) {
            $buffering_output='';
+       } elsif (m#^\s*$esc\:([a-z][-0-9a-z_]*)#) {
+           die "unknown directive $1";
+       } elsif (s{^\s*${esc}TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
+           my $t = $1 // 'all';
+           o target_varname($var_prefix, $t);
+           $targets->{$t} //= [ ];
        }
        for (;;) {
-           unless (s{^(.*?)(\\)?(?=$esc)}{}) { o $_; last; }
+           unless (s{^(.*?)$esc}{}) { o $_; last; }
            o $1;
-           if ($2) { s#^$esc##; o $$esclitr; next; }
-           s{^$esc}{} or die "$_ ?";
-           if (s{^$esc}{}) { o "$$esclitr$$esclitr" }
-           elsif (s{^TARGETS(?:_([0-9a-zA-Z_]+))?(?=\W)}{}) {
-               my $t = $1 // 'all';
-               o target_varname($var_prefix, $t);
-               $targets->{$t} //= [ ];
-           }
+           if (s{^\\$esc}{}) { o "$$esclitr" }
+           elsif (s{^\\\$}{}) { o '$' }
+           elsif (s{^\\\s+$}{}) { }
+           elsif (s{^$esc}{}) { o "$$esclitr$$esclitr" }
            elsif (m{^(?=$caps_re)}) { o $var_prefix }
+           elsif (s{^\$([A-Za-z]\w+)}{}) { o "\$(${var_prefix}$1)" }
            elsif (s{^([~^]?)(?=$lc_re)}{}) { o $pfxmap{$1} }
            elsif (s{^_}{}) { o $var_prefix }
            elsif (s{^=}{}) { o $var_prefix_name }
@@ -189,15 +211,10 @@ sub process_input_mk ($$$$$$$$$) {
            $buffering_output=undef;
            if (m#^(-?)include\s+(\S+)\s+$#) {
                my $subf = "$srcdir/$2";
-               process_input_mk($dir_prefix, $dir_suffix, $dir_name,
-                                $var_prefix, $var_prefix_name, $targets,
-                                $subf, $esclitr, $1);
+               process_input_mk($targets, $subf, $esclitr, $1);
                o "\n";
-           } elsif (m#^changequote\s+(\S+)\s+$#) {
-               $$esclitr = $1;
-               $set_esc->();
            } else {
-               die "unknown directive $_ ";
+               die "internal error buffering directive $_ ";
            }
        }
     }
@@ -205,9 +222,8 @@ sub process_input_mk ($$$$$$$$$) {
     close $input or die "close $f: $!\n";
 }
 
-sub filter_subdir_mk ($$$$$$) {
-    my ($dir_prefix, $dir_suffix, $dir_name,
-       $var_prefix, $var_prefix_name, $targets) = @_;
+sub filter_subdir_mk ($) {
+    my ($targets) = @_;
 
     #use Data::Dumper;
     #print STDERR "filter @_\n";
@@ -216,9 +232,7 @@ sub filter_subdir_mk ($$$$$$) {
 
     my $pi = sub {
        my ($f, $enoentok) = @_;
-       process_input_mk($dir_prefix, $dir_suffix, $dir_name,
-                        $var_prefix, $var_prefix_name, $targets,
-                        "${srcdir}/$f", \$esclit, $enoentok);
+       process_input_mk($targets, "${srcdir}/$f", \$esclit, $enoentok);
     };
     $pi->("${dir_prefix}Subdir.sd.mk", 0);
     $pi->("Perdir.sd.mk",              1);
@@ -226,18 +240,16 @@ sub filter_subdir_mk ($$$$$$) {
 
 sub process_subtree ($$);
 sub process_subtree ($$) {
-    # => list of descendants (in form SUBDIR/)
+    # => list of targets (in form SUBDIR/)
     # recursive, children first
     my ($node, $path) = @_;
 
     #use Data::Dumper;
     #print STDERR Dumper(\@_);
 
-    my $dir_prefix = join '', map { "$_/" } @$path;
-    my $dir_suffix = join '', map { "/$_" } @$path;
-    my $dir_name = join '/', @$path ? @$path : '.';
-    my $var_prefix_name = join '_', @$path ? @$path : qw(TOP);
-    my $var_prefix = "${var_prefix_name}_";
+    my $dir_prefix = dir_prefix($path);
+    # ^ this is the only var which we need before we come back from
+    #   the recursion.
 
     push @output_makefiles, "${dir_prefix}Subdir.mk";
     write_makefile($dir_prefix, scalar @$path);
@@ -250,11 +262,12 @@ sub process_subtree ($$) {
        push @{ $targets{$_} }, $child_subdir foreach
            process_subtree($child, \@childpath);
     }
+
+    set_dir_vars($path);
     start_output_file("${dir_prefix}Subdir.mk.tmp");
 
     if ($node->[2]) {
-       filter_subdir_mk($dir_prefix, $dir_suffix, $dir_name,
-                        $var_prefix, $var_prefix_name, \%targets);
+       filter_subdir_mk(\%targets);
     } else {
        my $sdmk = "${dir_prefix}Subdir.sd.mk";
        if (stat $sdmk) {