From 58245ecee5f60cbe83dcf04b453de1151a9e2ffa Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 14 Jul 2009 00:56:34 +0000
Subject: move tl-portable to texlive.infra, only install tlmgr-gui.vbs and
 tl-w32-wrapper.texlua on w32, and sort pattern list

git-svn-id: svn://tug.org/texlive/trunk@14251 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/tlpkg/tlpsrc/00texlive.image.tlpsrc |  1 -
 Master/tlpkg/tlpsrc/texlive.infra.tlpsrc   | 49 ++++++++++++++----------------
 2 files changed, 23 insertions(+), 27 deletions(-)

(limited to 'Master')

diff --git a/Master/tlpkg/tlpsrc/00texlive.image.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.image.tlpsrc
index 894751df6b3..65dd1c00383 100644
--- a/Master/tlpkg/tlpsrc/00texlive.image.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.image.tlpsrc
@@ -14,4 +14,3 @@ runpattern f texmf/README
 runpattern f texmf/doc/man/Makefile
 runpattern f texmf/doc/man/man1/Makefile
 runpattern f texmf/doc/man/man5/Makefile
-runpattern f tl-portable*
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index 023010cb80b..65d3137aca3 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -1,30 +1,34 @@
 category TLCore
 shortdesc basic TeX Live infrastructure
 longdesc This package contains the files needed to get the TeX Live
-longdesc tools (notably tlmgr) running. That comprises the perl modules,
-longdesc documentation, and the xz binaries, plus tar and wget, sometimes.
-longdesc These files end up in the install packages.
+longdesc tools (notably tlmgr) running: perl modules, xz binaries, plus
+longdesc (sometimes) tar and wget.  These files end up in the install
+longdesc packages.
 #
-# Until TL'09, reduce installed doc to just this file (which was present
-# on the TL'08 DVD), because the tlmgr on the DVD failed to update the
-# .doc container for texlive.infra (it excludes packages whose names
-# contain a literal .), and it's not easy to recover.  This leaves the
-# tlpkg/doc directory (which was also on the DVD) in the installed tree,
-# but it is harmless to have it there; no errors are provoked, we hope.
-# tlmgr check will report it, but that's ok.
 docpattern f tlpkg/README
+docpattern f texmf/doc/man/man1/tlmgr.*
 #
 runpattern d readme-html.dir
 runpattern d readme-txt.dir
+runpattern d texmf/scripts/texlive/tlmgrgui
 runpattern d tlpkg/TeXLive
-runpattern f tlpkg/installer/config.guess
 runpattern f LICENSE*
 runpattern f README
 runpattern f README*
 runpattern f doc.html
 runpattern f index.html
 runpattern f release-texlive.txt
+runpattern f texmf/scripts/texlive/tlmgr.pl
+runpattern f texmf/scripts/texlive/uninstall-win32.pl
+runpattern f texmf/web2c/fmtutil-hdr.cnf
+runpattern f texmf/web2c/updmap-hdr.cfg
+runpattern f tl-portable*
+runpattern f tlpkg/installer/config.guess
 #
+binpattern f bin/${ARCH}/tlmgr
+binpattern f/win32 bin/win32/tl-w32-wrapper.texlua
+binpattern f/win32 bin/win32/tlmgr-gui.vbs
+binpattern f/win32 texmf/scripts/texlive/updater-w32.bat
 binpattern f/win32 tlpkg/installer/tar.exe
 binpattern f/win32 tlpkg/installer/xz/xzdec.exe
 binpattern f/win32 tlpkg/installer/xz/xz.exe
@@ -37,18 +41,11 @@ binpattern f/!i386-cygwin tlpkg/installer/xz/xz.${ARCH}
 binpattern f/!i386-cygwin,i386-solaris,i386-linux,mips-irix,sparc-linux,\
 alpha-linux,powerpc-linux,i386-freebsd,x86_64-linux \
   tlpkg/installer/wget/wget.${ARCH}
-# former tlmgr stuff
-runpattern f texmf/web2c/fmtutil-hdr.cnf
-runpattern d texmf/scripts/texlive/tlmgrgui
-runpattern f texmf/scripts/texlive/tlmgr.pl
-runpattern f texmf/scripts/texlive/uninstall-win32.pl
-runpattern f texmf/web2c/updmap-hdr.cfg
-docpattern f texmf/doc/man/man1/tlmgr.*
-binpattern f bin/${ARCH}/tlmgr
-binpattern f bin/win32/tl-w32-wrapper.texlua
-binpattern f bin/win32/tlmgr-gui.vbs
-binpattern f/win32 texmf/scripts/texlive/updater-w32.bat
-# post actions
-postaction shortcut type=menu name="TeX Live Toplevel Readme Index" cmd=TEXDIR/index.html
-postaction shortcut type=menu name="TeX Live Manager" cmd=TEXDIR/bin/win32/tlmgr-gui.vbs hide=1
-postaction shortcut type=menu name="Release notes" cmd="http://tug.org/texlive/windows.html"
+#
+# post-install/update actions
+postaction shortcut type=menu name="TeX Live top-level readme" \
+             cmd=TEXDIR/index.html 
+postaction shortcut type=menu name="TeX Live Manager" \
+             cmd=TEXDIR/bin/win32/tlmgr-gui.vbs hide=1 
+postaction shortcut type=menu name="Release notes" \
+             cmd="http://tug.org/texlive/windows.html"
-- 
cgit v1.2.3