latexmk 4.22c (26jan11)

git-svn-id: svn://tug.org/texlive/trunk@21179 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 24 insertions, 4 deletions

diff --git a/Master/texmf-dist/scripts/latexmk/latexmk.pl b/Master/texmf-dist/scripts/latexmk/latexmk.pl
index 4353be4b11c..6f6caacc161 100755
--- a/Master/texmf-dist/scripts/latexmk/latexmk.pl
+++ b/Master/texmf-dist/scripts/latexmk/latexmk.pl
@@ -107,8 +107,8 @@ use warnings;
 
 $my_name = 'latexmk';
 $My_name = 'Latexmk';
-$version_num = '4.22b';
-$version_details = "$My_name, John Collins, 9 January 2011";
+$version_num = '4.22c';
+$version_details = "$My_name, John Collins, 23 January 2011";
 
 
 use Config;
@@ -177,6 +177,8 @@ else {
 ##
 ##   Modification log from 23 Jun 2010 onwards in detail
 ##
+##     23 Jan 2011, John Collins  Fix detection of biber use with MikTeX (which doesn't put
+##                                    openout lines in log file).
 ##      9 Jan 2011, John Collins  Correct parsing of blg file for biber 0.7.2
 ##      3 Jan 2011, John Collins  Small correction on reading .fdb_file
 ##      1 Jan 2011, John Collins  Biber implementation
@@ -4202,8 +4204,8 @@ sub rdb_set_from_logB {
         my @new_bst_files = ();
         my @biber_source = ( "$bbl_base.bcf" );
         my $bib_program = 'bibtex';
-        if ( exists $generated_log{"$bbl_base.bcf"} ) {
-            $bib_program = 'biber';
+        if ( test_gen_file( "$bbl_base.bcf" ) ) {
+             $bib_program = 'biber';
 	}
         my $from_rule = "$bib_program $bbl_base";
         print "=======  Dealing with '$from_rule'\n" if ($diagnostics);
@@ -4325,6 +4327,24 @@ NEW_SOURCE:
 
 #************************************************************
 
+sub test_gen_file {
+    # Usage: test_gen_file( filename )
+    # Tests whether the file was generated during a run of (pdf)latex.
+    # Used by rdb_set_from_logB.
+    # Assumes context for primary rule, and that %generated_log is set.
+    # The generated_log test works with TeXLive's tex, because it puts
+    #   \openout lines in log file.
+    # But it doesn't work with MikTeX, which does NOT put \openout lines
+    #   in log file.
+    # So we have a back up test: bcf file exists and is at least as new as
+    #   the run time (so it should have been generated on the current run).
+    my $file = shift;
+    return exists $generated_log{$file}
+           || ( -e $file && ( get_mtime( $file ) >= $$Prun_time ));
+}
+
+#************************************************************
+
 sub rdb_find_new_filesB {
     # Call: rdb_find_new_filesB
     # Assumes rule context for primary rule.