texlive[51538] Master/tlpkg/tlpsrc: merge tlshell into texlive.infra,

[commits+karl at tug.org]

Revision: 51538
          http://tug.org/svn/texlive?view=revision&revision=51538
Author:   karl
Date:     2019-07-03 00:23:39 +0200 (Wed, 03 Jul 2019)
Log Message:
-----------
merge tlshell into texlive.infra, due to tltcl.tcl dependency

Modified Paths:
--------------
    trunk/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
    trunk/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc

Removed Paths:
-------------
    trunk/Master/tlpkg/tlpsrc/tlshell.tlpsrc

Modified: trunk/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/collection-basic.tlpsrc	2019-07-02 21:03:56 UTC (rev 51537)
+++ trunk/Master/tlpkg/tlpsrc/collection-basic.tlpsrc	2019-07-02 22:23:39 UTC (rev 51538)
@@ -45,7 +45,6 @@
 depend texlive-en
 depend texlive-msg-translations
 depend texlive-scripts
-depend tlshell
 depend unicode-data
 depend updmap-map
 depend xdvi

Modified: trunk/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc	2019-07-02 21:03:56 UTC (rev 51537)
+++ trunk/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc	2019-07-02 22:23:39 UTC (rev 51538)
@@ -1,11 +1,13 @@
 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*
 docpattern d readme-html.dir
@@ -15,6 +17,7 @@
 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/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-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

Deleted: trunk/Master/tlpkg/tlpsrc/tlshell.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/tlshell.tlpsrc	2019-07-02 21:03:56 UTC (rev 51537)
+++ trunk/Master/tlpkg/tlpsrc/tlshell.tlpsrc	2019-07-02 22:23:39 UTC (rev 51538)
@@ -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