summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-07-27 23:39:36 +0000
committerKarl Berry <karl@freefriends.org>2012-07-27 23:39:36 +0000
commit667c94d4c814daec165a23fb251a7c38f37e202d (patch)
treeafb5f123bcb70a169633701290e90e4049c48bf7 /Master/tlpkg
parente5a3f502a0f8618b02616ad91af5595471381723 (diff)
new support package lua2dox (20jul12)
git-svn-id: svn://tug.org/texlive/trunk@27205 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check3
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds51
-rw-r--r--Master/tlpkg/tlpsrc/collection-luatex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/lua2dox.tlpsrc2
4 files changed, 36 insertions, 21 deletions
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 5f5d0877ac4..3db13c59fbf 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -248,7 +248,8 @@ my @TLP_working = qw(
lshort-slovenian lshort-spanish lshort-thai lshort-turkish lshort-ukr
lshort-vietnamese lstaddons ltabptch
ltxdockit ltxindex ltxkeys ltxmisc ltxnew ltxtools
- lua-alt-getopt lua-check-hyphen lua-visual-debug luabibentry luacode
+ lua-alt-getopt lua-check-hyphen lua-visual-debug
+ lua2dox luabibentry luacode
luaindex luainputenc lualatex-doc lualatex-math lualibs luamplib luaotfload
luapersian luasseq luatexbase luatexja luatextra
lxfonts ly1
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 0c20d0d8c34..d49e7e7174d 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1293,6 +1293,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
'logic', 'milstd\.tex|' . $standardtex,
'ltxkeys', '\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$', # not cfg
'lua-visual-debug', '\.lua|' . $standardtex,
+ 'lua2dox', 'NULL', # .def is lua code
'lualatex-math', '\.sty', # not phst-doc.cls
'magyar', 'NULL', # do not install in runtime, conflicts with babel
'manjutex', '\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|manju.tex',
@@ -1564,6 +1565,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
'lh', 'fonts',
'latex-notes-zh-cn', 'generic',
'lua-alt-getopt', 'support',
+ 'lua2dox', 'support',
'luatexja', 'luatex',
'marvosym', 'fonts',
'mathabx', 'fonts',
@@ -2161,6 +2163,7 @@ $standardxmt='\.xmt';
%specialscripts_nobin = (
'epspdf' => '(epspdf(|\.help|boot|tk)|\.rb|makegray\.pro)$',
'lua-alt-getopt' => '\.lua$',
+ 'lua2dox' => '\.(lua|def)$',
'luaindex' => '\.lua$',
'lualatex-math' => '\.lua$',
'luasseq' => '\.lua$',
@@ -2196,6 +2199,7 @@ $standardxmt='\.xmt';
'latexpand' => 'latexpand$',
'listbib' => 'listbib$',
'listings-ext' => '\.sh$',
+ 'lua2dox' => 'lua2dox_lua$', # doscripts() does _filter
'match_parens' => '^match_parens$',
'mathspic' => '^mathspic\.pl$',
'mf2pt1' => '\.pl$',
@@ -2836,42 +2840,44 @@ sub dotype1{
# scripts. Make them executable even if it isn't always necessary.
# Build/source/tex/texlive/linked_scripts/Makefile.am installs symlinks
# in the bin directories where needed. That Makefile is independently
-# maintained, needs to be updated by hand when new user-visible scripts
+# maintained, and needs to be updated by hand when new user-visible scripts
# are added. We add/update the script itself under linked_scripts.
# We also make the symlinks/w32-wrapper-copy in Master/bin.
#
sub doscripts {
my $pwd = getcwd();
- # first do the ones that don't go in the bindirs.
- my $scriptpatt = $specialscripts_nobin{$package};
+ my $build_tldir = "texk/texlive";
+ my $build_scriptsdir = "$build_tldir/linked_scripts";
+ my $builddir = "$BUILDDEST/$build_scriptsdir/$package";
+
+ # first do the user-visible bindir entries.
+ $scriptpatt = $specialscripts_bin{$package};
if ($scriptpatt) {
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/*");
}
- }
- # now the user-visible bindir entries. Duplicating above, sorry.
- $scriptpatt = $specialscripts_bin{$package};
- return unless $scriptpatt;
+ # update the copy in Build (the reason we do the bindir ones first).
+ &xmkdir ($builddir);
+ &SYSTEM ("$CP $DEST/scripts/$package/* $builddir/");
+ }
- 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/*");
+ # then do the ones that go only under scripts/ and not in the bindirs.
+ my $nobin_scriptpatt = $specialscripts_nobin{$package};
+ if ($nobin_scriptpatt) {
+ if ($pwd ne "$DEST/scripts/$package") {
+ # in the .tds.zip case, we will already be in the scripts dir.
+ &install ("$DEST/scripts/$package", $nobin_scriptpatt);
+ &SYSTEM ("chmod a+x $DEST/scripts/$package/*");
+ }
}
- # update the copy in Build, too.
- my $build_tldir = "texk/texlive";
- my $build_scriptsdir = "$build_tldir/linked_scripts";
- my $builddir = "$BUILDDEST/$build_scriptsdir/$package";
- &xmkdir ($builddir);
- &SYSTEM ("$CP $DEST/scripts/$package/* $builddir/");
-
- # List of scripts we're installing.
+ # List of scripts we just copied in for installing in the bindirs.
chomp (my @scripts = `cd $builddir && ls`);
+ return unless @scripts;
# For each, give a warning if missing from the Makefile.am in the sources.
# Also, if not already present, create the platform-specific bindir entries.
@@ -2892,13 +2898,18 @@ sub doscripts {
if ($p ne "win32") {
my $linktarget = "../../$DEST_TREE/scripts/$package/$s";
&SYSTEM ("ln -s $linktarget $platdir/$linkname");
+ #
+ # Scripts with special cases.
&SYSTEM ("ln -s $linkname $platdir/r$linkname")
if $linkname =~ /pdfcrop|epstopdf/; # rpdfcrop -> pdfcrop
+ &SYSTEM ("ln -s $linkname $platdir/lua2dox_filter")
+ if $linkname =~ /lua2dox_lua/;
} else {
# Windows. If a shell script, skip. Else copy the wrapper.
- next if $s =~ /\.sh$/;
+ next if $s =~ /\.sh$|lua2dox/;
my $w32_wrapper = "$Build/$build_tldir/w32_wrapper/runscript.exe";
&SYSTEM ("$CP $w32_wrapper $platdir/$linkname.exe");
+ #
&SYSTEM ("$CP $w32_wrapper $platdir/r$linkname.exe")
if $linkname =~ /pdfcrop|epstopdf/; # rpdfcrop.exe
}
diff --git a/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc b/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc
index 8c565a37a4f..ddaf405f81d 100644
--- a/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc
@@ -9,6 +9,7 @@ depend checkcites
depend chickenize
depend interpreter
depend lua-visual-debug
+depend lua2dox
depend luabibentry
depend luacode
depend luaindex
diff --git a/Master/tlpkg/tlpsrc/lua2dox.tlpsrc b/Master/tlpkg/tlpsrc/lua2dox.tlpsrc
new file mode 100644
index 00000000000..9a845a9d030
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/lua2dox.tlpsrc
@@ -0,0 +1,2 @@
+binpattern f bin/${ARCH}/lua2dox_lua
+binpattern f bin/${ARCH}/lua2dox_filter