summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-01-26 00:09:58 +0000
committerKarl Berry <karl@freefriends.org>2013-01-26 00:09:58 +0000
commitdf5f4033104469544b8831195549c9b35055dad6 (patch)
tree29fb2f86d85e95808a8200989293671529f4de24
parent220642dbc88e804b285b1d77b7785de73213236b (diff)
omit shell tl_scripts from consistency check
git-svn-id: svn://tug.org/texlive/trunk@28947 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/texlive/linked_scripts/ChangeLog5
-rw-r--r--Build/source/texk/texlive/tl_scripts/Makefile.am7
-rw-r--r--Build/source/texk/texlive/tl_scripts/Makefile.in5
-rwxr-xr-xMaster/tlpkg/bin/check-wrapper-consistency4
4 files changed, 20 insertions, 1 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index c176467f705..b414ab7b364 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-26 Karl Berry <karl@tug.org>
+
+ * Makefile.am (echo-shell-scripts): new target, for
+ check-wrapper-consistency.
+
2013-01-24 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am [WIN32]: Install {rungs,tlmgr}.exe wrappers.
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am
index fe3a45b6cd3..9059e372525 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.am
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.am
@@ -127,3 +127,10 @@ if !WIN32
PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
endif !WIN32
+
+##
+## This target is invoked by check-wrapper-consistency (run from cron).
+.PHONY: echo-shell-scripts
+all_shell_scripts = $(shell_scripts) $(sh_scripts)
+echo-shell-scripts:
+ @echo $(all_shell_scripts)
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in
index 445da26a99b..0752421c34a 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.in
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.in
@@ -288,6 +288,7 @@ run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
-f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
-e "$(EXEEXT)" $(DESTDIR)$(bindir)
+all_shell_scripts = $(shell_scripts) $(sh_scripts)
all: all-am
.SUFFIXES:
@@ -824,6 +825,10 @@ xupdmap.1: updmap.help2man updmap.pl
run-texlinks:
@WIN32_FALSE@ PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
+.PHONY: echo-shell-scripts
+echo-shell-scripts:
+ @echo $(all_shell_scripts)
+
# 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.
.NOEXPORT:
diff --git a/Master/tlpkg/bin/check-wrapper-consistency b/Master/tlpkg/bin/check-wrapper-consistency
index 49ff4c9d122..aaa23ac0892 100755
--- a/Master/tlpkg/bin/check-wrapper-consistency
+++ b/Master/tlpkg/bin/check-wrapper-consistency
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# $Id$
-# Copyright 2008, 2009, 2010, 2011 TeX Users Group.
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013 TeX Users Group.
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -128,10 +128,12 @@ sub list_shell_scripts {
# has to be the Work/ directory to get the Makefile, not Makefile.{in,am}.
my $Work = "$Master/../Build/source/Work";
my $Work_linked_scripts = "$Work/texk/texlive/linked_scripts";
+ my $Work_tl_scripts = "$Work/texk/texlive/tl_scripts";
# use make; ensure we get only the last line, although that should be
# all there is.
my $lst = `make -s -C $Work_linked_scripts echo-shell-scripts | tail -1`;
+ $lst .= `make -s -C $Work_tl_scripts echo-shell-scripts | tail -1`;
for my $script (split (" ", $lst)) {
$script =~ s,^.*/,,;