texlive[67398] U trunk/Build/source/texk/web2c/cwebdir/ctwill.test:
commits+karl at tug.org
commits+karl at tug.org
Sun Jun 18 18:46:21 CEST 2023
Revision: 67398
http://tug.org/svn/texlive?view=revision&revision=67398
Author: karl
Date: 2023-06-18 18:46:20 +0200 (Sun, 18 Jun 2023)
Log Message:
-----------
install ctwill-proofsort; script tweaks; exit ctwill.test without running TeX
Modified Paths:
--------------
trunk/Build/source/texk/web2c/ChangeLog
trunk/Build/source/texk/web2c/Makefile.in
trunk/Build/source/texk/web2c/am/cweb.am
trunk/Build/source/texk/web2c/cwebdir/ChangeLog
trunk/Build/source/texk/web2c/cwebdir/ctwill-proofsort
trunk/Build/source/texk/web2c/cwebdir/ctwill.test
Property Changed:
----------------
trunk/Build/source/texk/web2c/am/cweb.am
trunk/Build/source/texk/web2c/cwebdir/ctwill-proofsort
trunk/Build/source/texk/web2c/cwebdir/ctwill.test
Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog 2023-06-17 23:50:35 UTC (rev 67397)
+++ trunk/Build/source/texk/web2c/ChangeLog 2023-06-18 16:46:20 UTC (rev 67398)
@@ -1,3 +1,8 @@
+2023-06-18 Karl Berry <karl at freefriends.org>
+
+ * am/cweb.am (dist_bin_SCRIPTS): new script cwebdir/ctwill-proofsort.
+ (TESTS): rearrange to keep all info for a given test together.
+
2023-06-17 Andreas Scherer <https://ascherer.github.io>
* Makefile.in: Integrate cwebdir/ctwill.test; run reautoconf.
Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in 2023-06-17 23:50:35 UTC (rev 67397)
+++ trunk/Build/source/texk/web2c/Makefile.in 2023-06-18 16:46:20 UTC (rev 67398)
@@ -18,6 +18,7 @@
+
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
@@ -389,8 +390,8 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(am__syncinclude_HEADERS_DIST) \
- $(am__DIST_COMMON)
+ $(am__configure_deps) $(dist_bin_SCRIPTS) \
+ $(am__syncinclude_HEADERS_DIST) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -440,9 +441,9 @@
@ALEPH_TRUE at am__EXEEXT_30 = aleph$(EXEEXT)
@SYNCTEX_TRUE at am__EXEEXT_31 = synctex$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \
- "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man1dir)" \
- "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" \
- "$(DESTDIR)$(syncincludedir)"
+ "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
+ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(syncincludedir)"
@MF_TRUE@@WIN32_TRUE at am__EXEEXT_32 = call_mf$(EXEEXT)
@MFLUA_TRUE@@WIN32_TRUE at am__EXEEXT_33 = call_mflua$(EXEEXT)
@MFLUAJIT_TRUE@@WIN32_TRUE at am__EXEEXT_34 = call_mfluajit$(EXEEXT)
@@ -1693,6 +1694,7 @@
xetex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xetex_CXXFLAGS) \
$(CXXFLAGS) $(xetex_LDFLAGS) $(LDFLAGS) -o $@
+SCRIPTS = $(dist_bin_SCRIPTS)
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -3814,6 +3816,7 @@
nodist_vptovf_SOURCES = vptovf.c vptovf.h
nodist_weave_SOURCES = weave.c weave.h
nodist_twill_SOURCES = twill.c twill.h
+dist_bin_SCRIPTS = cwebdir/ctwill-proofsort
nodist_ctie_SOURCES = ctie.c
nodist_cweave_SOURCES = cweave.c cweb.c
nodist_ctwill_SOURCES = ctwill.c cweb.c
@@ -8350,7 +8353,42 @@
xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES)
@rm -f xetex$(EXEEXT)
$(AM_V_CXXLD)$(xetex_LINK) $(xetex_OBJECTS) $(xetex_LDADD) $(LIBS)
+install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n' \
+ -e 'h;s|.*|.|' \
+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+ if (++n[d] == $(am__install_max)) { \
+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+ else { print "f", d "/" $$4, $$1 } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+uninstall-dist_binSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+ dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
+
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-rm -f alephdir/*.$(OBJEXT)
@@ -19530,8 +19568,8 @@
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-recursive
-all-am: Makefile $(PROGRAMS) $(LIBRARIES) $(LTLIBRARIES) $(MANS) \
- $(DATA) $(HEADERS) ff-config.h
+all-am: Makefile $(PROGRAMS) $(LIBRARIES) $(LTLIBRARIES) $(SCRIPTS) \
+ $(MANS) $(DATA) $(HEADERS) ff-config.h
install-EXTRAPROGRAMS: install-libLTLIBRARIES
install-binPROGRAMS: install-libLTLIBRARIES
@@ -19540,7 +19578,7 @@
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(syncincludedir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(syncincludedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -20475,8 +20513,8 @@
install-dvi-am:
-install-exec-am: install-binPROGRAMS install-libLIBRARIES \
- install-libLTLIBRARIES
+install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS \
+ install-libLIBRARIES install-libLTLIBRARIES
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-html: install-html-recursive
@@ -21246,9 +21284,9 @@
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-libLIBRARIES \
- uninstall-libLTLIBRARIES uninstall-man uninstall-pkgconfigDATA \
- uninstall-syncincludeHEADERS
+uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \
+ uninstall-libLIBRARIES uninstall-libLTLIBRARIES uninstall-man \
+ uninstall-pkgconfigDATA uninstall-syncincludeHEADERS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
uninstall-man: uninstall-man1 uninstall-man5
@@ -21267,17 +21305,18 @@
distclean-hdr distclean-libtool distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \
info-am install install-am install-binPROGRAMS install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-exec-hook install-html install-html-am \
- install-info install-info-am install-libLIBRARIES \
- install-libLTLIBRARIES install-man install-man1 install-man5 \
- install-pdf install-pdf-am install-pkgconfigDATA install-ps \
- install-ps-am install-strip install-syncincludeHEADERS \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am recheck tags tags-am uninstall \
- uninstall-am uninstall-binPROGRAMS uninstall-hook \
+ install-data-am install-dist_binSCRIPTS install-dvi \
+ install-dvi-am install-exec install-exec-am install-exec-hook \
+ install-html install-html-am install-info install-info-am \
+ install-libLIBRARIES install-libLTLIBRARIES install-man \
+ install-man1 install-man5 install-pdf install-pdf-am \
+ install-pkgconfigDATA install-ps install-ps-am install-strip \
+ install-syncincludeHEADERS installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ recheck tags tags-am uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-dist_binSCRIPTS uninstall-hook \
uninstall-libLIBRARIES uninstall-libLTLIBRARIES uninstall-man \
uninstall-man1 uninstall-man5 uninstall-pkgconfigDATA \
uninstall-syncincludeHEADERS
@@ -21511,8 +21550,8 @@
tie.c: ctangle$(EXEEXT) tiedir/tie.w tiedir/tie-w2c.ch
$(ctangle_silent)CWEBINPUTS=$(srcdir)/tiedir $(ctangle) tie.w tie-w2c.ch
ctiedir/ctie.log: ctie$(EXEEXT)
+cwebdir/ctwill.log: ctwill$(EXEEXT)
cwebdir/cweave.log: cweave$(EXEEXT)
-cwebdir/ctwill.log: ctwill$(EXEEXT)
tiedir/tie.log: tie$(EXEEXT)
$(tex_OBJECTS): $(tex_prereq)
Modified: trunk/Build/source/texk/web2c/am/cweb.am
===================================================================
--- trunk/Build/source/texk/web2c/am/cweb.am 2023-06-17 23:50:35 UTC (rev 67397)
+++ trunk/Build/source/texk/web2c/am/cweb.am 2023-06-18 16:46:20 UTC (rev 67398)
@@ -1,9 +1,12 @@
+## $Id$
## texk/web2c/am/cweb.am: Makefile fragment for cweb programs (except ctangle).
##
-## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+## Copyright 2015-2023 Karl Berry <tex-live at tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
bin_PROGRAMS += ctie cweave ctwill ctwill-refsort ctwill-twinx tie
+dist_bin_SCRIPTS = cwebdir/ctwill-proofsort
EXTRA_DIST += ctiedir tiedir
NEVER_DIST += ctiedir/ctie.log ctiedir/ctie.trs tiedir/tie.log tiedir/tie.trs
@@ -44,19 +47,19 @@
## Tests
##
-TESTS += ctiedir/ctie.test cwebdir/ctwill.test cwebdir/cweave.test tiedir/tie.test
+TESTS += ctiedir/ctie.test
+DISTCLEANFILES += ctie.outc ctie.outm
ctiedir/ctie.log: ctie$(EXEEXT)
-cwebdir/cweave.log: cweave$(EXEEXT)
-cwebdir/ctwill.log: ctwill$(EXEEXT)
-tiedir/tie.log: tie$(EXEEXT)
-## ctiedir/ctie.test
-DISTCLEANFILES += ctie.outc ctie.outm
-## cwebdir/ctwill.test
+TESTS += cwebdir/ctwill.test
DISTCLEANFILES += ctwill.w ctwill.tex ctwill.aux ctwill.idx ctwill.scn
DISTCLEANFILES += ctwill.ref ctwill.sref ctwill.dvi ctwill-sorted.tex
-## cwebdir/cweave.test
+cwebdir/ctwill.log: ctwill$(EXEEXT)
+
+TESTS += cwebdir/cweave.test
DISTCLEANFILES += common.tex common.scn common.idx
-## tiedir/tie.test
+cwebdir/cweave.log: cweave$(EXEEXT)
+
+TESTS += tiedir/tie.test
DISTCLEANFILES += tie.outc tie.outm
-
+tiedir/tie.log: tie$(EXEEXT)
Property changes on: trunk/Build/source/texk/web2c/am/cweb.am
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/cwebdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ChangeLog 2023-06-17 23:50:35 UTC (rev 67397)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog 2023-06-18 16:46:20 UTC (rev 67398)
@@ -1,3 +1,13 @@
+2023-06-18 Karl Berry <karl at freefriends.org>
+
+ * ctwill-proofsort: die if getopt fails;
+ standardize version() output;
+ move COPYRIGHT to end of help, include github repo.
+ * ctwill.test: for now, exit before running TeX,
+ since building plain.fmt is too intensive.
+ Consistently use ./ctie instead of ctie since we want
+ the binary in the build directory.
+
2023-06-17 Andreas Scherer <https://ascherer.github.io>
* ctwill-{mini,hint}.ch: Make ctwill.w plain-TeX-able again.
Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-proofsort
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-proofsort 2023-06-17 23:50:35 UTC (rev 67397)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-proofsort 2023-06-18 16:46:20 UTC (rev 67398)
@@ -1,4 +1,5 @@
#!/usr/bin/env perl
+# $Id$
# Public domain. Originally written by Andreas Scherer, 2023.
use strict;
@@ -15,18 +16,18 @@
Getopt::Long::GetOptions(
'help|?' => \&help_handler,
'version' => sub { print version(); exit 0; }
-); # Getopt::Long::Getoptions()
+) || die "$0: try --help if you need it.\n";
## help_handler()
sub help_handler {
open(my $pipe, '|-', $ENV{PAGER} || 'less -e') or exit 1;
pod2usage(-message => version(), -output => $pipe,
- -verbose => 99, -sections => "COPYRIGHT|SHORT DESCRIPTION|EXAMPLE");
+ -verbose => 99, -sections => "SHORT DESCRIPTION|EXAMPLE|COPYRIGHT");
close $pipe;
exit 0;
}
## version()
sub version {
- return "This is $progname (2023).\n";
+ return "$progname $Revision$ $Date$\n";
}
my $tex = $ARGV[0];
@@ -68,12 +69,8 @@
=head1 NAME
-ctwill-proofsort — Sort mini-indexes alphabetically
+ctwill-proofsort - Sort mini-indexes alphabetically
-=head1 COPYRIGHT
-
-Public domain. Originally written by Andreas Scherer, 2023.
-
=head1 SHORT DESCRIPTION
This small Perl script 'ctwill-proofsort' sorts the mini-indexes for each
@@ -112,4 +109,10 @@
=back
+=head1 COPYRIGHT
+
+Public domain. Originally written by Andreas Scherer, 2023.
+
+Contemporary development on https://github.com/ascherer/cwebbin.
+
=cut
Property changes on: trunk/Build/source/texk/web2c/cwebdir/ctwill-proofsort
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill.test
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill.test 2023-06-17 23:50:35 UTC (rev 67397)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill.test 2023-06-18 16:46:20 UTC (rev 67398)
@@ -7,7 +7,7 @@
# (1) Test the "classic" CTWILL procedure
#
TEXMFCNF=$srcdir/../kpathsea \
- CWEBINPUTS=$srcdir/cwebdir ctie -m ctwill.w \
+ CWEBINPUTS=$srcdir/cwebdir ./ctie -m ctwill.w \
cweave.w ctwill-w2c.ch ctwill-mini.ch || exit 1
# Prime the pump by running CTWILL twice
@@ -17,10 +17,12 @@
TEXMFCNF=$srcdir/../kpathsea \
CWEBINPUTS=$srcdir/cwebdir: ./ctwill +lpdf ctwill.w || exit 1
-# Run TeX for the first time
-TEXMFCNF=$srcdir/../kpathsea \
- TEXINPUTS=$srcdir/cwebdir//: tex ctwill.tex || exit 1
+exit 0
+# (can't) run TeX for the first time
+#TEXMFCNF=$srcdir/../kpathsea \
+# TEXINPUTS=$srcdir/cwebdir//: tex ctwill.tex || exit 1
+
# Test CTWILL-REFSORT
TEXMFCNF=$srcdir/../kpathsea \
./ctwill-refsort < ctwill.ref > ctwill.sref || exit 1
@@ -33,7 +35,7 @@
# (2) Test the "proofing" CTWILL procedure
#
TEXMFCNF=$srcdir/../kpathsea \
- CWEBINPUTS=$srcdir/cwebdir ctie -m ctwill.w \
+ CWEBINPUTS=$srcdir/cwebdir ./ctie -m ctwill.w \
cweave.w ctwill-w2c.ch ctwill-mini.ch \
ctwill-hint.ch || exit 1
Property changes on: trunk/Build/source/texk/web2c/cwebdir/ctwill.test
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
More information about the tex-live-commits
mailing list.