summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-23 22:55:51 +0000
committerKarl Berry <karl@freefriends.org>2015-04-23 22:55:51 +0000
commita5edcfe433dd540818b1a0d4eafd6c4b63d24dcc (patch)
tree1681f893f4068d9a03a2ad339819961884e5052b /Master/tlpkg
parent087d2d121f4f1e7dc23d5175759f4be6fb44c0ef (diff)
musixtnt, split from musixtex
git-svn-id: svn://tug.org/texlive/trunk@37024 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds57
-rw-r--r--Master/tlpkg/tlpsrc/collection-music.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/musixtex.tlpsrc7
-rw-r--r--Master/tlpkg/tlpsrc/musixtnt.tlpsrc5
5 files changed, 45 insertions, 27 deletions
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 866013e203a..fa74a4ede9d 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -373,7 +373,7 @@ my @TLP_working = qw(
mugsthesis multenum multibbl multibib multibibliography
multicap multienv multiexpand multirow
multido multiobjective munich musixguit
- musixtex musixtex-fonts musuos muthesis
+ musixtex musixtex-fonts musixtnt musuos muthesis
mversion mwcls mwe mweights mxedruli
mychemistry mycv mylatexformat
nag nameauth namespc nanumtype1 natbib natded nath nature navigator
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index ea29404c438..f5015ac56b6 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1249,6 +1249,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'pst-geo' => '&POSTpstgeo',
'pxbase' => '&POSTpxbase',
'pxchfon' => '&POSTpxchfon',
+ 'recipebook' => '&POST_rmsymlink',
'splitindex' => '&POST_do_man',
'startex' => '&POST_otherformat',
'tap', => '&POSTtap',
@@ -1328,6 +1329,7 @@ $standarddest = "texmf-dist";
'mfpic', 'generic',
'midnight', 'generic',
'mkpattern', 'plain',
+ 'musixtnt', 'generic',
'oberdiek', 'generic',
'ocherokee', 'lambda',
'ofs', 'generic',
@@ -2812,7 +2814,8 @@ for (@ARGV) {
my $COOKED_PKG = "$COOKED_TOP/$package"; # output directory
if ($specialscripts_bin{$package}
- || $package =~ /^(biber|context|mptopdf)$/) { # special POSTcases
+ # special POSTcases:
+ || $package =~ /^(biber|context|mptopdf|musixtnt)$/) {
$BUILDDEST = "$COOKED_PKG/Build/source";
$TOPDEST = "$COOKED_PKG/Master";
} else {
@@ -5703,6 +5706,12 @@ sub POSTmathdesign {
&mv_with_mkdir ("vf/*", "$DEST/fonts/vf/public/$package");
}
+sub POSTmontex {
+ print "POST$package - avoid 00readme case clash\n";
+ # these files are no longer used in TL.
+ &SYSTEM ("$MV 00readme 00readme.mfinput.km");
+}
+
sub POSTmptopdf {
# mptopdf needs a cut-down version of the context post routine.
# But there are enough differences that trying to factor out the
@@ -5741,18 +5750,14 @@ sub POSTmusixtex {
}
sub POSTmusixtnt {
- print "POST$package - w32 binaries\n";
+ print "POST$package - preserve binaries, use/remove windows exe\n";
+ &POST_preserve_bin ("fixmsxpart", "msxlint");
+ #
my $w32bindir = "$TOPDEST/bin/win32";
&mv_with_mkdir ("msxlint.exe", "fixmsxpart.exe", $w32bindir);
&SYSTEM ("$RM -rf windows");
}
-sub POSTmontex {
- print "POST$package - avoid 00readme case clash\n";
- # these files are no longer used in TL.
- &SYSTEM ("$MV 00readme 00readme.mfinput.km");
-}
-
sub POSTnumericplots {
print "POST$package - mv latex subdir\n";
&SYSTEM ("$MV latex $DEST/tex/latex/$package");
@@ -5787,19 +5792,7 @@ sub POSTpict2e {
sub POSTpmx {
print "POST$package - preserve binaries\n";
- # the pmx package includes binaries made from Build, and normal
- # scripts and support files. The latter can get updated without
- # needing to update the former, so we support it. Which means
- # preserving the binaries from the Build.
- chomp (my @platforms = `cd $Master/bin && ls`);
- for my $p (@platforms) {
- my $platdir = "$TOPDEST/bin/$p";
- my $exeext = &exeext ($p);
- &SYSTEM ("$CP $Master/bin/$p/scor2prt$exeext $platdir/");
- &SYSTEM ("$CP $Master/bin/$p/pmxab$exeext $platdir/");
- }
-
- &POST_do_man ();
+ &POST_preserve_bin ("scor2prt", "pmxab");
}
sub POSTprerex {
@@ -5947,7 +5940,7 @@ sub POSTzhspacing {
&SYSTEM ("$MV doc/* .; rmdir doc");
}
-# (Generic post hook actions.)
+# Generic post hook actions follow, with an underscore following POST.
sub POST_otherformat {
print "POST$package - move macros up a level\n";
@@ -5980,6 +5973,26 @@ sub POST_do_man {
&tl_man_to_pdf ();
}
+sub POST_preserve_bin {
+ # the pmx package includes binaries made from Build, and normal
+ # scripts and support files. The latter can get updated without
+ # needing to update the former, so we support it. Which means
+ # preserving the binaries from the Build.
+ my (@binaries) = @_;
+ chomp (my @platforms = `cd $Master/bin && ls`);
+ for my $p (@platforms) {
+ my $platdir = "$TOPDEST/bin/$p";
+ &xmkdir ($platdir);
+ my $exeext = &exeext ($p);
+ for my $b (@binaries) {
+ &SYSTEM ("$CP $Master/bin/$p/$b$exeext $platdir/");
+ }
+ }
+
+ # always going to need this anyway.
+ &POST_do_man ();
+}
+
sub POST_rmsymlink {
print "POST$package - removing symlinks\n";
&SYSTEM ("find $DEST -type l | xargs --no-run-if-empty $RM");
diff --git a/Master/tlpkg/tlpsrc/collection-music.tlpsrc b/Master/tlpkg/tlpsrc/collection-music.tlpsrc
index cd33fa37fa8..ea9710b1e16 100644
--- a/Master/tlpkg/tlpsrc/collection-music.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-music.tlpsrc
@@ -18,6 +18,7 @@ depend m-tx
depend musixguit
depend musixtex
depend musixtex-fonts
+depend musixtnt
depend pmx
depend pmxchords
depend songbook
diff --git a/Master/tlpkg/tlpsrc/musixtex.tlpsrc b/Master/tlpkg/tlpsrc/musixtex.tlpsrc
index 159e2e88de9..f83a4b307ba 100644
--- a/Master/tlpkg/tlpsrc/musixtex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/musixtex.tlpsrc
@@ -1,5 +1,4 @@
-binpattern f bin/${ARCH}/fixmsxpart
-binpattern f bin/${ARCH}/msxlint
+binpattern f bin/${ARCH}/${PKGNAME}
+#
binpattern f bin/${ARCH}/musixflx
-binpattern f bin/${ARCH}/musixtex
-docpattern +f texmf-dist/doc/man/man1/musix*
+docpattern +f texmf-dist/doc/man/man1/musixflx.*
diff --git a/Master/tlpkg/tlpsrc/musixtnt.tlpsrc b/Master/tlpkg/tlpsrc/musixtnt.tlpsrc
new file mode 100644
index 00000000000..1c726f3ff49
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/musixtnt.tlpsrc
@@ -0,0 +1,5 @@
+binpattern f bin/${ARCH}/fixmsxpart
+docpattern +f texmf-dist/doc/man/man1/fixmsxpart.*
+#
+binpattern f bin/${ARCH}/msxlint
+docpattern +f texmf-dist/doc/man/man1/msxlint.*