From da81a040603bea4feafefcc1dacbc28b2a5c1da3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 16 Feb 2018 22:43:14 +0000 Subject: compile and test tex2aspc program git-svn-id: svn://tug.org/texlive/trunk@46654 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/autosp/ChangeLog | 9 ++++++++ Build/source/utils/autosp/Makefile.am | 14 +++++++---- Build/source/utils/autosp/Makefile.in | 27 ++++++++++++++++++---- Build/source/utils/autosp/autosp-src/tex2aspc.test | 13 ++++++++--- Build/source/utils/autosp/configure | 2 +- Build/source/utils/autosp/configure.ac | 4 ++-- 6 files changed, 54 insertions(+), 15 deletions(-) (limited to 'Build/source/utils') diff --git a/Build/source/utils/autosp/ChangeLog b/Build/source/utils/autosp/ChangeLog index 2f3fe48f642..1b65e633576 100644 --- a/Build/source/utils/autosp/ChangeLog +++ b/Build/source/utils/autosp/ChangeLog @@ -1,3 +1,12 @@ +2018-02-16 Karl Berry + + * Makefile.am (bin_PROGRAMS), + (tex2aspc_SOURCES), + (man1_MANS), + (TESTS), + (tex2aspc.log): add new program tex2aspc. + * configure.ac: copyright. + 2018-02-14 Akira Kakuto * Import autosp-2018-02-14 diff --git a/Build/source/utils/autosp/Makefile.am b/Build/source/utils/autosp/Makefile.am index f81903da849..27068b3a984 100644 --- a/Build/source/utils/autosp/Makefile.am +++ b/Build/source/utils/autosp/Makefile.am @@ -1,7 +1,7 @@ ## $Id$ ## Makefile.am for the TeX Live subdirectory utils/autosp/ ## -## Copyright 2016-2017 Karl Berry +## Copyright 2016-2018 Karl Berry ## You may freely use, modify and/or distribute this file. ## We want to re-distribute the whole original ps2eps source tree. @@ -16,22 +16,28 @@ AM_CFLAGS = $(WARNING_CFLAGS) # We intentionally omit the rebar program, since the name just seems to # be generic to end up in system bindirs, and it's said to just be a # convenience. People can get it from the Werner Icking Music Archive. -bin_PROGRAMS = autosp +bin_PROGRAMS = autosp tex2aspc # must use @... here or subdir $(... (literally) is created for .deps. autosp_SOURCES = \ @AUTOSP_TREE@/autosp.c \ @AUTOSP_TREE@/utils.c +tex2aspc_SOURCES = \ + @AUTOSP_TREE@/tex2aspc.c \ + @AUTOSP_TREE@/utils.c + man1_MANS = \ - $(AUTOSP_TREE)/autosp.1 + $(AUTOSP_TREE)/autosp.1 \ + $(AUTOSP_TREE)/tex2aspc.1 ## Tests AM_TESTS_ENVIRONMENT = AUTOSP_TREE=$(AUTOSP_TREE); export AUTOSP_TREE; # -TESTS = $(AUTOSP_TREE)/autosp.test +TESTS = $(AUTOSP_TREE)/autosp.test $(AUTOSP_TREE)/tex2aspc.test EXTRA_DIST += $(TESTS) autosp.log: autosp$(EXEEXT) +tex2aspc.log: tex2aspc$(EXEEXT) # ## autosp.test files EXTRA_DIST += $(AUTOSP_TREE)/tests diff --git a/Build/source/utils/autosp/Makefile.in b/Build/source/utils/autosp/Makefile.in index e99fc862293..1a057146104 100644 --- a/Build/source/utils/autosp/Makefile.in +++ b/Build/source/utils/autosp/Makefile.in @@ -86,7 +86,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -bin_PROGRAMS = autosp$(EXEEXT) +bin_PROGRAMS = autosp$(EXEEXT) tex2aspc$(EXEEXT) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -109,6 +109,10 @@ am_autosp_OBJECTS = @AUTOSP_TREE@/autosp.$(OBJEXT) \ @AUTOSP_TREE@/utils.$(OBJEXT) autosp_OBJECTS = $(am_autosp_OBJECTS) autosp_LDADD = $(LDADD) +am_tex2aspc_OBJECTS = @AUTOSP_TREE@/tex2aspc.$(OBJEXT) \ + @AUTOSP_TREE@/utils.$(OBJEXT) +tex2aspc_OBJECTS = $(am_tex2aspc_OBJECTS) +tex2aspc_LDADD = $(LDADD) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -137,8 +141,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(autosp_SOURCES) -DIST_SOURCES = $(autosp_SOURCES) +SOURCES = $(autosp_SOURCES) $(tex2aspc_SOURCES) +DIST_SOURCES = $(autosp_SOURCES) $(tex2aspc_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -503,12 +507,17 @@ autosp_SOURCES = \ @AUTOSP_TREE@/autosp.c \ @AUTOSP_TREE@/utils.c +tex2aspc_SOURCES = \ + @AUTOSP_TREE@/tex2aspc.c \ + @AUTOSP_TREE@/utils.c + man1_MANS = \ - $(AUTOSP_TREE)/autosp.1 + $(AUTOSP_TREE)/autosp.1 \ + $(AUTOSP_TREE)/tex2aspc.1 AM_TESTS_ENVIRONMENT = AUTOSP_TREE=$(AUTOSP_TREE); export AUTOSP_TREE; # -TESTS = $(AUTOSP_TREE)/autosp.test +TESTS = $(AUTOSP_TREE)/autosp.test $(AUTOSP_TREE)/tex2aspc.test all: all-am .SUFFIXES: @@ -603,6 +612,12 @@ clean-binPROGRAMS: autosp$(EXEEXT): $(autosp_OBJECTS) $(autosp_DEPENDENCIES) $(EXTRA_autosp_DEPENDENCIES) @rm -f autosp$(EXEEXT) $(AM_V_CCLD)$(LINK) $(autosp_OBJECTS) $(autosp_LDADD) $(LIBS) +@AUTOSP_TREE@/tex2aspc.$(OBJEXT): @AUTOSP_TREE@/$(am__dirstamp) \ + @AUTOSP_TREE@/$(DEPDIR)/$(am__dirstamp) + +tex2aspc$(EXEEXT): $(tex2aspc_OBJECTS) $(tex2aspc_DEPENDENCIES) $(EXTRA_tex2aspc_DEPENDENCIES) + @rm -f tex2aspc$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(tex2aspc_OBJECTS) $(tex2aspc_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -612,6 +627,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@@AUTOSP_TREE@/$(DEPDIR)/autosp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@@AUTOSP_TREE@/$(DEPDIR)/tex2aspc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@AUTOSP_TREE@/$(DEPDIR)/utils.Po@am__quote@ .c.o: @@ -1194,6 +1210,7 @@ uninstall-man: uninstall-man1 dist-hook: cd "$(distdir)" && rm -rf $(NEVER_DIST) autosp.log: autosp$(EXEEXT) +tex2aspc.log: tex2aspc$(EXEEXT) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/utils/autosp/autosp-src/tex2aspc.test b/Build/source/utils/autosp/autosp-src/tex2aspc.test index c176b6ebea8..a27c400c92d 100755 --- a/Build/source/utils/autosp/autosp-src/tex2aspc.test +++ b/Build/source/utils/autosp/autosp-src/tex2aspc.test @@ -1,8 +1,15 @@ #! /bin/sh -vx -# Copyright (C) 2015 Peter Breitenlohner +# Copyright 2018 Karl Berry # You may freely use, modify and/or distribute this file. +if test -z "$test_srcdir"; then + # If not set, then we are not running from `make check'. + test_srcdir=`echo "$0" | sed -e 's,/[^\\/]*$,,'` # == dirname $0 + test "$test_srcdir" = "$0" && test_srcdir=. # in case subst failed +fi +echo "test_srcdir=$test_srcdir" + echo && echo "*** tex2aspc --help" ./tex2aspc --help || exit 1 @@ -13,9 +20,9 @@ echo && echo "*** tex2aspc (missing infile)" ./tex2aspc && exit 1 echo && echo "*** tex2aspc quod2.tex quod4.aspc" -cp tests/quod2.aspc . +cp "$test_srcdir"/tests/quod2.aspc . rm -f quod4.aspc ./tex2aspc quod2.tex quod4.aspc || exit 1 echo && echo "*** diff quod4.aspc tests/quod4.aspc" -diff quod4.aspc tests/quod4.aspc || exit 1 +diff quod4.aspc "$test_srcdir"/tests/quod4.aspc || exit 1 diff --git a/Build/source/utils/autosp/configure b/Build/source/utils/autosp/configure index b251ef1d581..d4228a2b0af 100755 --- a/Build/source/utils/autosp/configure +++ b/Build/source/utils/autosp/configure @@ -5249,7 +5249,7 @@ _ACEOF fi done -# End of checks frmo autosp-src/configure.ac. +# End of checks from autosp-src/configure.ac. # trailing tl stuff. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 diff --git a/Build/source/utils/autosp/configure.ac b/Build/source/utils/autosp/configure.ac index 061e143bb19..0269ca94de4 100644 --- a/Build/source/utils/autosp/configure.ac +++ b/Build/source/utils/autosp/configure.ac @@ -1,7 +1,7 @@ dnl $Id$ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright 2016 Karl Berry +dnl Copyright 2016-2018 Karl Berry dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -30,7 +30,7 @@ AC_TYPE_SIZE_T # Checks for library functions. AC_CHECK_FUNCS([strstr]) -# End of checks frmo autosp-src/configure.ac. +# End of checks from autosp-src/configure.ac. # trailing tl stuff. AC_PROG_MAKE_SET -- cgit v1.2.3