summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-07-02 22:23:39 +0000
committerKarl Berry <karl@freefriends.org>2019-07-02 22:23:39 +0000
commit89abf23554206f6b86d2b4b4231fba84030f09ed (patch)
treeee4366c1aaf69427464aa390395d99520d1366e7
parent5ce41e71f319d3b3d553037992ef15813ac5aa9e (diff)
merge tlshell into texlive.infra, due to tltcl.tcl dependency
git-svn-id: svn://tug.org/texlive/trunk@51538 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/tlpsrc/collection-basic.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/texlive.infra.tlpsrc21
-rw-r--r--Master/tlpkg/tlpsrc/tlshell.tlpsrc6
3 files changed, 15 insertions, 13 deletions
diff --git a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
index a92e0902201..b831dd89d0d 100644
--- a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
@@ -45,7 +45,6 @@ depend texlive-docindex
depend texlive-en
depend texlive-msg-translations
depend texlive-scripts
-depend tlshell
depend unicode-data
depend updmap-map
depend xdvi
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index 7916622b40a..3cd2ce7d080 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -1,10 +1,12 @@
category TLCore
shortdesc basic TeX Live infrastructure
-longdesc This package contains the files needed to get the TeX Live
-longdesc tools (notably tlmgr) running: perl modules, xz binaries, plus
-longdesc (sometimes) tar and wget. These files also end up in the
-longdesc tlcritical recovery scripts. The standalone installer is
-longdesc close, but not the same; it's defined in 00texlive.installer.
+
+longdesc This package contains the files needed to get tlmgr running:
+longdesc perl modules, xz binaries, plus (sometimes) tar, wget, lz4, and
+longdesc various other support files. tlshell is also included. These
+longdesc files also end up in the tlcritical recovery scripts. The
+longdesc standalone installer is close, but not the same; it's defined
+longdesc in 00texlive.installer.
docpattern f README
docpattern f README*
@@ -15,6 +17,7 @@ docpattern f texmf-dist/doc/man/man1/tlmgr.*
docpattern f texmf-dist/scripts/texlive/NEWS
docpattern f tlpkg/README
docpattern f tlpkg/installer/COPYING.MinGW-runtime.txt
+docpattern d texmf-dist/doc/support/tlshell
# gui front end support.
runpattern f tlpkg/tltcl/*.tcl
@@ -36,7 +39,9 @@ runpattern d tlpkg/TeXLive
runpattern d tlpkg/gpg
binpattern f bin/${ARCH}/tlmgr
-#
+binpattern f bin/${ARCH}/tlshell
+# (We need to include tlshell here because it needs tltcl.tcl.)
+#
binpattern f/win32 bin/win32/runscript.*
binpattern f/win32 bin/win32/wrunscript.*
binpattern f/win32 tlpkg/installer/tar.exe
@@ -78,3 +83,7 @@ x86_64-linux,\
x86_64-linuxmusl,\
x86_64-solaris \
tlpkg/installer/lz4/lz4.${ARCH}
+
+# post-install/update actions
+postaction shortcut type=menu name="TeX Live Manager" \
+ cmd=TEXDIR/bin/win32/tlshell.exe
diff --git a/Master/tlpkg/tlpsrc/tlshell.tlpsrc b/Master/tlpkg/tlpsrc/tlshell.tlpsrc
deleted file mode 100644
index 2bcb5f0bbfb..00000000000
--- a/Master/tlpkg/tlpsrc/tlshell.tlpsrc
+++ /dev/null
@@ -1,6 +0,0 @@
-docpattern d texmf-dist/doc/support/tlshell
-binpattern f bin/${ARCH}/${PKGNAME}
-
-# post-install/update actions
-postaction shortcut type=menu name="TeX Live Manager" \
- cmd=TEXDIR/bin/win32/tlshell.exe