From 59e14ca1cb8dc807d3a015e7dbf36e2133d6d820 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 18 Sep 2013 23:01:10 +0000 Subject: lilyglyphs (18sep13) git-svn-id: svn://tug.org/texlive/trunk@31696 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/tlpkg-ctan-check | 2 +- Master/tlpkg/libexec/ctan2tds | 42 ++++++++++++++++++++++++----- Master/tlpkg/tlpsrc/collection-music.tlpsrc | 1 + Master/tlpkg/tlpsrc/lilyglyphs.tlpsrc | 3 +++ 4 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 Master/tlpkg/tlpsrc/lilyglyphs.tlpsrc (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index f5a6049a785..15e62403d58 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -267,7 +267,7 @@ my @TLP_working = qw( lettre lettrine levy lewis lexikon lfb lgreek lh lhelp libertine libgreek librarian librebaskerville librecaslon - libris limap linearA linegoal + libris lilyglyphs limap linearA linegoal lineno linguex lipsum lisp-on-tex listbib listing listings listings-ext listliketab listofsymbols diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 2fe1dfe19a6..f3f5994d3b9 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1108,6 +1108,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'ktv-texdata' => '&PREHOOK_ktv_texdata', 'latex-git-log' => '&PREHOOK_latex_git_log', 'latexdiff' => '&PREHOOK_latexdiff', + 'lilyglyphs' => '&PREHOOK_lilyglyphs', 'mathspic' => '&PREHOOK_mathspic', 'movie15' => '&PREHOOK_flatten1', 'musixtex-fonts' => '&PREHOOK_unzip', @@ -1159,6 +1160,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'knuth' => '&POSTknuth', 'koma-script' => '&POST_rmsymlink', 'latex2e-help-texinfo' => '&POSTlatex2ehelptexinfo', + 'lilyglyphs' => '&POSTlilyglyphs', 'listbib' => '&POSTlistbib', 'lithuanian' => '&POSTlithuanian', 'luaotfload' => '&POST_do_man', @@ -2370,6 +2372,7 @@ $standardxmt='\.xmt'; # scripts to install under texmf*/.../scripts, but not bindir. %specialscripts_nobin = ( 'epspdf' => '(epspdf(|\.help|boot|tk)|\.rb|makegray\.pro)$', + 'lilyglyphs' => 'lilyglyphs_common.py', 'lua-alt-getopt' => '\.lua$', 'lua2dox' => '\.(lua|def)$', 'luaindex' => '\.lua$', @@ -2411,6 +2414,7 @@ $standardxmt='\.xmt'; 'latexmk' => '\.pl$', 'latexfileversion' => 'latexfileversion$', 'latexpand' => 'latexpand$', + 'lilyglyphs' => 'lily-.*\.py$', 'listbib' => 'listbib$', 'listings-ext' => '\.sh$', 'ltxfileinfo' => 'ltxfileinfo$', @@ -2699,6 +2703,25 @@ sub xmkdir { &SYSTEM ("mkdir -p @dirs"); } +# mv multiple things into one final (possibly new) destination directory. +sub mv_with_mkdir { + my @args = @_; + my $destdir = pop (@args); + &xmkdir ($destdir); + &SYSTEM ("$MV @args $destdir"); +} + +# mv a single thing to another name, ensuring the parent of the +# destination exists. But if the destination itself exists, that's an error. +sub rename_with_mkdir { + my ($from,$to) = @_; + die "rename_with_mkdir needs exactly two args (got @_)" if @_ != 2; + die "rename_with_mkdir destination exists: $to" if -e $to; + (my $parent = $to) =~ s,/[^/]*$,,; + &xmkdir ($parent); + &SYSTEM ("$MV $from $to"); +} + # run a shell command. # sub SYSTEM { @@ -4743,6 +4766,11 @@ sub PREHOOK_latexdiff { &SYSTEM ("$MV latexdiff-vc latexdiff-vc.pl"); } +sub PREHOOK_lilyglyphs { + print "PREHOOK_$package - mv */*.py scripts to be found by specialscripts\n"; + &SYSTEM ("$MV bin/* lib/* ."); +} + sub PREHOOK_mathspic { print "PREHOOK_$package - eliminate version from mathspicNNN.pl\n"; # the w32 wrapper can only find foo.pl from foo, not fooNNN.pl. @@ -5195,13 +5223,6 @@ sub POSTenigma { &mv_with_mkdir ("enigma", "$DEST/doc/context/third/enigma/"); } -sub mv_with_mkdir { - my @args = @_; - my $destdir = pop (@args); - &xmkdir ($destdir); - &SYSTEM ("$MV @args $destdir"); -} - sub POSTeplain { print "POST$package - eplain.info, man\n"; @@ -5342,6 +5363,13 @@ sub POSTlatex2ehelptexinfo { &SYSTEM ("$RM -rf spanish"); } +sub POSTlilyglyphs { + print "\t POST$package - move directories around\n"; + &rename_with_mkdir ("fonts", "$DEST/fonts/opentype/public/$package"); + &rename_with_mkdir ("source", "$DEST/source/luatex/$package"); + &rename_with_mkdir ("tex", "$DEST/tex/lualatex/$package"); +} + sub POSTlistbib { print "\t POST$package - move .doc to .bst\n"; my $dest = "$DEST/bibtex/bst/$package"; diff --git a/Master/tlpkg/tlpsrc/collection-music.tlpsrc b/Master/tlpkg/tlpsrc/collection-music.tlpsrc index 231e33565f8..3aab6e948b4 100644 --- a/Master/tlpkg/tlpsrc/collection-music.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-music.tlpsrc @@ -11,6 +11,7 @@ depend gtrcrd depend guitar depend guitarchordschemes depend harmony +depend lilyglyphs depend m-tx depend musixguit depend musixtex diff --git a/Master/tlpkg/tlpsrc/lilyglyphs.tlpsrc b/Master/tlpkg/tlpsrc/lilyglyphs.tlpsrc new file mode 100644 index 00000000000..a6a856d4aba --- /dev/null +++ b/Master/tlpkg/tlpsrc/lilyglyphs.tlpsrc @@ -0,0 +1,3 @@ +binpattern f bin/${ARCH}/lily-glyph-commands +binpattern f bin/${ARCH}/lily-image-commands +binpattern f bin/${ARCH}/lily-rebuild-pdfs -- cgit v1.2.3