diff options
| author | Karl Berry <karl@freefriends.org> | 2013-04-19 15:48:28 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2013-04-19 15:48:28 +0000 |
| commit | c79d10db64a072f1ee07e9dc04dc9ebcc191c07c (patch) | |
| tree | 64f7ce59c10fc5ff6b855815c6ac7b61913c3b98 /Master | |
| parent | f8997e27d006cf521ee6ce59f11eee0823dabe00 (diff) | |
use new tlpsetvar to abbreviate no-xindy list
git-svn-id: svn://tug.org/texlive/trunk@30037 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/tlpkg/TeXLive/TLPSRC.pm | 9 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/xindy.tlpsrc | 27 |
2 files changed, 17 insertions, 19 deletions
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm index a2a7e036a7e..9c200de0990 100644 --- a/Master/tlpkg/TeXLive/TLPSRC.pm +++ b/Master/tlpkg/TeXLive/TLPSRC.pm @@ -167,7 +167,7 @@ sub from_file { } elsif ($line =~ /^postaction\s+(.*)$/) { push @postactions, $1 if ($1 ne ""); next; - } elsif ($line =~ /^tlpsetvar\s+([-a-zA-Z_0-9]*)\s+(.*)$/) { + } elsif ($line =~ /^tlpsetvar\s+([-_a-zA-Z0-9]+)\s+(.*)$/) { $tlpvars{$1} = $2; next; } else { @@ -862,6 +862,13 @@ instead of the one given via C<file>. =back +=item C<tlpsetvar> I<var> I<val> + +sets variable I<var> to I<val>, for use within the current C<.tlpsrc> +only. Order matters. The variable can be expanded with +C<${>I<var>C<}> (after it is defined). Characters allowed in the I<var> +name are C<-_a-zA-Z0-9>. + =item C<(src|run|doc|bin)pattern> I<pattern> adds a pattern (next section) to the respective list of patterns. diff --git a/Master/tlpkg/tlpsrc/xindy.tlpsrc b/Master/tlpkg/tlpsrc/xindy.tlpsrc index c43cc8d369b..bdeca9b92a5 100644 --- a/Master/tlpkg/tlpsrc/xindy.tlpsrc +++ b/Master/tlpkg/tlpsrc/xindy.tlpsrc @@ -4,28 +4,19 @@ runpattern d texmf-dist/xindy runpattern d texmf-dist/scripts/xindy # # Not all platforms provide this. -binpattern f/!mips-irix,mipsel-linux,\ -i386-solaris,sparc-solaris,x86_64-solaris \ - bin/${ARCH}/texindy -binpattern f/!mips-irix,mipsel-linux,\ -i386-solaris,sparc-solaris,x86_64-solaris \ - bin/${ARCH}/tex2xindy -binpattern f/!mips-irix,mipsel-linux,\ -i386-solaris,sparc-solaris,x86_64-solaris \ - bin/${ARCH}/xindy +tlpsetvar no_xindy_platforms \ + mips-irix,mipsel-linux,i386-solaris,sparc-solaris,x86_64-solaris +# +binpattern f/!${no_xindy_platforms} bin/${ARCH}/texindy +binpattern f/!${no_xindy_platforms} bin/${ARCH}/tex2xindy +binpattern f/!${no_xindy_platforms} bin/${ARCH}/xindy # # Also, cygwin and windows must use a different name for the clisp executable. -binpattern f/!i386-cygwin,win32,\ -mips-irix,mipsel-linux,i386-solaris,sparc-solaris,x86_64-solaris \ - bin/${ARCH}/xindy.run -binpattern f/i386-cygwin,win32 \ - bin/${ARCH}/xindy-lisp.exe +binpattern f/!i386-cygwin,win32,${no_xindy_platforms} bin/${ARCH}/xindy.run +binpattern f/i386-cygwin,win32 bin/${ARCH}/xindy-lisp.exe # # darwin has to split the mem file by architecture. -binpattern f/!mips-irix,mipsel-linux,\ -i386-solaris,sparc-solaris,x86_64-solaris,\ -universal-darwin \ - bin/${ARCH}/xindy.mem +binpattern f/!${no_xindy_platforms},universal-darwin bin/${ARCH}/xindy.mem binpattern f/universal-darwin bin/universal-darwin/xindy-i386.mem binpattern f/universal-darwin bin/universal-darwin/xindy-ppc.mem # |