X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=scan-adoc-refs;h=9252701634d239e832bac4f72c14c4fac30edb8b;hp=bc893249c7b0c8da6c10a25a40493e0c29ed8546;hb=effd6c43413600787db1997160cd9926ed431b0a;hpb=63a0180693d69c0875c388e6ca7df46bca64efca

diff --git a/scan-adoc-refs b/scan-adoc-refs
index bc89324..9252701 100755
--- a/scan-adoc-refs
+++ b/scan-adoc-refs
@@ -161,16 +161,16 @@ sub scan_adoc_file {
 
 	# try to detect titles
 	foreach my $e (@{$env_stack->[-1]}) {
-	    if ($line =~ m/^=====+$/) {
+	    if ($line =~ m/^===+$/) {
 		register_title($filename, $e, 0, $env_last_line->{$e},
 			       $env_last_blockid->{$e});
-	    } elsif ($line =~ m/^-----+$/) {
+	    } elsif ($line =~ m/^---+$/) {
 		register_title($filename, $e, 1, $env_last_line->{$e},
 			       $env_last_blockid->{$e});
-	    } elsif ($line =~ m/^~~~~~+$/) {
+	    } elsif ($line =~ m/^~~~+$/) {
 		register_title($filename, $e, 2, $env_last_line->{$e},
 			       $env_last_blockid->{$e});
-	    } elsif ($line =~ m/^\^\^\^\^\^+$/) {
+	    } elsif ($line =~ m/^\^\^\^+$/) {
 		register_title($filename, $e, 3, $env_last_line->{$e},
 			       $env_last_blockid->{$e});
 	    } elsif ($line =~ m/^= +(\S.*?)( +=)?$/) {
@@ -233,6 +233,7 @@ sub scan_adoc_file {
 my $scanned_files = {};
 while (my $filename = shift) {
     next if $filename !~ m/\.adoc$/; # skip attributes.txt
+    next if $filename =~ m/-(opts|synopsis)\.adoc$/;
     next if $scanned_files->{$filename};
 
     scan_adoc_file($filename);
@@ -329,6 +330,40 @@ foreach my $e (@$start_env) {
     }
 }
 
+my $makevar_hash = {};
+
+sub makevar_define {
+    my ($varname) = @_;
+
+    die "makefile variable '$varname' already defined\n"
+	if exists($makevar_hash->{$varname});
+
+    $makevar_hash->{$varname} = {};
+}
+
+sub makevar_list_add {
+    my ($varname, $value) = @_;
+
+    die "makefile variable '$varname' not defined\n"
+	if !exists($makevar_hash->{$varname});
+
+    $makevar_hash->{$varname}->{$value} = 1;
+}
+
+sub makevar_dump {
+    my $txt = '';
+
+    foreach my $varname (sort keys %$makevar_hash) {
+	$txt .= "$varname =";
+	foreach my $value (sort keys %{$makevar_hash->{$varname}}) {
+	    $txt .= " \\\n\t$value";
+	}
+	$txt .= "\n\n";
+    }
+
+    return $txt;
+}
+
 if ($generate_depends) {
 
     my $tmpfilename = "${generate_depends}.tmp";
@@ -338,15 +373,25 @@ if ($generate_depends) {
     my $depends = {};
     foreach my $e (@$start_env) {
 	my $env_data = $fileinfo->{include}->{$e};
+
+	my $add_depends;
+
+	$add_depends = sub {
+	    my ($fn, $dep) = @_;
+
+	    $depends->{$fn}->{$dep} = 1;
+	    foreach my $nd (keys %{$env_data->{$dep}}) {
+		&$add_depends($fn, $nd);
+	    }
+	};
+
 	foreach my $fn (keys %$env_data) {
 	    foreach my $dep (keys %{$env_data->{$fn}}) {
-		$depends->{$fn}->{$dep} = 1;
+		&$add_depends($fn, $dep);
 	    }
 	}
     }
 
-    my $res = '';
-
     my $depend_varname_hash = {};
 
     foreach my $fn (sort keys %$depends) {
@@ -354,71 +399,88 @@ if ($generate_depends) {
 	$basename =~s/\.adoc$//i;
 	$basename =~s/[^A-Za-z0-9]/_/g;
 
-	my $var1text = "${basename}_ADOCSOURCES =";
-	my $var2text = "${basename}_ADOCDEPENDS = \$\{${basename}_ADOCSOURCES\}";
-	$depend_varname_hash->{$fn} = "${basename}_ADOCDEPENDS";
+	my $varname1 = "${basename}_ADOCSOURCES";
+	my $varname2 = "${basename}_ADOCDEPENDS";
+
+	makevar_define($varname1);
+	makevar_define($varname2);
+
+	$depend_varname_hash->{$fn} = $varname2;
+
+	makevar_list_add($varname1, $fn);
+	makevar_list_add($varname2, "\$\{$varname1\}");
 
 	foreach my $dep (sort keys %{$depends->{$fn}}) {
 	    if ($dep =~ m/-(opts|synopsis).adoc$/) {
-		$var2text .= " \\\n\t$dep";
+		makevar_list_add($varname2, $dep);
 	    } else {
-		$var1text .= " \\\n\t$dep";
+		makevar_list_add($varname1, $dep);
 	    }
 	}
-	$res .= "$var1text\n\n";
-	$res .= "$var2text\n\n";
     }
 
     my $man_sources_hash = {};
-    foreach my $e (@$start_env) {
-	my $filelist = $fileinfo->{outfile}->{$e};
-	foreach my $sourcefile (sort keys %$filelist) {
-	    my $varname = $depend_varname_hash->{$sourcefile};
-	    my $target = $filelist->{$sourcefile};
-	    $res .= "$target: \$\{$varname\}\n\n";
-
-	    if ($e eq 'manvolnum') {
-		$man_sources_hash->{$sourcefile} = 1;
-
-		$res .= "$target.html: \$\{$varname\}\n\n";
-		$res .= "$target-plain.html: \$\{$varname\}\n\n";
+    foreach my $sourcefile (keys %{$fileinfo->{outfile}->{manvolnum}}) {
+	$man_sources_hash->{$sourcefile} = 1;
+	my $ihash = $fileinfo->{include}->{manvolnum}->{$sourcefile};
+	foreach my $include (keys %$ihash) {
+	    if ($include !~ m/-(opts|synopsis).adoc$/) {
+		$man_sources_hash->{$include} = 1;
 	    }
 	}
     }
 
     my $varname = "MANUAL_SOURCES";
-    $res .= "$varname =";
+    makevar_define($varname);
     foreach my $sourcefile (sort keys %$man_sources_hash) {
-	$res .= " \\\n\t$sourcefile";
+	makevar_list_add($varname, $sourcefile);
     }
-    $res .= "\n\n";
 
     $varname = "CHAPTER_LIST";
-    $res .= "$varname =";
+    makevar_define($varname);
     my $filelist = $fileinfo->{outfile}->{default};
     foreach my $sourcefile (sort keys %$filelist) {
 	my $target = $filelist->{$sourcefile};
-	$res .= " \\\n\t$target";
+	makevar_list_add($varname, $target);
     }
-    $res .= "\n\n";
 
     $varname = "MANUAL_PAGES";
-    $res .= "$varname =";
+    makevar_define($varname);
     $filelist = $fileinfo->{outfile}->{manvolnum};
     foreach my $manpage (sort keys %$filelist) {
 	my $target = $filelist->{$manpage};
-	$res .= " \\\n\t$target";
+	makevar_list_add($varname, $target);
     }
-    $res .= "\n\n";
 
     $varname = "WIKI_IMPORTS";
-    $res .= "$varname =";
+    makevar_define($varname);
     $filelist = $fileinfo->{outfile}->{wiki};
     foreach my $sourcefile (sort keys %$filelist) {
 	my $target = $filelist->{$sourcefile};
-	$res .= " \\\n\t$target";
+	makevar_list_add($varname, $target);
+    }
+
+    my $res = makevar_dump();
+
+    my $make_targets = {};
+    foreach my $e (@$start_env) {
+	my $filelist = $fileinfo->{outfile}->{$e};
+	foreach my $sourcefile (sort keys %$filelist) {
+	    my $varname = $depend_varname_hash->{$sourcefile};
+	    next if !defined($varname);
+	    my $target = $filelist->{$sourcefile};
+	    my $dep = "\$\{$varname\}";
+	    $make_targets->{$target} = $dep;
+	    if ($e eq 'manvolnum') {
+		$make_targets->{"$target.html"} = $dep;
+		$make_targets->{"$target-plain.html"} = $dep;
+	    }
+	}
+    }
+    foreach my $target (sort keys%$make_targets) {
+	my $dep = $make_targets->{$target};
+	$res .= "$target: $dep\n\n";
     }
-    $res .= "\n\n";
 
     print $outfh $res;
     close($outfh);