texlive[46654] Build/source/utils/autosp: compile and test tex2aspc
commits+karl at tug.org
commits+karl at tug.org
Fri Feb 16 23:43:15 CET 2018
Revision: 46654
http://tug.org/svn/texlive?view=revision&revision=46654
Author: karl
Date: 2018-02-16 23:43:14 +0100 (Fri, 16 Feb 2018)
Log Message:
-----------
compile and test tex2aspc program
Modified Paths:
--------------
trunk/Build/source/utils/autosp/ChangeLog
trunk/Build/source/utils/autosp/Makefile.am
trunk/Build/source/utils/autosp/Makefile.in
trunk/Build/source/utils/autosp/autosp-src/tex2aspc.test
trunk/Build/source/utils/autosp/configure
trunk/Build/source/utils/autosp/configure.ac
Modified: trunk/Build/source/utils/autosp/ChangeLog
===================================================================
--- trunk/Build/source/utils/autosp/ChangeLog 2018-02-16 22:30:09 UTC (rev 46653)
+++ trunk/Build/source/utils/autosp/ChangeLog 2018-02-16 22:43:14 UTC (rev 46654)
@@ -1,3 +1,12 @@
+2018-02-16 Karl Berry <karl at freefriends.org>
+
+ * Makefile.am (bin_PROGRAMS),
+ (tex2aspc_SOURCES),
+ (man1_MANS),
+ (TESTS),
+ (tex2aspc.log): add new program tex2aspc.
+ * configure.ac: copyright.
+
2018-02-14 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
* Import autosp-2018-02-14
Modified: trunk/Build/source/utils/autosp/Makefile.am
===================================================================
--- trunk/Build/source/utils/autosp/Makefile.am 2018-02-16 22:30:09 UTC (rev 46653)
+++ trunk/Build/source/utils/autosp/Makefile.am 2018-02-16 22:43:14 UTC (rev 46654)
@@ -1,7 +1,7 @@
## $Id$
## Makefile.am for the TeX Live subdirectory utils/autosp/
##
-## Copyright 2016-2017 Karl Berry <tex-live at tug.org>
+## Copyright 2016-2018 Karl Berry <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
## We want to re-distribute the whole original ps2eps source tree.
@@ -16,7 +16,7 @@
# 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 = \
@@ -23,15 +23,21 @@
@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
Modified: trunk/Build/source/utils/autosp/Makefile.in
===================================================================
--- trunk/Build/source/utils/autosp/Makefile.in 2018-02-16 22:30:09 UTC (rev 46653)
+++ trunk/Build/source/utils/autosp/Makefile.in 2018-02-16 22:43:14 UTC (rev 46654)
@@ -86,7 +86,7 @@
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 @@
@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_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
am__v_P_0 = false
@@ -137,8 +141,8 @@
am__v_CCLD_ = $(am__v_CCLD_ at 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_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,7 +612,13 @@
autosp$(EXEEXT): $(autosp_OBJECTS) $(autosp_DEPENDENCIES) $(EXTRA_autosp_DEPENDENCIES)
@rm -f autosp$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(autosp_OBJECTS) $(autosp_LDADD) $(LIBS)
+ at 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)
-rm -f @AUTOSP_TREE@/*.$(OBJEXT)
@@ -612,6 +627,7 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@@AUTOSP_TREE@/$(DEPDIR)/autosp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote@@AUTOSP_TREE@/$(DEPDIR)/tex2aspc.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@AUTOSP_TREE@/$(DEPDIR)/utils.Po at am__quote@
.c.o:
@@ -1194,6 +1210,7 @@
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.
Modified: trunk/Build/source/utils/autosp/autosp-src/tex2aspc.test
===================================================================
--- trunk/Build/source/utils/autosp/autosp-src/tex2aspc.test 2018-02-16 22:30:09 UTC (rev 46653)
+++ trunk/Build/source/utils/autosp/autosp-src/tex2aspc.test 2018-02-16 22:43:14 UTC (rev 46654)
@@ -1,8 +1,15 @@
#! /bin/sh -vx
-# Copyright (C) 2015 Peter Breitenlohner <tex-live at tug.org>
+# Copyright 2018 Karl Berry <tex-live at tug.org>
# 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 @@
./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
Modified: trunk/Build/source/utils/autosp/configure
===================================================================
(Binary files differ)
Modified: trunk/Build/source/utils/autosp/configure.ac
===================================================================
--- trunk/Build/source/utils/autosp/configure.ac 2018-02-16 22:30:09 UTC (rev 46653)
+++ trunk/Build/source/utils/autosp/configure.ac 2018-02-16 22:43:14 UTC (rev 46654)
@@ -1,7 +1,7 @@
dnl $Id$
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright 2016 Karl Berry <tex-live at tug.org>
+dnl Copyright 2016-2018 Karl Berry <tex-live at tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -30,7 +30,7 @@
# 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
More information about the tex-live-commits
mailing list