diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-04-14 08:19:50 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-04-14 08:19:50 +0000 |
commit | cf42cec28487ec62783c7aaeecbaea79862794bf (patch) | |
tree | 814d0e116392c6e1fe6070bd7046c77523ed0bcf /Build/source/texk/web2c/ptexdir | |
parent | 7bd6eff399db384f6275e5aa8fd5c1a9aa0b66d8 (diff) |
minor build fixes
git-svn-id: svn://tug.org/texlive/trunk@17864 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/ptexdir')
-rw-r--r-- | Build/source/texk/web2c/ptexdir/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/ptexdir/am/ptex.am | 28 | ||||
-rw-r--r-- | Build/source/texk/web2c/ptexdir/lib/Makefile.in | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/ptexdir/ptrip.diffs | bin | 0 -> 9630 bytes | |||
-rwxr-xr-x | Build/source/texk/web2c/ptexdir/ptrip.test | 36 |
5 files changed, 34 insertions, 41 deletions
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog new file mode 100644 index 00000000000..be8cd77a0aa --- /dev/null +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -0,0 +1,5 @@ +2010-04-13 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/ptex.am: Fix for 'make dist' and 'make distcheck'. + * ptrip.test: Simplify. + * ptrip.diffs: Expected results from TRIP test for pTeX. diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am index f1960a1cc4f..537f8b275d9 100644 --- a/Build/source/texk/web2c/ptexdir/am/ptex.am +++ b/Build/source/texk/web2c/ptexdir/am/ptex.am @@ -143,6 +143,7 @@ DISTCLEANFILES += $(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c \ EXTRA_DIST += \ ptexdir/COPYRIGHT \ ptexdir/COPYRIGHT.jis \ + ptexdir/ChangeLog \ ptexdir/Changes.txt \ ptexdir/INSTALL.txt \ ptexdir/README.txt \ @@ -171,32 +172,15 @@ DISTCLEANFILES += ptrip.diffs clean-local:: ptrip-clean # ptrip.test ptrip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log - rm -f ctrip.fot ctrip.log trip.dvi ctrip.typ - rm -f xtripin.fot xtripin.log - rm -f xtrip.fot xtrip.log xtrip.typ - rm -f ptrip.tfm ptrip.pl ptrip.tex ptrip.fmt ptripin.fot ptripin.log - rm -f ptrip.fot ptrip.log ptrip.dvi ptrip.out ptrip.typ + rm -f trip.tfm trip.pl trip.tex trip.fmt ptripin.fot ptripin.log + rm -f ptrip.fot ptrip.log trip.log trip.dvi trip.typ + rm -f ptrip.fot ptrip.log ptrip.dvi ptrip.typ rm -f tripos.tex 8terminal.tex rm -rf tfm -## Test data -- not yet present +## Test data ## -not_yet_EXTRA_DIST = \ - ptexdir/ptrip/ptrip.diffs \ - ptexdir/ptrip/ptrip.fot \ - ptexdir/ptrip/ptrip.log \ - ptexdir/ptrip/ptrip.out \ - ptexdir/ptrip/ptrip.pl \ - ptexdir/ptrip/ptrip.tex \ - ptexdir/ptrip/ptrip.typ \ - ptexdir/ptrip/ptrip1.in \ - ptexdir/ptrip/ptrip2.in \ - ptexdir/ptrip/ptrip3.in \ - ptexdir/ptrip/ptripin.log \ - ptexdir/ptrip/ptripman.tex \ - ptexdir/ptrip/texmf.cnf \ - ptexdir/ptrip/trip2.in +EXTRA_DIST += ptexdir/ptrip.diffs ## Eventually delete these files ## diff --git a/Build/source/texk/web2c/ptexdir/lib/Makefile.in b/Build/source/texk/web2c/ptexdir/lib/Makefile.in index a121278feba..309fa315209 100644 --- a/Build/source/texk/web2c/ptexdir/lib/Makefile.in +++ b/Build/source/texk/web2c/ptexdir/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -52,6 +52,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ + $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ @@ -196,6 +197,9 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PTEXENC_DEPEND = @PTEXENC_DEPEND@ +PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ +PTEXENC_LIBS = @PTEXENC_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff --git a/Build/source/texk/web2c/ptexdir/ptrip.diffs b/Build/source/texk/web2c/ptexdir/ptrip.diffs Binary files differnew file mode 100644 index 00000000000..15f344a5fc7 --- /dev/null +++ b/Build/source/texk/web2c/ptexdir/ptrip.diffs diff --git a/Build/source/texk/web2c/ptexdir/ptrip.test b/Build/source/texk/web2c/ptexdir/ptrip.test index d9a39d190f4..b0cf35921f3 100755 --- a/Build/source/texk/web2c/ptexdir/ptrip.test +++ b/Build/source/texk/web2c/ptexdir/ptrip.test @@ -1,26 +1,26 @@ #! /bin/sh -# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org> # You may freely use, modify and/or distribute this file. testdir=$srcdir/triptrap -# ptestdir=$srcdir/ptexdir/ptrip TEXMFCNF=$testdir; export TEXMFCNF dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" echo ">>> Running TRIP test for pTeX." >&2 -#echo ">>> See $etestdir/etrip.diffs for example of acceptable diffs." >&2 +echo ">>> See $srcdir/ptexdir/ptrip.diffs for example of acceptable diffs." >&2 rm -f trip.tfm trip.pl trip.tex trip.fmt trip.dvi \ - ctripin.fot ctripin.log ctrip.fot ctrip.log ctrip.typ \ - xtripin.fot xtripin.log xtrip.fot xtrip.log xtrip.typ \ - etrip.tfm etrip.pl etrip.tex etrip.fmt etrip.dvi \ - etripin.fot etripin.log etrip.fot etrip.log etrip.out etrip.typ \ + ptripin.fot ptripin.log ptrip.fot ptrip.log ptrip.typ \ tripos.tex 8terminal.tex rm -rf tfm +# pTeX outputs direction of boxes. +P_SED1='s/, yoko direction//;s/yoko direction, //' +P_SED2='s/yoko(math) direction, //' + is_OK=: set -x @@ -36,26 +36,26 @@ diff $testdir/trip.pl trip.pl || is_OK=false # get same filename in log $LN_S $testdir/trip.tex . -./ptex --progname=einitex --ini <$testdir/trip1.in >ctripin.fot -mv trip.log ctripin.log || exit 1 -diff $testdir/tripin.log ctripin.log +rm -f trip.log +./ptex --progname=pinitex --ini <$testdir/trip1.in >ptripin.fot +sed "$P_SED1" trip.log > ptripin.log || exit 1 +diff $testdir/tripin.log ptripin.log # May as well test non-ini second time through. -./ptex --progname=etex <$testdir/trip2.in >ctrip.fot -# pTeX outputs direction of boxes. -cat trip.log | sed "s/, yoko direction//" | sed "s/yoko direction, //" > ctrip.log -diff $testdir/trip.fot ctrip.fot +rm -f trip.log +./ptex --progname=ptex <$testdir/trip2.in >ptrip.fot +sed "$P_SED1;$P_SED2" trip.log > ptrip.log +diff $testdir/trip.fot ptrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $testdir/trip.log ctrip.log +$DIFF $DIFFFLAGS $testdir/trip.log ptrip.log -eval ./dvitype $dvitype_args trip.dvi >ctrip.typ || exit 1 -$DIFF $DIFFFLAGS $testdir/trip.typ ctrip.typ +eval ./dvitype $dvitype_args trip.dvi >ptrip.typ || exit 1 +$DIFF $DIFFFLAGS $testdir/trip.typ ptrip.typ $is_OK || { echo ">>> There were some errors." >&2 exit 1 } -# pTeX doesn't support extended mode. |