texlive[67873] Build/source/texk/dviout-util: dviout-util: Enable to
commits+takuji at tug.org
commits+takuji at tug.org
Fri Aug 11 10:08:29 CEST 2023
Revision: 67873
http://tug.org/svn/texlive?view=revision&revision=67873
Author: takuji
Date: 2023-08-11 10:08:29 +0200 (Fri, 11 Aug 2023)
Log Message:
-----------
dviout-util: Enable to build with MinGW & MSYS2 on Windows
Modified Paths:
--------------
trunk/Build/source/texk/dviout-util/ChangeLog
trunk/Build/source/texk/dviout-util/Makefile.am
trunk/Build/source/texk/dviout-util/Makefile.in
trunk/Build/source/texk/dviout-util/chkdvifont.c
trunk/Build/source/texk/dviout-util/chkdvifont.test
trunk/Build/source/texk/dviout-util/dd.h
trunk/Build/source/texk/dviout-util/dvispc.c
trunk/Build/source/texk/dviout-util/dvispc.test
trunk/Build/source/texk/dviout-util/msvcdir.h
Modified: trunk/Build/source/texk/dviout-util/ChangeLog
===================================================================
--- trunk/Build/source/texk/dviout-util/ChangeLog 2023-08-10 23:42:51 UTC (rev 67872)
+++ trunk/Build/source/texk/dviout-util/ChangeLog 2023-08-11 08:08:29 UTC (rev 67873)
@@ -1,3 +1,10 @@
+2023-08-11 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * dvispc.c, chkdvifont.c, dd.h, msvcdir.h, Makefile.am:
+ Enable to build with MinGW & MSYS2 on Windows.
+ * dvispc.test, chkdvifont.test:
+ Enable to test on Windows.
+
2022-08-30 Karl Berry <karl at freefriends.org>
* chkdvifont.man: typo fixes from Hilmar Preu\ss{}e,
Modified: trunk/Build/source/texk/dviout-util/Makefile.am
===================================================================
--- trunk/Build/source/texk/dviout-util/Makefile.am 2023-08-10 23:42:51 UTC (rev 67872)
+++ trunk/Build/source/texk/dviout-util/Makefile.am 2023-08-11 08:08:29 UTC (rev 67873)
@@ -3,7 +3,7 @@
## Copyright (C) 2018-2021 Japanese TeX Development Community <issue at texjp.org>
## You may freely use, modify and/or distribute this file.
##
-AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA -DPTEXENC
+AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) -DKPATHSEA -DPTEXENC
AM_CFLAGS = $(WARNING_CFLAGS)
$(dviout_util_OBJECTS): $(KPATHSEA_DEPEND) $(PTEXENC_DEPEND)
Modified: trunk/Build/source/texk/dviout-util/Makefile.in
===================================================================
--- trunk/Build/source/texk/dviout-util/Makefile.in 2023-08-10 23:42:51 UTC (rev 67872)
+++ trunk/Build/source/texk/dviout-util/Makefile.in 2023-08-11 08:08:29 UTC (rev 67873)
@@ -556,7 +556,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA -DPTEXENC
+AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) -DKPATHSEA -DPTEXENC
AM_CFLAGS = $(WARNING_CFLAGS)
dvispc_SOURCES = dvispc.c common.h
chkdvifont_SOURCES = chkdvifont.c dd.h msvcdir.h common.h
Modified: trunk/Build/source/texk/dviout-util/chkdvifont.c
===================================================================
--- trunk/Build/source/texk/dviout-util/chkdvifont.c 2023-08-10 23:42:51 UTC (rev 67872)
+++ trunk/Build/source/texk/dviout-util/chkdvifont.c 2023-08-11 08:08:29 UTC (rev 67873)
@@ -41,18 +41,15 @@
*
*/
-#ifdef __GNUC__
-/* Validate in case of UNIX */
+#ifdef WIN32
+#define MSVC 1
+#else
#define UNIX 1
-#define GCC 1
-#else
-/* Win32 MSVC is assumed */
-#define WIN32 1
-#define MSVC 1
#endif
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#ifndef UNIX
#include <dos.h>
#ifdef MSVC
@@ -62,10 +59,10 @@
#endif
#include <io.h>
#endif
-#include <string.h>
-#ifdef GCC
+#ifdef __GNUC__
#include <ctype.h>
+#define GCC 1
#endif
#include <config.h>
Modified: trunk/Build/source/texk/dviout-util/chkdvifont.test
===================================================================
--- trunk/Build/source/texk/dviout-util/chkdvifont.test 2023-08-10 23:42:51 UTC (rev 67872)
+++ trunk/Build/source/texk/dviout-util/chkdvifont.test 2023-08-11 08:08:29 UTC (rev 67873)
@@ -3,6 +3,10 @@
# Copyright 2018-2021 Japanese TeX Development Community <issue at texjp.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_chkdvifont=$BinDir/chkdvifont$ExeExt
+
testdir=$srcdir/tests
DIFF="diff"
@@ -11,7 +15,7 @@
# but the output might be written in CRLF on some platform.
# if 'diff --strip-trailing-cr' is available, exploit it.
# (useful for tests on win32 binaries run on MSYS shell)
-$DIFF --strip-trailing-cr README README \
+$DIFF --strip-trailing-cr $0 $0 \
&& DIFF="diff --strip-trailing-cr" || echo
@@ -18,17 +22,17 @@
## DVI mode
cp $testdir/oldindep.dvi . && \
- ./chkdvifont -c ./oldindep.dvi > xoldindep.cfn && \
+ $_chkdvifont -c ./oldindep.dvi > xoldindep.cfn && \
$DIFF $testdir/oldindep.cfn xoldindep.cfn && echo || exit 1
## TFM/JFM mode
-./chkdvifont -c $testdir/jis.tfm > xjis.cfn && \
+$_chkdvifont -c $testdir/jis.tfm > xjis.cfn && \
$DIFF $testdir/jis.cfn xjis.cfn && echo || exit 2
# eufm10.tfm is "AMSTeX 2.0 or newer", exit code should be 4
-./chkdvifont -c $testdir/eufm10.tfm > xeufm10.cfn
+$_chkdvifont -c $testdir/eufm10.tfm > xeufm10.cfn
if [ $? -ne 4 ]; then exit 3; fi
sed 's!2.0/2.1!2.0 or newer!' xeufm10.cfn > xeufm10.ed.cfn
$DIFF $testdir/eufm10.cfn xeufm10.ed.cfn && echo || exit 3
@@ -36,10 +40,10 @@
## FONT mode
-./chkdvifont -c $testdir/cmr10.pk > xcmr10.cfn && \
+$_chkdvifont -c $testdir/cmr10.pk > xcmr10.cfn && \
$DIFF $testdir/cmr10.cfn xcmr10.cfn && echo || exit 4
-echo M | ./chkdvifont && echo || exit 0
+echo M | $_chkdvifont && echo || exit 0
# the following tests will not pass for old version written by SHIMA.
# that version can be distinguished from the new version by
@@ -46,17 +50,17 @@
# exit code 250 for usage with stdin M. (the above line did it!)
# check VF format
-./chkdvifont -c $testdir/upjisr-h.vf > xupjisr-h.cfn && \
+$_chkdvifont -c $testdir/upjisr-h.vf > xupjisr-h.cfn && \
$DIFF $testdir/upjisr-h.cfn xupjisr-h.cfn && echo || exit 5
# detect new JFM format
-./chkdvifont -c $testdir/uparse.tfm > xuparse.cfn && \
+$_chkdvifont -c $testdir/uparse.tfm > xuparse.cfn && \
$DIFF $testdir/uparse.cfn xuparse.cfn && echo || exit 6
-./chkdvifont -c $testdir/skipjfmp.tfm > xskipjfmp.cfn && \
+$_chkdvifont -c $testdir/skipjfmp.tfm > xskipjfmp.cfn && \
$DIFF $testdir/skipjfmp.cfn xskipjfmp.cfn && echo || exit 7
-./chkdvifont -c $testdir/upphirakakuw3-h.tfm > xupp3-h.cfn && \
+$_chkdvifont -c $testdir/upphirakakuw3-h.tfm > xupp3-h.cfn && \
$DIFF $testdir/upphirakakuw3-h.cfn xupp3-h.cfn && echo || exit 8
-./chkdvifont -c $testdir/upphirakakuw6-h.tfm > xupp6-h.cfn && \
+$_chkdvifont -c $testdir/upphirakakuw6-h.tfm > xupp6-h.cfn && \
$DIFF $testdir/upphirakakuw6-h.cfn xupp6-h.cfn && echo || exit 9
Modified: trunk/Build/source/texk/dviout-util/dd.h
===================================================================
--- trunk/Build/source/texk/dviout-util/dd.h 2023-08-10 23:42:51 UTC (rev 67872)
+++ trunk/Build/source/texk/dviout-util/dd.h 2023-08-11 08:08:29 UTC (rev 67873)
@@ -67,11 +67,6 @@
#define MAXFILE 128
#define MAXEXT 128
#define O_BINARY 0
-#define PATH_SEP '/'
-#define DELIMITER ':'
-#else
-#define PATH_SEP '\\'
-#define DELIMITER ';'
#endif
#ifndef max
Modified: trunk/Build/source/texk/dviout-util/dvispc.c
===================================================================
--- trunk/Build/source/texk/dviout-util/dvispc.c 2023-08-10 23:42:51 UTC (rev 67872)
+++ trunk/Build/source/texk/dviout-util/dvispc.c 2023-08-11 08:08:29 UTC (rev 67873)
@@ -11,13 +11,8 @@
* January 2003
*/
-#ifdef __GNUC__
-/* Validate in case of UNIX */
+#ifndef WIN32
#define UNIX 1
-#else
-/* Validate if SHIFT JIS is used for a filename */
-/* Win32 MSVC is assumed */
-#define SHIFT_JIS 1
#endif
/* %%% Contents of an extended DVI file %%%
@@ -103,7 +98,6 @@
#define Long int
#ifdef UNIX
-#define PATH_SEP '/'
#define READ_TEXT "r"
#define READ_BINARY "r"
#define WRITE_BINARY "w"
@@ -110,8 +104,6 @@
#define WRITE_TEXT "w"
#define StrCmp strcmp
#else
-#define PATH_SEP '\\'
-#define PATH_SEPU '/'
#define READ_TEXT "rt"
#define READ_BINARY "rb"
#define WRITE_BINARY "wb"
Modified: trunk/Build/source/texk/dviout-util/dvispc.test
===================================================================
--- trunk/Build/source/texk/dviout-util/dvispc.test 2023-08-10 23:42:51 UTC (rev 67872)
+++ trunk/Build/source/texk/dviout-util/dvispc.test 2023-08-11 08:08:29 UTC (rev 67873)
@@ -3,6 +3,10 @@
# Copyright 2018-2021 Japanese TeX Development Community <issue at texjp.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_dvispc=$BinDir/dvispc$ExeExt
+
testdir=$srcdir/tests
DIFF="diff"
@@ -11,82 +15,91 @@
# but the output might be written in CRLF on some platform.
# if 'diff --strip-trailing-cr' is available, exploit it.
# (useful for tests on win32 binaries run on MSYS shell)
-$DIFF --strip-trailing-cr README README \
+$DIFF --strip-trailing-cr $0 $0 \
&& DIFF="diff --strip-trailing-cr" || echo
+#if [ "$(expr substr $(uname -s) 1 5)" == "MINGW" ]; then
+# echo "*** skip test $0 on MINGW"
+# exit 0
+#fi
+## show banner
+$_dvispc
+
+rc=0
+
## EXE2SPECIAL
-./dvispc -s $testdir/oldindep.dvi x0oldindep.spc && \
- $DIFF $testdir/oldindep.spc x0oldindep.spc && echo || exit 1
+$_dvispc -s $testdir/oldindep.dvi x0oldindep.spc && \
+ $DIFF $testdir/oldindep.spc x0oldindep.spc && echo || rc=1
-./dvispc -s $testdir/oldindep.dvi > x1oldindep.spc && \
- $DIFF $testdir/oldindep.spc x1oldindep.spc && echo || exit 2
+$_dvispc -s $testdir/oldindep.dvi > x1oldindep.spc && \
+ $DIFF $testdir/oldindep.spc x1oldindep.spc && echo || rc=2
## invalid usage
-#./dvispc -s < $testdir/oldindep.dvi x2oldindep.spc && \
-# diff $testdir/oldindep.spc x2oldindep.spc && echo || exit 0
+#$_dvispc -s < $testdir/oldindep.dvi x2oldindep.spc && \
+# diff $testdir/oldindep.spc x2oldindep.spc && echo || rc=3
## stdin is a DVI, random access may not be supported, no test
-#./dvispc -s < $testdir/oldindep.dvi > x3oldindep.spc && \
-# diff $testdir/oldindep.spc x3oldindep.spc && echo || exit 3
+#$_dvispc -s < $testdir/oldindep.dvi > x3oldindep.spc && \
+# diff $testdir/oldindep.spc x3oldindep.spc && echo || rc=4
## EXE2TEXT + EXE2DVI
-./dvispc -a $testdir/oldindep.dvi x0oldindepa.txt && \
- ./dvispc -x x0oldindepa.txt x0oldindepax.dvi && \
- $CMP $testdir/oldindep.dvi x0oldindepax.dvi && echo || exit 4
+$_dvispc -a $testdir/oldindep.dvi x0oldindepa.txt && \
+ $_dvispc -x x0oldindepa.txt x0oldindepax.dvi && \
+ $CMP $testdir/oldindep.dvi x0oldindepax.dvi && echo || rc=11
-./dvispc -a $testdir/oldindep.dvi > x1oldindepa.txt && \
- ./dvispc -x < x1oldindepa.txt > x1oldindepax.dvi && \
- $CMP $testdir/oldindep.dvi x1oldindepax.dvi && echo || exit 5
+$_dvispc -a $testdir/oldindep.dvi > x1oldindepa.txt && \
+ $_dvispc -x < x1oldindepa.txt > x1oldindepax.dvi && \
+ $CMP $testdir/oldindep.dvi x1oldindepax.dvi && echo || rc=12
# not working as expected only for test (redirect??)
-#./dvispc -a $testdir/oldindep.dvi | ./dvispc -x x2oldindepax.dvi && \
-# $CMP $testdir/oldindep.dvi x2oldindepax.dvi && echo || exit 6
+#$_dvispc -a $testdir/oldindep.dvi | $_dvispc -x x2oldindepax.dvi && \
+# $CMP $testdir/oldindep.dvi x2oldindepax.dvi && echo || rc=13
-./dvispc -a $testdir/oldindep.dvi | ./dvispc -x > x3oldindepax.dvi && \
- $CMP $testdir/oldindep.dvi x3oldindepax.dvi && echo || exit 7
+$_dvispc -a $testdir/oldindep.dvi | $_dvispc -x > x3oldindepax.dvi && \
+ $CMP $testdir/oldindep.dvi x3oldindepax.dvi && echo || rc=14
## EXE2MODIFY & EXE2CHECK (should be consistent)
-./dvispc -d $testdir/oldindep.dvi >x0oldindep.dry
- $DIFF $testdir/oldindep.dry x0oldindep.dry && echo || exit 1
+$_dvispc -d $testdir/oldindep.dvi >x0oldindep.dry
+ $DIFF $testdir/oldindep.dry x0oldindep.dry && echo || rc=21
-./dvispc -c $testdir/oldindep.dvi x0oldindepout.dvi && \
- $CMP $testdir/oldindepout.dvi x0oldindepout.dvi && echo || exit 1
+$_dvispc -c $testdir/oldindep.dvi x0oldindepout.dvi && \
+ $CMP $testdir/oldindepout.dvi x0oldindepout.dvi && echo || rc=22
-./dvispc -c $testdir/oldindep.dvi > x1oldindepout.dvi && \
- $CMP $testdir/oldindepout.dvi x1oldindepout.dvi && echo || exit 2
+$_dvispc -c $testdir/oldindep.dvi > x1oldindepout.dvi && \
+ $CMP $testdir/oldindepout.dvi x1oldindepout.dvi && echo || rc=23
## invalid usage
-#./dvispc -c < $testdir/oldindep.dvi x2oldindepout.dvi && \
-# $CMP $testdir/oldindepout.dvi x2oldindepout.dvi && echo || exit 0
+#$_dvispc -c < $testdir/oldindep.dvi x2oldindepout.dvi && \
+# $CMP $testdir/oldindepout.dvi x2oldindepout.dvi && echo || rc=24
## stdin is a DVI, random access may not be supported, no test
-#./dvispc -c < $testdir/oldindep.dvi > x3oldindepout.dvi && \
-# $CMP $testdir/oldindepout.dvi x3oldindepout.dvi && echo || exit 3
+#$_dvispc -c < $testdir/oldindep.dvi > x3oldindepout.dvi && \
+# $CMP $testdir/oldindepout.dvi x3oldindepout.dvi && echo || rc=25
## check default is -c
-./dvispc $testdir/oldindep.dvi x2oldindepout.dvi && \
- $CMP $testdir/oldindepout.dvi x2oldindepout.dvi && echo || exit 4
+$_dvispc $testdir/oldindep.dvi x2oldindepout.dvi && \
+ $CMP $testdir/oldindepout.dvi x2oldindepout.dvi && echo || rc=26
## check default overwrite
# not working as expected only for test (redirect??)
#cp $testdir/oldindep.dvi x3write.dvi && \
-# ./dvispc x3write.dvi
-# $CMP $testdir/oldindepout.dvi x3write.dvi && echo || exit 5
+# $_dvispc x3write.dvi
+# $CMP $testdir/oldindepout.dvi x3write.dvi && echo || rc=31
## case of underflow
-./dvispc $testdir/under.dvi x0underout.dvi && \
- $CMP $testdir/underout.dvi x0underout.dvi && echo || exit 6
+$_dvispc $testdir/under.dvi x0underout.dvi && \
+ $CMP $testdir/underout.dvi x0underout.dvi && echo || rc=32
rm -f x1underout.dvi
-./dvispc x0underout.dvi x1underout.dvi && \
- if test -f x1underout.dvi; then exit 1; else echo; fi || exit 6
+$_dvispc x0underout.dvi x1underout.dvi && \
+ if test -f x1underout.dvi; then exit 1; else echo; fi || rc=33
-./dvispc && echo || exit 0
+$_dvispc && echo || exit $rc
# the following tests will not pass for old version written by SHIMA.
# that version can be distinguished from the new version by
@@ -93,56 +106,56 @@
# exit code 1 for usage without argument. (the above line did it!)
# correction for tpicpn.dvi is needed but should be minimal
-./dvispc -d $testdir/tpicpn.dvi >x0tpicpn.dry
+$_dvispc -d $testdir/tpicpn.dvi >x0tpicpn.dry
$DIFF $testdir/tpicpn.dry x0tpicpn.dry && echo || exit 1
-./dvispc $testdir/tpicpn.dvi x0tpicpnout.dvi && \
+$_dvispc $testdir/tpicpn.dvi x0tpicpnout.dvi && \
$CMP $testdir/tpicpnout.dvi x0tpicpnout.dvi && echo || exit 1
# correction for tpicsh.dvi is never needed, check no output
-./dvispc -d $testdir/tpicsh.dvi >x0tpicsh.dry
+$_dvispc -d $testdir/tpicsh.dvi >x0tpicsh.dry
$DIFF $testdir/tpicsh.dry x0tpicsh.dry && echo || exit 1
rm -f x0tpicshout.dvi
-./dvispc $testdir/tpicsh.dvi x0tpicshout.dvi && \
+$_dvispc $testdir/tpicsh.dvi x0tpicshout.dvi && \
if test -f x0tpicshout.dvi; then exit 1; else echo; fi || exit 1
## page independence in reverse order which requires prior scanning
-./dvispc -d $testdir/reverse.dvi >xreverse.dry
+$_dvispc -d $testdir/reverse.dvi >xreverse.dry
$DIFF $testdir/reverse.dry xreverse.dry && echo || exit 1
-./dvispc $testdir/reverse.dvi xreverseout.dvi && \
+$_dvispc $testdir/reverse.dvi xreverseout.dvi && \
$CMP $testdir/reverseout.dvi xreverseout.dvi && echo || exit 1
# prior scanning should not mess up
-./dvispc -d $testdir/first.dvi >xfirst.dry
+$_dvispc -d $testdir/first.dvi >xfirst.dry
$DIFF $testdir/first.dry xfirst.dry && echo || exit 1
-./dvispc $testdir/first.dvi xfirstout.dvi && \
+$_dvispc $testdir/first.dvi xfirstout.dvi && \
$CMP $testdir/firstout.dvi xfirstout.dvi && echo || exit 1
# prior scanning should not mess up (no correction)
-./dvispc -d $testdir/firstpn.dvi >xfirstpn.dry
+$_dvispc -d $testdir/firstpn.dvi >xfirstpn.dry
$DIFF $testdir/firstpn.dry xfirstpn.dry && echo || exit 1
rm -f xfirstpn.dvi
-./dvispc $testdir/firstpn.dvi xfirstpn.dvi && \
+$_dvispc $testdir/firstpn.dvi xfirstpn.dvi && \
if test -f xfirstpn.dvi; then exit 1; else echo; fi || exit 1
# ==== future work start ====
## page independence of annotation
-#./dvispc -d $testdir/annot.dvi >xannot.dry
+#$_dvispc -d $testdir/annot.dvi >xannot.dry
# $DIFF $testdir/annot.dry xannot.dry && echo || exit 2
-#./dvispc $testdir/annot.dvi xannotout.dvi && \
+#$_dvispc $testdir/annot.dvi xannotout.dvi && \
# $CMP $testdir/annotout.dvi xannotout.dvi && echo || exit 2
## page independence of long (>255) specials (e.g. annotation)
## disabled because annotation is unsupported
-#./dvispc -d $testdir/longspec.dvi >xlongspec.dry
+#$_dvispc -d $testdir/longspec.dvi >xlongspec.dry
# $DIFF $testdir/longspec.dry xlongspec.dry && echo || exit 3
-#./dvispc $testdir/longspec.dvi xlongspecout.dvi && \
+#$_dvispc $testdir/longspec.dvi xlongspecout.dvi && \
# $CMP $testdir/longspecout.dvi xlongspecout.dvi && echo || exit 3
## flatten nested anotation
-#./dvispc -d $testdir/flatnest.dvi >xflatnest.dry
+#$_dvispc -d $testdir/flatnest.dvi >xflatnest.dry
# $DIFF $testdir/flatnest.dry xflatnest.dry && echo || exit 3
-#./dvispc $testdir/flatnest.dvi xflatnestout.dvi && \
+#$_dvispc $testdir/flatnest.dvi xflatnestout.dvi && \
# $CMP $testdir/flatnestout.dvi xflatnestout.dvi && echo || exit 4
# ==== future work end ====
@@ -150,13 +163,13 @@
## check -b backup works (old version did not!)
# not working as expected only for test (redirect??)
#cp $testdir/oldindep.dvi x4write.dvi && \
-# ./dvispc -b x4write.dvi
+# $_dvispc -b x4write.dvi
# $CMP $testdir/oldindepout.dvi x4write.dvi && echo || exit 1
# $CMP $testdir/oldindep.dvi x4write.dvi.bak && echo || exit 1
## without .dvi extension (old version missed for outfile!)
cp $testdir/oldindep.dvi x5write.dvi && \
- ./dvispc x5write x5writeout
+ $_dvispc x5write x5writeout
$CMP $testdir/oldindepout.dvi x5writeout.dvi && echo || exit 2
@@ -164,50 +177,50 @@
## EXE2TEXT + EXE2DVI: check for -J option
-./dvispc -a -Ju $testdir/jisx0208.dvi jisx0208.da.txt || exit 2
+$_dvispc -a -Ju $testdir/jisx0208.dvi jisx0208.da.txt || exit 2
$DIFF $testdir/jisx0208.txt jisx0208.da.txt || exit 1
-./dvispc -x $testdir/jisx0208.txt jisx0208.da.dvi || exit 2
+$_dvispc -x $testdir/jisx0208.txt jisx0208.da.dvi || exit 2
$CMP $testdir/jisx0208.dvi jisx0208.da.dvi || exit 1
-./dvispc -a -Js $testdir/jisx0208.dvi jisx0208-sjp.da.txt || exit 2
-./dvispc -a -Je $testdir/jisx0208.dvi jisx0208-ejp.da.txt || exit 2
+$_dvispc -a -Js $testdir/jisx0208.dvi jisx0208-sjp.da.txt || exit 2
+$_dvispc -a -Je $testdir/jisx0208.dvi jisx0208-ejp.da.txt || exit 2
## EXE2TEXT: printing ASCII/Japanese characters
-./dvispc -a -Ju $testdir/putj.dump.dvi putj.da.txt || exit 2
+$_dvispc -a -Ju $testdir/putj.dump.dvi putj.da.txt || exit 2
$DIFF $testdir/putj.txt putj.da.txt || exit 1
-./dvispc -a -JU $testdir/put.dump.dvi put.da.txt || exit 2
+$_dvispc -a -JU $testdir/put.dump.dvi put.da.txt || exit 2
$DIFF $testdir/put.txt put.da.txt || exit 1
## EXE2TEXT + EXE2DVI: different position of fntdef, nop
-./dvispc -a $testdir/fntdef0.dvi xfntdef0.txt || exit 2
+$_dvispc -a $testdir/fntdef0.dvi xfntdef0.txt || exit 2
$DIFF $testdir/fntdef0.txt xfntdef0.txt || exit 1
-./dvispc -x xfntdef0.txt xfntdef0.dvi || exit 2
+$_dvispc -x xfntdef0.txt xfntdef0.dvi || exit 2
$CMP $testdir/fntdef0.dvi xfntdef0.dvi || exit 1
-./dvispc -a $testdir/fntdef1.dvi xfntdef1.txt || exit 2
+$_dvispc -a $testdir/fntdef1.dvi xfntdef1.txt || exit 2
$DIFF $testdir/fntdef1.txt xfntdef1.txt || exit 1
-./dvispc -x xfntdef1.txt xfntdef1.dvi || exit 2
+$_dvispc -x xfntdef1.txt xfntdef1.dvi || exit 2
$CMP $testdir/fntdef1.dvi xfntdef1.dvi || exit 1
-./dvispc -a $testdir/fntdef2.dvi xfntdef2.txt || exit 2
+$_dvispc -a $testdir/fntdef2.dvi xfntdef2.txt || exit 2
$DIFF $testdir/fntdef2.txt xfntdef2.txt || exit 1
-./dvispc -x xfntdef2.txt xfntdef2.dvi || exit 2
+$_dvispc -x xfntdef2.txt xfntdef2.dvi || exit 2
$CMP $testdir/fntdef2.dvi xfntdef2.dvi || exit 1
-./dvispc -a $testdir/fntdef3.dvi xfntdef3.txt || exit 2
+$_dvispc -a $testdir/fntdef3.dvi xfntdef3.txt || exit 2
$DIFF $testdir/fntdef3.txt xfntdef3.txt || exit 1
-./dvispc -x xfntdef3.txt xfntdef3.dvi || exit 2
+$_dvispc -x xfntdef3.txt xfntdef3.dvi || exit 2
$CMP $testdir/fntdef3.dvi xfntdef3.dvi || exit 1
-./dvispc -a -t $testdir/fntdef0.dvi xfntdef0-dtl.txt || exit 2
+$_dvispc -a -t $testdir/fntdef0.dvi xfntdef0-dtl.txt || exit 2
$DIFF $testdir/fntdef0-dtl.txt xfntdef0-dtl.txt || exit 1
-./dvispc -x xfntdef0-dtl.txt xfntdef0-dtl.dvi || exit 2
+$_dvispc -x xfntdef0-dtl.txt xfntdef0-dtl.dvi || exit 2
$CMP $testdir/fntdef0.dvi xfntdef0-dtl.dvi || exit 1
-./dvispc -a -t $testdir/fntdef3.dvi xfntdef3-dtl.txt || exit 2
+$_dvispc -a -t $testdir/fntdef3.dvi xfntdef3-dtl.txt || exit 2
$DIFF $testdir/fntdef3-dtl.txt xfntdef3-dtl.txt || exit 1
-./dvispc -x xfntdef3-dtl.txt xfntdef3-dtl.dvi || exit 2
+$_dvispc -x xfntdef3-dtl.txt xfntdef3-dtl.dvi || exit 2
$CMP $testdir/fntdef3.dvi xfntdef3-dtl.dvi || exit 1
Modified: trunk/Build/source/texk/dviout-util/msvcdir.h
===================================================================
--- trunk/Build/source/texk/dviout-util/msvcdir.h 2023-08-10 23:42:51 UTC (rev 67872)
+++ trunk/Build/source/texk/dviout-util/msvcdir.h 2023-08-11 08:08:29 UTC (rev 67873)
@@ -1,7 +1,7 @@
/*/msvcdir.h */
#if !defined(MSVCDIR_H)
-#define MSVCDIR_H
+#define MSVCDIR_H
#include <stdlib.h> /*_splitpath */
#include <direct.h>
#include <assert.h> /*assert */
@@ -29,4 +29,4 @@
#pragma warning( disable : 4244 4018 4102 4761 4146 4047 4305 4245 4113)
#endif
-#endif MSVCDIR_H
+#endif /* MSVCDIR_H */
More information about the tex-live-commits
mailing list.