texinfo update (Wed Jan 18 07:22:01 EST 2006)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.559
retrieving revision 1.560
diff -c -r1.559 -r1.560
*** ChangeLog   17 Jan 2006 11:29:27 -0000      1.559
--- ChangeLog   18 Jan 2006 11:56:04 -0000      1.560
***************
*** 1,3 ****
--- 1,17 ----
+ 2006-01-18  Akim Demaille  <address@hidden>
+ 
+       Sometimes the temporary directory remains.
+       Reported by Wybo Dekker.
+       * util/defs.in (assert_files): New.
+       * util/texi2dvi.test: Use it.
+       Extend to check the local builds.
+       * util/texi2dvi (aux_file_p, index_file_p, xref_file_p): Check
+       that the file exists.
+       (generated_files_get): Simplify according to these changes.
+       (remove, cleanup): New.
+       Use the latter in the cleaning trap.
+       (mostly_clean): Use them.
+ 
  2006-01-17  Akim Demaille  <address@hidden>
  
        * util/texi2dvi (generated_files_get): Skip nonexistent files
Index: doc/texi2dvi.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texi2dvi.1,v
retrieving revision 1.47
retrieving revision 1.48
diff -c -r1.47 -r1.48
*** doc/texi2dvi.1      17 Jan 2006 11:29:27 -0000      1.47
--- doc/texi2dvi.1      18 Jan 2006 11:56:04 -0000      1.48
***************
*** 1,5 ****
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
! .TH TEXI2DVI "1" "January 2006" "texi2dvi 1.71" "User Commands"
  .SH NAME
  texi2dvi \- convert Texinfo documents to DVI
  .SH SYNOPSIS
--- 1,5 ----
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
! .TH TEXI2DVI "1" "January 2006" "texi2dvi 1.72" "User Commands"
  .SH NAME
  texi2dvi \- convert Texinfo documents to DVI
  .SH SYNOPSIS
Index: util/defs.in
===================================================================
RCS file: /sources/texinfo/texinfo/util/defs.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** util/defs.in        30 Sep 2005 17:21:49 -0000      1.1
--- util/defs.in        18 Jan 2006 11:56:04 -0000      1.2
***************
*** 1,7 ****
  # -*- shell-script -*-
  # @configure_input@
  #
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
  # Free Software Foundation, Inc.
  #
  # This file is part of GNU Automake.
--- 1,7 ----
  # -*- shell-script -*-
  # @configure_input@
  #
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 
2006
  # Free Software Foundation, Inc.
  #
  # This file is part of GNU Automake.
***************
*** 200,205 ****
--- 200,216 ----
    done | sort`
  }
  
+ # assert_files (EXPECTED-FILES)
+ # -----------------------------
+ # Only those files are valid in the current directory.
+ assert_files ()
+ {
+   if test -n "$VERBOSE"; then
+     ls
+   fi
+   test "`list_files`" = "$*" || exit 1
+ }
+ 
  # Turn on shell traces when VERBOSE is set.
  if test -n "$VERBOSE"; then
    set -x
Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.72
retrieving revision 1.73
diff -c -r1.72 -r1.73
*** util/texi2dvi       17 Jan 2006 11:29:27 -0000      1.72
--- util/texi2dvi       18 Jan 2006 11:56:04 -0000      1.73
***************
*** 1,6 ****
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
! # $Id: texi2dvi,v 1.72 2006/01/17 11:29:27 akim Exp $
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
  # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
--- 1,6 ----
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
! # $Id: texi2dvi,v 1.73 2006/01/18 11:56:04 akim Exp $
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
  # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
***************
*** 35,41 ****
  set -e
  
  # This string is expanded by rcs automatically when this file is checked out.
! rcs_revision='$Revision: 1.72 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.8) $rcs_version
--- 35,41 ----
  set -e
  
  # This string is expanded by rcs automatically when this file is checked out.
! rcs_revision='$Revision: 1.73 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.8) $rcs_version
***************
*** 471,476 ****
--- 471,477 ----
  # Return with success with FILE is an aux file.
  aux_file_p ()
  {
+   test -f "$1" || return 1
    case $1 in
      *.aux) return 0;;
      *)     return 1;;
***************
*** 482,487 ****
--- 483,489 ----
  # Return with success with FILE is an index file.
  index_file_p ()
  {
+   test -f "$1" || return 1
    case `sed '1q' $1` in
      "\\entry{"*|"\\indexentry{"*) return 0;;
      *) return 1;;
***************
*** 493,498 ****
--- 495,501 ----
  # Return with success if FILE is an xref file (indexes, tables and lists).
  xref_file_p ()
  {
+   test -f "$1" || return 1
    # If the file is not suitable to be an index or xref file, don't
    # process it.  It's suitable if the first character is a
    # backslash or right quote or at, as long as the first line isn't
***************
*** 524,531 ****
    ) |
    # Depending on these files, infer outputs from other tools.
    while read file; do
-     test -f $file ||
-       continue
      echo $file
      case $language in
        (texinfo)
--- 527,532 ----
***************
*** 1094,1102 ****
  }
  
  
! # mostly_clean ()
! # ---------------
! # Remove auxiliary files and directories.
  mostly_clean ()
  {
    cd_orig
--- 1095,1111 ----
  }
  
  
! # remove FILES
! # ------------
! remove ()
! {
!   verbose "Removing" "$@"
!   rm -rf "$@"
! }
! 
! # mostly_clean
! # ------------
! # Remove auxiliary files and directories.  Changes the current directory.
  mostly_clean ()
  {
    cd_orig
***************
*** 1105,1112 ****
      local log=$work_build/$in_noext.log
      to_remove=$to_remove" $log "$(generated_files_get "$work_build/$in_noext")
    }
!   verbose "Removing" $to_remove
!   rm -rf $to_remove
  }
  
  
--- 1114,1135 ----
      local log=$work_build/$in_noext.log
      to_remove=$to_remove" $log "$(generated_files_get "$work_build/$in_noext")
    }
!   remove $to_remove
! }
! 
! 
! # cleanup ()
! # ----------
! # Remove what should be removed according to options.
! # Called at the end of each compilation cycle, and at the end of
! # the script.  Changes the current directory.
! cleanup ()
! {
!   case $build_mode in
!     local) cd_orig; remove "$t2ddir";;
!     clean) mostly_clean;;
!     tidy)  ;;
!   esac
  }
  
  
***************
*** 1379,1387 ****
               sed 's,/,!,g'`
    esac
    # Remove it at exit if clean mode.
!   if $clean; then
!     trap "mostly_clean" 0 1 2 15
!   fi
  
    ensure_dir "$build_dir" "$t2ddir"
  
--- 1402,1408 ----
               sed 's,/,!,g'`
    esac
    # Remove it at exit if clean mode.
!   trap "cleanup" 0 1 2 15
  
    ensure_dir "$build_dir" "$t2ddir"
  
***************
*** 1411,1420 ****
      compile)
        # Compile the document.
        compile
!       # Remove temporary files.
!       if $clean; then
!       mostly_clean
!       fi
        ;;
  
      mostly-clean)
--- 1432,1438 ----
      compile)
        # Compile the document.
        compile
!       cleanup
        ;;
  
      mostly-clean)
Index: util/texi2dvi.test
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi.test,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** util/texi2dvi.test  2 Jan 2006 19:56:26 -0000       1.8
--- util/texi2dvi.test  18 Jan 2006 11:56:04 -0000      1.9
***************
*** 1,5 ****
  #! /bin/sh
! # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
  #
  # This file is part of GNU Texinfo.
  #
--- 1,5 ----
  #! /bin/sh
! # Copyright (C) 2003, 2005, 2006  Free Software Foundation, Inc.
  #
  # This file is part of GNU Texinfo.
  #
***************
*** 26,57 ****
  @bye
  EOF
  
  
  for mode in --clean --build=clean
  do
    TEXI2DVI_pass $mode --batch input.texi
    # There should only be the DVI and the TEXI file.
!   test "`list_files`" = "input.dvi input.texi"
    rm input.dvi
  
    TEXI2DVI_pass $mode --batch input.texi -o output.dvi
    # There should only be the DVI and the TEXI file.
!   test "`list_files`" = "input.texi output.dvi"
    rm output.dvi
  done
  
  
! 
  TEXI2DVI_pass --build=tidy --batch input.texi -o output.dvi
  # There should only be the DVI and the TEXI file.
! test "`list_files`" = "input.texi output.dvi output.t2d"
  TEXI2DVI_pass --build=tidy --batch input.texi -o output.dvi --mostly-clean
! test "`list_files`" = "input.texi output.dvi"
  rm output.dvi
  
  cp input.texi input2.texi
  
  TEXI2DVI_pass --clean --batch input.texi input2.texi
  # There should only be the DVI and the TEXI file.
! test "`list_files`" = "input2.dvi input2.texi input.dvi input.texi"
  rm input.dvi input2.dvi
--- 26,68 ----
  @bye
  EOF
  
+ # Testing the local build mode.
+ TEXI2DVI_pass --batch input.texi
+ # There should only be the DVI and the TEXI file.
+ assert_files input.aux input.cp input.dvi input.fn input.ky input.log 
input.pg input.texi input.tp input.vr
+ rm input.aux input.cp input.dvi input.fn input.ky input.log input.pg input.tp 
input.vr
+ 
+ TEXI2DVI_pass --batch input.texi -o output.dvi
+ # There should only be the DVI and the TEXI file.
+ assert_files input.aux input.cp input.dvi input.fn input.ky input.log 
input.pg input.texi input.tp input.vr output.dvi
+ rm input.aux input.cp input.dvi input.fn input.ky input.log input.pg input.tp 
input.vr output.dvi
  
+ # Testing the clean build mode.
  for mode in --clean --build=clean
  do
    TEXI2DVI_pass $mode --batch input.texi
    # There should only be the DVI and the TEXI file.
!   assert_files input.dvi input.texi
    rm input.dvi
  
    TEXI2DVI_pass $mode --batch input.texi -o output.dvi
    # There should only be the DVI and the TEXI file.
!   assert_files input.texi output.dvi
    rm output.dvi
  done
  
  
! # Testing the tidy build mode.
  TEXI2DVI_pass --build=tidy --batch input.texi -o output.dvi
  # There should only be the DVI and the TEXI file.
! assert_files input.texi output.dvi output.t2d
  TEXI2DVI_pass --build=tidy --batch input.texi -o output.dvi --mostly-clean
! assert_files input.texi output.dvi
  rm output.dvi
  
  cp input.texi input2.texi
  
  TEXI2DVI_pass --clean --batch input.texi input2.texi
  # There should only be the DVI and the TEXI file.
! assert_files input2.dvi input2.texi input.dvi input.texi
  rm input.dvi input2.dvi
P ChangeLog
P doc/texi2dvi.1
P util/defs.in
P util/texi2dvi
P util/texi2dvi.test