summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-04-24 17:19:43 +0000
committerKarl Berry <karl@freefriends.org>2011-04-24 17:19:43 +0000
commitfa2b85588b5e0a17d13197bd45f54d80d302617b (patch)
tree985d2e1874a2e2a8c71abf0789c9499befc9fb61 /Master
parent62a3e65e9d0e9af3a1e4a7f9c71b68f12c638aae (diff)
use musixtex lua scripts in bindirs
git-svn-id: svn://tug.org/texlive/trunk@22187 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
l---------[-rwxr-xr-x]Master/bin/alpha-linux/musixflxbin23208 -> 46 bytes
l---------Master/bin/alpha-linux/musixtex1
l---------[-rwxr-xr-x]Master/bin/amd64-freebsd/musixflxbin16896 -> 46 bytes
l---------Master/bin/amd64-freebsd/musixtex1
l---------[-rwxr-xr-x]Master/bin/amd64-kfreebsd/musixflxbin17128 -> 46 bytes
l---------Master/bin/amd64-kfreebsd/musixtex1
l---------Master/bin/i386-cygwin/musixflx1
-rwxr-xr-xMaster/bin/i386-cygwin/musixflx.exebin17934 -> 0 bytes
l---------Master/bin/i386-cygwin/musixtex1
l---------[-rwxr-xr-x]Master/bin/i386-freebsd/musixflxbin14620 -> 46 bytes
l---------Master/bin/i386-freebsd/musixtex1
l---------[-rwxr-xr-x]Master/bin/i386-kfreebsd/musixflxbin14700 -> 46 bytes
l---------Master/bin/i386-kfreebsd/musixtex1
l---------[-rwxr-xr-x]Master/bin/i386-linux/musixflxbin14576 -> 46 bytes
l---------Master/bin/i386-linux/musixtex1
l---------[-rwxr-xr-x]Master/bin/i386-netbsd/musixflxbin15048 -> 46 bytes
l---------Master/bin/i386-netbsd/musixtex1
l---------[-rwxr-xr-x]Master/bin/i386-solaris/musixflxbin18804 -> 46 bytes
l---------Master/bin/i386-solaris/musixtex1
l---------[-rwxr-xr-x]Master/bin/mips-irix/musixflxbin22280 -> 46 bytes
l---------Master/bin/mips-irix/musixtex1
l---------[-rwxr-xr-x]Master/bin/powerpc-aix/musixflxbin14046 -> 46 bytes
l---------Master/bin/powerpc-aix/musixtex1
l---------[-rwxr-xr-x]Master/bin/powerpc-linux/musixflxbin16776 -> 46 bytes
l---------Master/bin/powerpc-linux/musixtex1
l---------[-rwxr-xr-x]Master/bin/sparc-linux/musixflxbin26448 -> 46 bytes
l---------Master/bin/sparc-linux/musixtex1
l---------[-rwxr-xr-x]Master/bin/sparc-solaris/musixflxbin21924 -> 46 bytes
l---------Master/bin/sparc-solaris/musixtex1
l---------[-rwxr-xr-x]Master/bin/universal-darwin/musixflxbin55276 -> 46 bytes
l---------Master/bin/universal-darwin/musixtex1
-rwxr-xr-xMaster/bin/win32/musixflx.exebin13312 -> 1536 bytes
-rwxr-xr-xMaster/bin/win32/musixtex.exebin0 -> 1536 bytes
l---------[-rwxr-xr-x]Master/bin/x86_64-darwin/musixflxbin21440 -> 46 bytes
l---------Master/bin/x86_64-darwin/musixtex1
l---------[-rwxr-xr-x]Master/bin/x86_64-linux/musixflxbin16424 -> 46 bytes
l---------Master/bin/x86_64-linux/musixtex1
l---------[-rwxr-xr-x]Master/bin/x86_64-solaris/musixflxbin21424 -> 46 bytes
l---------Master/bin/x86_64-solaris/musixtex1
-rw-r--r--Master/texmf/doc/man/man1/musixflx.118
-rw-r--r--Master/texmf/doc/man/man1/musixflx.man1.pdfbin4128 -> 4150 bytes
-rw-r--r--Master/texmf/doc/man/man1/musixtex.144
-rw-r--r--Master/texmf/doc/man/man1/musixtex.man1.pdfbin0 -> 3903 bytes
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds53
-rw-r--r--Master/tlpkg/tlpsrc/collection-music.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/musixflx.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/musixtex.tlpsrc3
47 files changed, 112 insertions, 29 deletions
diff --git a/Master/bin/alpha-linux/musixflx b/Master/bin/alpha-linux/musixflx
index 8423f4f3122..bbbbff02c42 100755..120000
--- a/Master/bin/alpha-linux/musixflx
+++ b/Master/bin/alpha-linux/musixflx
Binary files differ
diff --git a/Master/bin/alpha-linux/musixtex b/Master/bin/alpha-linux/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/alpha-linux/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/musixflx b/Master/bin/amd64-freebsd/musixflx
index 9ae9aeba428..bbbbff02c42 100755..120000
--- a/Master/bin/amd64-freebsd/musixflx
+++ b/Master/bin/amd64-freebsd/musixflx
Binary files differ
diff --git a/Master/bin/amd64-freebsd/musixtex b/Master/bin/amd64-freebsd/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/amd64-freebsd/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/amd64-kfreebsd/musixflx b/Master/bin/amd64-kfreebsd/musixflx
index b65754d939e..bbbbff02c42 100755..120000
--- a/Master/bin/amd64-kfreebsd/musixflx
+++ b/Master/bin/amd64-kfreebsd/musixflx
Binary files differ
diff --git a/Master/bin/amd64-kfreebsd/musixtex b/Master/bin/amd64-kfreebsd/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/amd64-kfreebsd/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/musixflx b/Master/bin/i386-cygwin/musixflx
new file mode 120000
index 00000000000..bbbbff02c42
--- /dev/null
+++ b/Master/bin/i386-cygwin/musixflx
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixflx.lua \ No newline at end of file
diff --git a/Master/bin/i386-cygwin/musixflx.exe b/Master/bin/i386-cygwin/musixflx.exe
deleted file mode 100755
index c5db0d60ce7..00000000000
--- a/Master/bin/i386-cygwin/musixflx.exe
+++ /dev/null
Binary files differ
diff --git a/Master/bin/i386-cygwin/musixtex b/Master/bin/i386-cygwin/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/i386-cygwin/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/i386-freebsd/musixflx b/Master/bin/i386-freebsd/musixflx
index 39514b6e4d0..bbbbff02c42 100755..120000
--- a/Master/bin/i386-freebsd/musixflx
+++ b/Master/bin/i386-freebsd/musixflx
Binary files differ
diff --git a/Master/bin/i386-freebsd/musixtex b/Master/bin/i386-freebsd/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/i386-freebsd/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/i386-kfreebsd/musixflx b/Master/bin/i386-kfreebsd/musixflx
index ef24416f094..bbbbff02c42 100755..120000
--- a/Master/bin/i386-kfreebsd/musixflx
+++ b/Master/bin/i386-kfreebsd/musixflx
Binary files differ
diff --git a/Master/bin/i386-kfreebsd/musixtex b/Master/bin/i386-kfreebsd/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/i386-kfreebsd/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/i386-linux/musixflx b/Master/bin/i386-linux/musixflx
index 564e87e6e77..bbbbff02c42 100755..120000
--- a/Master/bin/i386-linux/musixflx
+++ b/Master/bin/i386-linux/musixflx
Binary files differ
diff --git a/Master/bin/i386-linux/musixtex b/Master/bin/i386-linux/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/i386-linux/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/musixflx b/Master/bin/i386-netbsd/musixflx
index c91f5b86b50..bbbbff02c42 100755..120000
--- a/Master/bin/i386-netbsd/musixflx
+++ b/Master/bin/i386-netbsd/musixflx
Binary files differ
diff --git a/Master/bin/i386-netbsd/musixtex b/Master/bin/i386-netbsd/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/i386-netbsd/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/i386-solaris/musixflx b/Master/bin/i386-solaris/musixflx
index 3f4878e6d54..bbbbff02c42 100755..120000
--- a/Master/bin/i386-solaris/musixflx
+++ b/Master/bin/i386-solaris/musixflx
Binary files differ
diff --git a/Master/bin/i386-solaris/musixtex b/Master/bin/i386-solaris/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/i386-solaris/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/mips-irix/musixflx b/Master/bin/mips-irix/musixflx
index 43285d24e08..bbbbff02c42 100755..120000
--- a/Master/bin/mips-irix/musixflx
+++ b/Master/bin/mips-irix/musixflx
Binary files differ
diff --git a/Master/bin/mips-irix/musixtex b/Master/bin/mips-irix/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/mips-irix/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/powerpc-aix/musixflx b/Master/bin/powerpc-aix/musixflx
index 62b044a519a..bbbbff02c42 100755..120000
--- a/Master/bin/powerpc-aix/musixflx
+++ b/Master/bin/powerpc-aix/musixflx
Binary files differ
diff --git a/Master/bin/powerpc-aix/musixtex b/Master/bin/powerpc-aix/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/powerpc-aix/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/powerpc-linux/musixflx b/Master/bin/powerpc-linux/musixflx
index 20a57f08f9a..bbbbff02c42 100755..120000
--- a/Master/bin/powerpc-linux/musixflx
+++ b/Master/bin/powerpc-linux/musixflx
Binary files differ
diff --git a/Master/bin/powerpc-linux/musixtex b/Master/bin/powerpc-linux/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/powerpc-linux/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/sparc-linux/musixflx b/Master/bin/sparc-linux/musixflx
index 8c240efc8ea..bbbbff02c42 100755..120000
--- a/Master/bin/sparc-linux/musixflx
+++ b/Master/bin/sparc-linux/musixflx
Binary files differ
diff --git a/Master/bin/sparc-linux/musixtex b/Master/bin/sparc-linux/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/sparc-linux/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/sparc-solaris/musixflx b/Master/bin/sparc-solaris/musixflx
index 2ba8ed4cd97..bbbbff02c42 100755..120000
--- a/Master/bin/sparc-solaris/musixflx
+++ b/Master/bin/sparc-solaris/musixflx
Binary files differ
diff --git a/Master/bin/sparc-solaris/musixtex b/Master/bin/sparc-solaris/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/sparc-solaris/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/universal-darwin/musixflx b/Master/bin/universal-darwin/musixflx
index a4ea62bb7fc..bbbbff02c42 100755..120000
--- a/Master/bin/universal-darwin/musixflx
+++ b/Master/bin/universal-darwin/musixflx
Binary files differ
diff --git a/Master/bin/universal-darwin/musixtex b/Master/bin/universal-darwin/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/universal-darwin/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/win32/musixflx.exe b/Master/bin/win32/musixflx.exe
index 075066dadd3..5777d90a17a 100755
--- a/Master/bin/win32/musixflx.exe
+++ b/Master/bin/win32/musixflx.exe
Binary files differ
diff --git a/Master/bin/win32/musixtex.exe b/Master/bin/win32/musixtex.exe
new file mode 100755
index 00000000000..5777d90a17a
--- /dev/null
+++ b/Master/bin/win32/musixtex.exe
Binary files differ
diff --git a/Master/bin/x86_64-darwin/musixflx b/Master/bin/x86_64-darwin/musixflx
index d5c5b513489..bbbbff02c42 100755..120000
--- a/Master/bin/x86_64-darwin/musixflx
+++ b/Master/bin/x86_64-darwin/musixflx
Binary files differ
diff --git a/Master/bin/x86_64-darwin/musixtex b/Master/bin/x86_64-darwin/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/x86_64-darwin/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/x86_64-linux/musixflx b/Master/bin/x86_64-linux/musixflx
index a1efa98889d..bbbbff02c42 100755..120000
--- a/Master/bin/x86_64-linux/musixflx
+++ b/Master/bin/x86_64-linux/musixflx
Binary files differ
diff --git a/Master/bin/x86_64-linux/musixtex b/Master/bin/x86_64-linux/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/x86_64-linux/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/musixflx b/Master/bin/x86_64-solaris/musixflx
index c3e43581e9c..bbbbff02c42 100755..120000
--- a/Master/bin/x86_64-solaris/musixflx
+++ b/Master/bin/x86_64-solaris/musixflx
Binary files differ
diff --git a/Master/bin/x86_64-solaris/musixtex b/Master/bin/x86_64-solaris/musixtex
new file mode 120000
index 00000000000..412fde3c932
--- /dev/null
+++ b/Master/bin/x86_64-solaris/musixtex
@@ -0,0 +1 @@
+../../texmf-dist/scripts/musixtex/musixtex.lua \ No newline at end of file
diff --git a/Master/texmf/doc/man/man1/musixflx.1 b/Master/texmf/doc/man/man1/musixflx.1
index b94345f73c9..33548ef4b88 100644
--- a/Master/texmf/doc/man/man1/musixflx.1
+++ b/Master/texmf/doc/man/man1/musixflx.1
@@ -1,11 +1,12 @@
.\" This manpage is licensed under the GNU Public License
-.TH MUSIXFLX 1 2010-10-19 "musixflx-0.83.2" ""
+.TH MUSIXFLX 1 2011-04-21 "musixflx-0.83.3lua7" ""
.SH NAME
musixflx \- process mx1 files (the second pass of 3-pass MusiXTeX typesetting)
.SH SYNOPSIS
-.B musixflx
+.RI [ texlua ]
+.B musixflx.lua
.IR jobname [ .mx1 " | " .tex ]
[
.I debugmode
@@ -15,17 +16,18 @@ where
.I debugmode
can be
.br
- d for debug information to the screen
+ d output debugging information to the screen
.br
- m for line numbers to the screen
+ m output line numbers to the screen
.br
- f for debug information to a log file jobname.mxl (not .mx1)
+ f output debugging information to jobname.mxl (not mx1)
.br
- s to get the computed lines immediately on the screen
+ s output computed lines to the screen
-To allow for ease of use with a batch file, \fB musixflx\fR
+To allow for ease of use with a batch file, \fB musixflx.lua\fR
can be fed with either \fI jobname.mx1\fP, \fI jobname.tex\fP,
-or just \fI jobname\fP, any of which open \fI jobname.mx1\fP.
+or just \fI jobname\fP, any of which open \fI jobname.mx1\fP
+and create \fI jobname.mx2\fP.
.SH SEE ALSO
.BR musixtex (1)
diff --git a/Master/texmf/doc/man/man1/musixflx.man1.pdf b/Master/texmf/doc/man/man1/musixflx.man1.pdf
index 2159e068c9a..afa37b993b3 100644
--- a/Master/texmf/doc/man/man1/musixflx.man1.pdf
+++ b/Master/texmf/doc/man/man1/musixflx.man1.pdf
Binary files differ
diff --git a/Master/texmf/doc/man/man1/musixtex.1 b/Master/texmf/doc/man/man1/musixtex.1
new file mode 100644
index 00000000000..e7902ab7594
--- /dev/null
+++ b/Master/texmf/doc/man/man1/musixtex.1
@@ -0,0 +1,44 @@
+.\" This manpage is licensed under the GNU Public License
+.TH MUSIXTEX 1 2011-04-21 "musixtex version 0.2" ""
+
+.SH NAME
+musixtex \- processes a MusiXTeX file using [pdf]etex -> musixflx -> [pdf]etex [ -> dvips -> ps2pdf ] and
+then deletes intermediate files
+
+.SH SYNOPSIS
+[
+.IR texlua
+]
+.BR musixtex.lua
+[
+.IR options
+]
+.IR jobname
+[ .tex ]
+
+.SH OPTIONS
+.TP 8
+.BR -v
+output program name and version number, and quit
+.TP
+.BR -h
+output usage summary and quit
+.TP
+.BR -p
+changes the TeX processor from
+.BR etex (1)
+to
+.BR pdfetex (1)
+(and doesn't run dvips and ps2pdf)
+
+.SH SEE ALSO
+.BR etex (1),
+.BR pdfetex (1),
+.BR musixflx (1),
+.BR dvips (1),
+.BR ps2pdf (1).
+.br
+musixdoc.pdf
+
+.SH AUTHOR
+This manual page was written by Bob Tennent <rdt@cs.queensu.ca>.
diff --git a/Master/texmf/doc/man/man1/musixtex.man1.pdf b/Master/texmf/doc/man/man1/musixtex.man1.pdf
new file mode 100644
index 00000000000..57cdaf926c3
--- /dev/null
+++ b/Master/texmf/doc/man/man1/musixtex.man1.pdf
Binary files differ
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 2678c331e5f..79c6840ff8f 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -892,6 +892,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'latex2e-help-texinfo' => '&POSTlatex2ehelptexinfo',
'lithuanian' => '&POSTlithuanian',
'montex' => '&POSTmontex',
+ 'musixtex' => '&POSTmusixtex',
'pgf' => '&POSTpgf',
'prerex' => '&POSTprerex',
'pst-cox' => '&POSTpstcox',
@@ -1886,7 +1887,8 @@ $standardxmt='\.xmt';
# code to install under texmf*/.../scripts.
# if they should end up in $bindir too,
-# add to Build/source/texk/texlive/Makefile.in (and ChangeLog).
+# add to Build/source/texk/texlive/Makefile.in (and ChangeLog),
+# which the doscripts function does.
%specialscripts = (
'a2ping' => '\.pl$',
'accfonts' => 'mkt1font|vpl2',
@@ -1912,6 +1914,7 @@ $standardxmt='\.xmt';
'mathspic' => '^mathspic\.pl$',
'mkgrkindex' => 'mkgrkindex$',
'mkjobtexmf' => '\.pl$',
+ 'musixtex' => '\.lua$',
'pdfcrop' => '\.pl$',
'pdfjam' => 'pdf[^.]*$',
'perltex' => '\.pl$',
@@ -2046,7 +2049,7 @@ for (@ARGV) {
$package = pop (@x);
my $COOKED_PKG = "$COOKED_TOP/$package"; # output directory
- if ($package =~ /^(biber|bibexport|texdef|latexmk)$/) { # later anything with scripts
+ if ($specialscripts{$package}) {
$BUILDDEST = "$COOKED_PKG/Build/source";
$TOPDEST = "$COOKED_PKG/Master";
} else {
@@ -2137,7 +2140,7 @@ sub set_dir_defaults
sub xchdir {
my ($dir) = @_;
chdir ($dir) || die "chdir($dir) failed: $!";
- chomp (my $pwd = `pwd`);
+ my $pwd = getcwd ();
print "\t CHDIR $dir (now $pwd)\n";
}
@@ -2292,16 +2295,22 @@ sub setup
sub donormal {
my ($ctrl) = @_;
- print "doing donormal($ctrl)...\n";
+ print "doing donormal($ctrl) with DEST=$DEST\n";
# check for tds-ready packages
- if ( -e "$RAW_DIR/$packagedir/TDS_READY" ) {
+ if (-e "$RAW_DIR/$packagedir/TDS_READY") {
print "using TDS_READY tree\n";
&SYSTEM ("$RM $RAW_DIR/$packagedir/TDS_READY");
&SYSTEM ("mkdir -p $DEST");
&xchdir ($DEST);
&SYSTEM ("$CP -r $RAW_DIR/$packagedir/* .");
+ my $scriptdir = "$DEST/scripts/$package";
+ if (-d $scriptdir) {
+ &xchdir ($scriptdir);
+ &doscripts;
+ }
+
my @docdirs = glob ("doc/*/*/");
if ($moreclean{$package} && @docdirs) {
&xchdir ($docdirs[0]);
@@ -2523,10 +2532,13 @@ sub doscripts {
my $scriptpatt = $specialscripts{$package};
return unless $scriptpatt;
- &install ("$DEST/scripts/$package", $scriptpatt);
- &SYSTEM ("chmod a+x $DEST/scripts/$package/*");
+ my $pwd = getcwd();
+ if ($pwd ne "$DEST/scripts/$package") {
+ # in the .tds.zip case, we will already be in the scripts dir.
+ &install ("$DEST/scripts/$package", $scriptpatt);
+ &SYSTEM ("chmod a+x $DEST/scripts/$package/*");
+ }
- return unless $package =~ /^(bibexport|texdef|latexmk)$/; # xx testing for now
# update the copy in Build, too.
my $build_tldir = "texk/texlive";
my $build_scriptsdir = "$build_tldir/linked_scripts";
@@ -2615,7 +2627,7 @@ sub domans {
sub tl_man_to_pdf {
my $Master_man = "$Master/texmf/doc/man";
my $pkg_man = "$TOPDEST/texmf/doc/man";
- print "tl_man_to_pdf for " . join (" ", <$pkg_man/man1/*>) . "\n";
+ print "tl_man_to_pdf for: " . join (" ", <$pkg_man/man1/*>) . "\n";
&SYSTEM ("cd $Master_man && $CP --parents Makefile man1/Makefile $pkg_man/");
@@ -2719,8 +2731,7 @@ sub runjob
# glob function, seemed too ugly. And removing the file in a posthook
# would have meant a separate fn for README.TEXLIVE, also ugly.)
#
-sub killfiles
-{
+sub killfiles {
my ($killpatt,$more) = @_;
print "killfiles($killpatt,$more)\n";
@@ -2729,7 +2740,7 @@ sub killfiles
# cd to a leading directory name in KILLPATT.
my $origdir = "";
if ($killpatt =~ m,^(.*)/,,) {
- chomp ($origdir = `pwd`);
+ $origdir = getcwd ();
&xchdir ($1);
$killpatt =~ s,^$1/,,;
}
@@ -4404,24 +4415,32 @@ sub POSTlatexdiff {
}
sub POSTlatex2ehelptexinfo {
- print "\t SPECIAL $package remove translation subdir\n";
+ print "\t POST$package - remove translation subdir\n";
&SYSTEM ("$RM -rf spanish");
}
sub POSTlithuanian {
- print "\t SPECIAL $package remove old language support\n";
- #
+ print "\t POST$package - remove old language support\n";
# these files are no longer used in TL.
&SYSTEM ("$RM language.lt.dat $DEST/tex/latex/lithuanian/language.lt.def");
}
sub POSTmontex {
- print "\t SPECIAL $package avoid 00readme case clash\n";
- #
+ print "\t POST$package - avoid 00readme case clash\n";
# these files are no longer used in TL.
&SYSTEM ("$MV 00readme 00readme.mfinput.km");
}
+# post instead of specialman because we use the tds.zip, which has the
+# man pages in an unusual place.
+sub POSTmusixtex {
+ print "POST$package - cp man pages\n";
+ my $mydest = "$TOPDEST/texmf/doc/man/man1/";
+ &xmkdir ($mydest);
+ &SYSTEM ("$CP $DEST/scripts/$package/doc/*.1 $mydest/");
+ &tl_man_to_pdf ();
+}
+
sub POSTpgf {
print "POST$package - mv generic,latex,... directories\n";
&SYSTEM ("cd $DEST && mkdir tex && mv context generic latex plain tex");
diff --git a/Master/tlpkg/tlpsrc/collection-music.tlpsrc b/Master/tlpkg/tlpsrc/collection-music.tlpsrc
index c05c604e98a..11f7d41326e 100644
--- a/Master/tlpkg/tlpsrc/collection-music.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-music.tlpsrc
@@ -9,5 +9,4 @@ depend harmony
depend musixguit
depend musixtex
depend songbook
-depend musixflx
depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/musixflx.tlpsrc b/Master/tlpkg/tlpsrc/musixflx.tlpsrc
deleted file mode 100644
index 10732ee496c..00000000000
--- a/Master/tlpkg/tlpsrc/musixflx.tlpsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-category TLCore
-binpattern f bin/${ARCH}/musixflx
-docpattern f texmf/doc/man/man1/musixflx.*
diff --git a/Master/tlpkg/tlpsrc/musixtex.tlpsrc b/Master/tlpkg/tlpsrc/musixtex.tlpsrc
index 0b1082790aa..f887de5ebff 100644
--- a/Master/tlpkg/tlpsrc/musixtex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/musixtex.tlpsrc
@@ -1 +1,4 @@
execute addMixedMap musix.map
+binpattern f bin/${ARCH}/musixflx
+binpattern f bin/${ARCH}/musixtex
+docpattern +f texmf/doc/man/man1/musix*