diff options
Diffstat (limited to 'Master/tlpkg/tlpsrc')
-rw-r--r-- | Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc | 9 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc | 16 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/luajittex.tlpsrc | 9 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/mflua.tlpsrc | 7 |
4 files changed, 22 insertions, 19 deletions
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc index 6c1c7c5f6a2..8b334e564d3 100644 --- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc @@ -23,6 +23,15 @@ tlpsetvar global_latex_deps babel,cm,hyphen-base,latex-fonts tlpsetvar global_luatex_deps cm,etex,hyphen-base,knuth-lib,plain,\ tex-ini-files,unicode-data # +# Platforms that don't support jit. +tlpsetvar global_no_luajit_platforms x86_64-solaris +# +# We define the Windows platform names here, so we can use ${wndws} in +# the patterns, in preparation for supporting w64 in addition to w32, +# and perhaps others in the future. The name ${global_wndws} was just +# too long, so we made a super-special case in the code. +tlpsetvar wndws win32 + # It would be ideal to be able to specify the non-jit platforms here, # but it's not crucial, so we haven't implemented ${global_} expansion # in binpatterns. diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc index 9685d898ef5..a46a65a52c3 100644 --- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc @@ -24,14 +24,14 @@ runpattern !d tlpkg/installer/xz runpattern !f tlpkg/installer/tar.exe # # Windows only: -binpattern d/win32 tlpkg/tlperl -binpattern f/win32 tlpkg/tltcl/tclkit.exe -binpattern f/win32 tlpkg/tltcl/tclkit.exe.manifest -binpattern f/win32 tlpkg/installer/tar.exe -binpattern f/win32 tlpkg/installer/wget/wget.exe -binpattern f/win32 tlpkg/installer/xz/xz.exe -binpattern f/win32 install-tl-windows.bat -binpattern f/win32 install-tl-advanced.bat +binpattern d/${wndws} tlpkg/tlperl +binpattern f/${wndws} tlpkg/tltcl/tclkit.exe +binpattern f/${wndws} tlpkg/tltcl/tclkit.exe.manifest +binpattern f/${wndws} tlpkg/installer/tar.exe +binpattern f/${wndws} tlpkg/installer/wget/wget.exe +binpattern f/${wndws} tlpkg/installer/xz/xz.exe +binpattern f/${wndws} install-tl-windows.bat +binpattern f/${wndws} install-tl-advanced.bat # # xz binaries for all binpattern f tlpkg/installer/xz/xz.${ARCH} diff --git a/Master/tlpkg/tlpsrc/luajittex.tlpsrc b/Master/tlpkg/tlpsrc/luajittex.tlpsrc index 87558d84039..d0e301f0f46 100644 --- a/Master/tlpkg/tlpsrc/luajittex.tlpsrc +++ b/Master/tlpkg/tlpsrc/luajittex.tlpsrc @@ -1,12 +1,9 @@ category TLCore shortdesc LuaTeX with just-in-time (jit) compiler -# must keep in sync with mflua.tlpsrc. -tlpsetvar no_luajit_platforms x86_64-solaris -# -binpattern f/!${no_luajit_platforms} bin/${ARCH}/luajittex -binpattern f/!${no_luajit_platforms} bin/${ARCH}/texluajit -binpattern f/!${no_luajit_platforms} bin/${ARCH}/texluajitc +binpattern f/!${global_no_luajit_platforms} bin/${ARCH}/luajittex +binpattern f/!${global_no_luajit_platforms} bin/${ARCH}/texluajit +binpattern f/!${global_no_luajit_platforms} bin/${ARCH}/texluajitc # binpattern f bin/win32/luajit51.dll binpattern f bin/win32/luajittex.dll diff --git a/Master/tlpkg/tlpsrc/mflua.tlpsrc b/Master/tlpkg/tlpsrc/mflua.tlpsrc index 827e2a52430..d0cd6bc13f4 100644 --- a/Master/tlpkg/tlpsrc/mflua.tlpsrc +++ b/Master/tlpkg/tlpsrc/mflua.tlpsrc @@ -3,9 +3,6 @@ shortdesc configuration and base files for MFLua longdesc For information on this Lua-enabled Metafont, longdesc see, for example: tug.org/TUGboat/tb32-2/tb101scarso.pdf. -# must keep in sync with luatex.tlpsrc. -tlpsetvar no_luajit_platforms x86_64-solaris - # disabled until there is a user base. tlpsetvar fmtdeps luatex,metafont execute AddFormat name=mflua engine=mflua-nowin options="mf.ini" \ @@ -17,8 +14,8 @@ runpattern d texmf-dist/metafont/mflua binpattern f bin/${ARCH}/mflua binpattern f bin/${ARCH}/mflua-nowin -binpattern f/!${no_luajit_platforms} bin/${ARCH}/mfluajit -binpattern f/!${no_luajit_platforms} bin/${ARCH}/mfluajit-nowin +binpattern f/!${global_no_luajit_platforms} bin/${ARCH}/mfluajit +binpattern f/!${global_no_luajit_platforms} bin/${ARCH}/mfluajit-nowin # need metafont for support files, luatex for dll's, etc. depend metafont |