texinfo update (Wed Oct 5 19:52:01 EDT 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.540
retrieving revision 1.541
diff -c -r1.540 -r1.541
*** ChangeLog   5 Oct 2005 23:21:41 -0000       1.540
--- ChangeLog   5 Oct 2005 23:34:19 -0000       1.541
***************
*** 1,3 ****
--- 1,8 ----
+ 2005-10-05  Akim Demaille  <address@hidden>
+ 
+       * util/texi2dvi.test: Make sure --build=clean passes.
+       * util/texi2dvi: Fix the handling of --build.
+ 
  2005-10-05  Karl Berry  <address@hidden>
  
        * util/texindex.c (maketempname): use mode 0600.
Index: util/texi2dvi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.63
retrieving revision 1.64
diff -c -r1.63 -r1.64
*** util/texi2dvi       29 Sep 2005 21:06:23 -0000      1.63
--- util/texi2dvi       5 Oct 2005 23:34:19 -0000       1.64
***************
*** 1,6 ****
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
! # $Id: texi2dvi,v 1.63 2005/09/29 21:06:23 karl Exp $
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
  # 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
--- 1,6 ----
  #! /bin/sh
  # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
! # $Id: texi2dvi,v 1.64 2005/10/05 23:34:19 karl Exp $
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
  # 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
***************
*** 32,38 ****
  unset RUNNING_KSH
  
  # This string is expanded by rcs automatically when this file is checked out.
! rcs_revision='$Revision: 1.63 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.8) $rcs_version
--- 32,38 ----
  unset RUNNING_KSH
  
  # This string is expanded by rcs automatically when this file is checked out.
! rcs_revision='$Revision: 1.64 $'
  rcs_version=`set - $rcs_revision; echo $2`
  program=`echo $0 | sed -e 's!.*/!!'`
  version="texi2dvi (GNU Texinfo 4.8) $rcs_version
***************
*** 848,855 ****
      -@ ) escape=@;;
      # Silently and without documentation accept -b and --b[atch] as synonyms.
      -b | --batch) batch=true;;
!     -c | --clean) build_mode=clean;;
           --build-dir)  shift; build_dir=$1; build_mode=tidy;;
      -D | --debug) debug=true;;
      -e | -E | --expand) expand=t;;
      -h | --help) echo "$usage"; exit 0;;
--- 848,856 ----
      -@ ) escape=@;;
      # Silently and without documentation accept -b and --b[atch] as synonyms.
      -b | --batch) batch=true;;
!          --build)      shift; build_mode=$1;;
           --build-dir)  shift; build_dir=$1; build_mode=tidy;;
+     -c | --clean) build_mode=clean;;
      -D | --debug) debug=true;;
      -e | -E | --expand) expand=t;;
      -h | --help) echo "$usage"; exit 0;;
Index: util/texi2dvi.test
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texi2dvi.test,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** util/texi2dvi.test  30 Sep 2005 17:21:49 -0000      1.1
--- util/texi2dvi.test  5 Oct 2005 23:34:19 -0000       1.2
***************
*** 36,41 ****
--- 36,51 ----
  test "`list_files`" = "input.texi output.dvi"
  rm output.dvi
  
+ TEXI2DVI_pass --build=clean --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
+ 
+ TEXI2DVI_pass --build=tidy --batch input.texi -o output.dvi
+ # There should only be the DVI and the TEXI file.
+ test "`list_files`" = "input.t2d input.texi output.dvi"
+ rm -r input.t2d output.dvi
+ 
  cp input.texi input2.texi
  
  TEXI2DVI_pass --clean --batch input.texi input2.texi
P ChangeLog
P util/texi2dvi
P util/texi2dvi.test