diff --git a/configure.ac b/configure.ac index 4f1dd66b..a27674c9 100644 --- a/configure.ac +++ b/configure.ac @@ -16,10 +16,10 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA dnl 02111-1307, USA. define(RELEASE_NUM, 76) -define(CDIO_VERSION_STR, 0.$1cvs) +define(CDIO_VERSION_STR, 0.$1) AC_PREREQ(2.52) -AC_REVISION([$Id: configure.ac,v 1.164 2005/09/16 09:31:38 rocky Exp $])dnl +AC_REVISION([$Id: configure.ac,v 1.165 2005/09/17 01:33:29 rocky Exp $])dnl AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_CONFIG_SRCDIR(src/cd-info.c) @@ -122,8 +122,9 @@ else fi # We use Perl for documentation and regression tests -AC_PATH_PROG(PERL, perl, no) +AC_PATH_PROG(PERL, perl, false) AC_SUBST(PERL) +AM_CONDITIONAL(HAVE_PERL, test "$PERL" != "false") # We use a diff in regression testing AC_PATH_PROG(DIFF, diff, no) diff --git a/src/cd-paranoia/Makefile.am b/src/cd-paranoia/Makefile.am index d7fe655c..6ce9815c 100644 --- a/src/cd-paranoia/Makefile.am +++ b/src/cd-paranoia/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.14 2005/03/02 12:49:28 rocky Exp $ +# $Id: Makefile.am,v 1.15 2005/09/17 01:33:29 rocky Exp $ # # Copyright (C) 2004, 2005 Rocky Bernstein # Copyright (C) 1998 Monty xiphmont@mit.edu @@ -25,7 +25,7 @@ getopt_sources = getopt.c getopt1.c endif EXTRA_DIST = getopt.c getopt1.c \ - usage.txt.in pod2c.pl \ + usage.txt.in usage-copy.h pod2c.pl \ doc/FAQ.txt doc/overlapdef.txt @@ -52,8 +52,13 @@ SUFFIXES = .txt .h cd-paranoia.$(OBJEXT): usage.h +if HAVE_PERL .txt.h: $(srcdir)/pod2c.pl $(PERL) $(srcdir)/pod2c.pl $< >$@ +else +usage.h: usage-copy.h + cp $< $@ +endif endif diff --git a/src/cd-paranoia/usage-copy.h b/src/cd-paranoia/usage-copy.h new file mode 100644 index 00000000..53d450ff --- /dev/null +++ b/src/cd-paranoia/usage-copy.h @@ -0,0 +1,142 @@ +/* + Copyright (C) 1999, 2005 Rocky Bernstein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ +const char usage_help[] = +"USAGE:\n" +" cd-paranoia [options] [outfile]\n" +"\n" +"OPTIONS:\n" +" -v --verbose : extra verbose operation\n" +" -q --quiet : quiet operation\n" +" -e --stderr-progress : force output of progress information to\n" +" stderr (for wrapper scripts)\n" +" -V --version : print version info and quit\n" +" -Q --query : autosense drive, query disc and quit\n" +" -B --batch : 'batch' mode (saves each track to a\n" +" seperate file.\n" +" -s --search-for-drive : do an exhaustive search for drive\n" +" -h --help : print help\n" +"\n" +" -p --output-raw : output raw 16 bit PCM in host byte \n" +" order\n" +" -r --output-raw-little-endian : output raw 16 bit little-endian PCM\n" +" -R --output-raw-big-endian : output raw 16 bit big-endian PCM\n" +" -w --output-wav : output as WAV file (default)\n" +" -f --output-aiff : output as AIFF file\n" +" -a --output-aifc : output as AIFF-C file\n" +"\n" +" -c --force-cdrom-little-endian : force treating drive as little endian\n" +" -C --force-cdrom-big-endian : force treating drive as big endian\n" +" -n --force-default-sectors : force default number of sectors in read\n" +" to n sectors\n" +" -o --force-search-overlap : force minimum overlap search during\n" +" verification to n sectors\n" +" -d --force-cdrom-device : use specified device; disallow \n" +" autosense\n" +" -g --force-generic-device : really an alias for -d. Kept for \n" +" compatibility.\n" +" -S --force-read-speed : read from device at specified speed\n" +" -t --toc-offset : Add sectors to the values reported\n" +" when addressing tracks. May be negative\n" +" -T --toc-bias : Assume that the beginning offset of \n" +" track 1 as reported in the TOC will be\n" +" addressed as LBA 0. Necessary for some\n" +" Toshiba drives to get track boundaries\n" +" correct\n" +" -m --mmc-timeout : Set SCSI-MMC timeout to seconds.\n" +" -O --sample-offset : Add samples to the offset when\n" +" reading data. May be negative.\n" +" -z --never-skip[=n] : never accept any less than perfect\n" +" data reconstruction (don't allow 'V's)\n" +" but if [n] is given, skip after [n]\n" +" retries without progress.\n" +" -Z --disable-paranoia : disable all paranoia checking\n" +" -Y --disable-extra-paranoia : only do cdda2wav-style overlap checking\n" +" -X --abort-on-skip : abort on imperfect reads/skips\n" +" -x --test-flags=mask : simulate CD-reading errors of ilk-mask n\n" +" mask & 0x10 - simulate underrun errors\n" +"\n" +"OUTPUT SMILIES:\n" +" :-) Normal operation, low/no jitter\n" +" :-| Normal operation, considerable jitter\n" +" :-/ Read drift\n" +" :-P Unreported loss of streaming in atomic read operation\n" +" 8-| Finding read problems at same point during reread; hard to correct\n" +" :-0 SCSI/ATAPI transport error\n" +" :-( Scratch detected\n" +" ;-( Gave up trying to perform a correction\n" +" 8-X Aborted (as per -X) due to a scratch/skip\n" +" :^D Finished extracting\n" +"\n" +"PROGRESS BAR SYMBOLS:\n" +" No corrections needed\n" +" - Jitter correction required\n" +" + Unreported loss of streaming/other error in read\n" +" ! Errors are getting through stage 1 but corrected in stage2\n" +" e SCSI/ATAPI transport error (corrected)\n" +" V Uncorrected error/skip\n" +"\n" +"SPAN ARGUMENT:\n" +"The span argument may be a simple track number or a offset/span\n" +"specification. The syntax of an offset/span takes the rough form:\n" +" \n" +" 1[ww:xx:yy.zz]-2[aa:bb:cc.dd] \n" +"\n" +"Here, 1 and 2 are track numbers; the numbers in brackets provide a\n" +"finer grained offset within a particular track. [aa:bb:cc.dd] is in\n" +"hours/minutes/seconds/sectors format. Zero fields need not be\n" +"specified: [::20], [:20], [20], [20.], etc, would be interpreted as\n" +"twenty seconds, [10:] would be ten minutes, [.30] would be thirty\n" +"sectors (75 sectors per second).\n" +"\n" +"When only a single offset is supplied, it is interpreted as a starting\n" +"offset and ripping will continue to the end of he track. If a single\n" +"offset is preceeded or followed by a hyphen, the implicit missing\n" +"offset is taken to be the start or end of the disc, respectively. Thus:\n" +"\n" +" 1:[20.35] Specifies ripping from track 1, second 20, sector 35 to \n" +" the end of track 1.\n" +"\n" +" 1:[20.35]- Specifies ripping from 1[20.35] to the end of the disc\n" +"\n" +" -2 Specifies ripping from the beginning of the disc up to\n" +" (and including) track 2\n" +"\n" +" -2:[30.35] Specifies ripping from the beginning of the disc up to\n" +" 2:[30.35]\n" +"\n" +" 2-4 Specifies ripping from the beginning of track two to the\n" +" end of track 4.\n" +"\n" +"Don't forget to protect square brackets and preceeding hyphens from\n" +"the shell...\n" +"\n" +"A few examples, protected from the shell:\n" +" A) query only with exhaustive search for a drive and full reporting\n" +" of autosense:\n" +" cd-paranoia -vsQ\n" +"\n" +" B) extract up to and including track 3, putting each track in a seperate\n" +" file:\n" +" cd-paranoia -B -- \"-3\"\n" +"\n" +" C) extract from track 1, time 0:30.12 to 1:10.00:\n" +" cd-paranoia \"[:30.12]-1[1:10]\"\n" +"\n" +"Submit bug reports to bug-libcdio@gnu.org\n" +"\n" +;