summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-02-27 17:33:43 +0000
committerKarl Berry <karl@freefriends.org>2024-02-27 17:33:43 +0000
commit886ad34c7fec761fdfd55ac1af6603e201194a6c (patch)
treebbc048a6628566b602a94e49ebc524eb2e86fa6c
parent31b72b1cf24adf9e1756ecce45c0a52c84800517 (diff)
platforms without luametatex
git-svn-id: svn://tug.org/texlive/trunk@70195 c570f23f-e606-0410-a88d-b1316a301751
l---------Master/bin/amd64-netbsd/context1
l---------Master/bin/amd64-netbsd/context.lua1
l---------Master/bin/amd64-netbsd/contextjit1
l---------Master/bin/amd64-netbsd/luatools1
l---------Master/bin/amd64-netbsd/mtxrun1
l---------Master/bin/amd64-netbsd/mtxrun.lua1
l---------Master/bin/amd64-netbsd/mtxrunjit1
l---------Master/bin/armhf-linux/context1
l---------Master/bin/armhf-linux/context.lua1
l---------Master/bin/armhf-linux/contextjit1
l---------Master/bin/armhf-linux/luatools1
l---------Master/bin/armhf-linux/mtxrun1
l---------Master/bin/armhf-linux/mtxrun.lua1
l---------Master/bin/armhf-linux/mtxrunjit1
l---------Master/bin/i386-netbsd/contextjit1
l---------Master/bin/i386-netbsd/luatools1
l---------Master/bin/i386-netbsd/mtxrunjit1
l---------Master/bin/i386-solaris/context1
l---------Master/bin/i386-solaris/context.lua1
l---------Master/bin/i386-solaris/contextjit1
l---------Master/bin/i386-solaris/luatools1
l---------Master/bin/i386-solaris/mtxrun1
l---------Master/bin/i386-solaris/mtxrun.lua1
l---------Master/bin/i386-solaris/mtxrunjit1
l---------Master/bin/x86_64-cygwin/contextjit2
l---------Master/bin/x86_64-cygwin/luatools2
l---------Master/bin/x86_64-cygwin/mtxrunjit2
l---------Master/bin/x86_64-solaris/context1
l---------Master/bin/x86_64-solaris/context.lua1
l---------Master/bin/x86_64-solaris/contextjit1
l---------Master/bin/x86_64-solaris/luatools1
l---------Master/bin/x86_64-solaris/mtxrun1
l---------Master/bin/x86_64-solaris/mtxrun.lua1
l---------Master/bin/x86_64-solaris/mtxrunjit1
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc8
-rw-r--r--Master/tlpkg/tlpsrc/context-texlive.tlpsrc9
-rw-r--r--Master/tlpkg/tlpsrc/context.tlpsrc14
37 files changed, 14 insertions, 54 deletions
diff --git a/Master/bin/amd64-netbsd/context b/Master/bin/amd64-netbsd/context
deleted file mode 120000
index 0f9307102f6..00000000000
--- a/Master/bin/amd64-netbsd/context
+++ /dev/null
@@ -1 +0,0 @@
-luametatex \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/context.lua b/Master/bin/amd64-netbsd/context.lua
deleted file mode 120000
index 825f868ad88..00000000000
--- a/Master/bin/amd64-netbsd/context.lua
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/scripts/context/lua/context.lua \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/contextjit b/Master/bin/amd64-netbsd/contextjit
deleted file mode 120000
index c5b798e5847..00000000000
--- a/Master/bin/amd64-netbsd/contextjit
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/contextjit \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/luatools b/Master/bin/amd64-netbsd/luatools
deleted file mode 120000
index 2bcba5f95d9..00000000000
--- a/Master/bin/amd64-netbsd/luatools
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/luatools \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/mtxrun b/Master/bin/amd64-netbsd/mtxrun
deleted file mode 120000
index 0f9307102f6..00000000000
--- a/Master/bin/amd64-netbsd/mtxrun
+++ /dev/null
@@ -1 +0,0 @@
-luametatex \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/mtxrun.lua b/Master/bin/amd64-netbsd/mtxrun.lua
deleted file mode 120000
index 8825f964657..00000000000
--- a/Master/bin/amd64-netbsd/mtxrun.lua
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/scripts/context/lua/mtxrun.lua \ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/mtxrunjit b/Master/bin/amd64-netbsd/mtxrunjit
deleted file mode 120000
index 1dc2cf0f8bf..00000000000
--- a/Master/bin/amd64-netbsd/mtxrunjit
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/mtxrunjit \ No newline at end of file
diff --git a/Master/bin/armhf-linux/context b/Master/bin/armhf-linux/context
deleted file mode 120000
index 0f9307102f6..00000000000
--- a/Master/bin/armhf-linux/context
+++ /dev/null
@@ -1 +0,0 @@
-luametatex \ No newline at end of file
diff --git a/Master/bin/armhf-linux/context.lua b/Master/bin/armhf-linux/context.lua
deleted file mode 120000
index 825f868ad88..00000000000
--- a/Master/bin/armhf-linux/context.lua
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/scripts/context/lua/context.lua \ No newline at end of file
diff --git a/Master/bin/armhf-linux/contextjit b/Master/bin/armhf-linux/contextjit
deleted file mode 120000
index c5b798e5847..00000000000
--- a/Master/bin/armhf-linux/contextjit
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/contextjit \ No newline at end of file
diff --git a/Master/bin/armhf-linux/luatools b/Master/bin/armhf-linux/luatools
deleted file mode 120000
index 2bcba5f95d9..00000000000
--- a/Master/bin/armhf-linux/luatools
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/luatools \ No newline at end of file
diff --git a/Master/bin/armhf-linux/mtxrun b/Master/bin/armhf-linux/mtxrun
deleted file mode 120000
index 0f9307102f6..00000000000
--- a/Master/bin/armhf-linux/mtxrun
+++ /dev/null
@@ -1 +0,0 @@
-luametatex \ No newline at end of file
diff --git a/Master/bin/armhf-linux/mtxrun.lua b/Master/bin/armhf-linux/mtxrun.lua
deleted file mode 120000
index 8825f964657..00000000000
--- a/Master/bin/armhf-linux/mtxrun.lua
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/scripts/context/lua/mtxrun.lua \ No newline at end of file
diff --git a/Master/bin/armhf-linux/mtxrunjit b/Master/bin/armhf-linux/mtxrunjit
deleted file mode 120000
index 1dc2cf0f8bf..00000000000
--- a/Master/bin/armhf-linux/mtxrunjit
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/mtxrunjit \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/contextjit b/Master/bin/i386-netbsd/contextjit
deleted file mode 120000
index c5b798e5847..00000000000
--- a/Master/bin/i386-netbsd/contextjit
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/contextjit \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/luatools b/Master/bin/i386-netbsd/luatools
deleted file mode 120000
index 2bcba5f95d9..00000000000
--- a/Master/bin/i386-netbsd/luatools
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/luatools \ No newline at end of file
diff --git a/Master/bin/i386-netbsd/mtxrunjit b/Master/bin/i386-netbsd/mtxrunjit
deleted file mode 120000
index 1dc2cf0f8bf..00000000000
--- a/Master/bin/i386-netbsd/mtxrunjit
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/mtxrunjit \ No newline at end of file
diff --git a/Master/bin/i386-solaris/context b/Master/bin/i386-solaris/context
deleted file mode 120000
index 0f9307102f6..00000000000
--- a/Master/bin/i386-solaris/context
+++ /dev/null
@@ -1 +0,0 @@
-luametatex \ No newline at end of file
diff --git a/Master/bin/i386-solaris/context.lua b/Master/bin/i386-solaris/context.lua
deleted file mode 120000
index 825f868ad88..00000000000
--- a/Master/bin/i386-solaris/context.lua
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/scripts/context/lua/context.lua \ No newline at end of file
diff --git a/Master/bin/i386-solaris/contextjit b/Master/bin/i386-solaris/contextjit
deleted file mode 120000
index c5b798e5847..00000000000
--- a/Master/bin/i386-solaris/contextjit
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/contextjit \ No newline at end of file
diff --git a/Master/bin/i386-solaris/luatools b/Master/bin/i386-solaris/luatools
deleted file mode 120000
index 2bcba5f95d9..00000000000
--- a/Master/bin/i386-solaris/luatools
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/luatools \ No newline at end of file
diff --git a/Master/bin/i386-solaris/mtxrun b/Master/bin/i386-solaris/mtxrun
deleted file mode 120000
index 0f9307102f6..00000000000
--- a/Master/bin/i386-solaris/mtxrun
+++ /dev/null
@@ -1 +0,0 @@
-luametatex \ No newline at end of file
diff --git a/Master/bin/i386-solaris/mtxrun.lua b/Master/bin/i386-solaris/mtxrun.lua
deleted file mode 120000
index 8825f964657..00000000000
--- a/Master/bin/i386-solaris/mtxrun.lua
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/scripts/context/lua/mtxrun.lua \ No newline at end of file
diff --git a/Master/bin/i386-solaris/mtxrunjit b/Master/bin/i386-solaris/mtxrunjit
deleted file mode 120000
index 1dc2cf0f8bf..00000000000
--- a/Master/bin/i386-solaris/mtxrunjit
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/mtxrunjit \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/contextjit b/Master/bin/x86_64-cygwin/contextjit
index 0aa638ec31d..c5b798e5847 120000
--- a/Master/bin/x86_64-cygwin/contextjit
+++ b/Master/bin/x86_64-cygwin/contextjit
@@ -1 +1 @@
-../../texmf-dist/scripts/context/stubs-mkiv/unix/contextjit \ No newline at end of file
+../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/contextjit \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/luatools b/Master/bin/x86_64-cygwin/luatools
index bf6a6cc24b8..2bcba5f95d9 120000
--- a/Master/bin/x86_64-cygwin/luatools
+++ b/Master/bin/x86_64-cygwin/luatools
@@ -1 +1 @@
-../../texmf-dist/scripts/context/stubs-mkiv/unix/luatools \ No newline at end of file
+../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/luatools \ No newline at end of file
diff --git a/Master/bin/x86_64-cygwin/mtxrunjit b/Master/bin/x86_64-cygwin/mtxrunjit
index f77fc5fc83d..1dc2cf0f8bf 120000
--- a/Master/bin/x86_64-cygwin/mtxrunjit
+++ b/Master/bin/x86_64-cygwin/mtxrunjit
@@ -1 +1 @@
-../../texmf-dist/scripts/context/stubs-mkiv/unix/mtxrunjit \ No newline at end of file
+../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/mtxrunjit \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/context b/Master/bin/x86_64-solaris/context
deleted file mode 120000
index 0f9307102f6..00000000000
--- a/Master/bin/x86_64-solaris/context
+++ /dev/null
@@ -1 +0,0 @@
-luametatex \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/context.lua b/Master/bin/x86_64-solaris/context.lua
deleted file mode 120000
index 825f868ad88..00000000000
--- a/Master/bin/x86_64-solaris/context.lua
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/scripts/context/lua/context.lua \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/contextjit b/Master/bin/x86_64-solaris/contextjit
deleted file mode 120000
index c5b798e5847..00000000000
--- a/Master/bin/x86_64-solaris/contextjit
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/contextjit \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/luatools b/Master/bin/x86_64-solaris/luatools
deleted file mode 120000
index 2bcba5f95d9..00000000000
--- a/Master/bin/x86_64-solaris/luatools
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/luatools \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/mtxrun b/Master/bin/x86_64-solaris/mtxrun
deleted file mode 120000
index 0f9307102f6..00000000000
--- a/Master/bin/x86_64-solaris/mtxrun
+++ /dev/null
@@ -1 +0,0 @@
-luametatex \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/mtxrun.lua b/Master/bin/x86_64-solaris/mtxrun.lua
deleted file mode 120000
index 8825f964657..00000000000
--- a/Master/bin/x86_64-solaris/mtxrun.lua
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/scripts/context/lua/mtxrun.lua \ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/mtxrunjit b/Master/bin/x86_64-solaris/mtxrunjit
deleted file mode 120000
index 1dc2cf0f8bf..00000000000
--- a/Master/bin/x86_64-solaris/mtxrunjit
+++ /dev/null
@@ -1 +0,0 @@
-../../texmf-dist/tex/context/texlive/stubs-mkiv/unix/mtxrunjit \ No newline at end of file
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
index 0192bace945..896f0811983 100644
--- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
@@ -47,11 +47,9 @@ cm,etex,hyphen-base,knuth-lib,plain,tex-ini-files,unicode-data
# Platforms that don't support jit.
tlpsetvar global_no_luajit_platforms i386-solaris,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 there is a super-special case in the code.
-#tlpsetvar wndws windows
+# Platforms that don't have a luametatex binary.
+tlpsetvar global_no_lmtx_platforms \
+ armhf-linux,amd64-netbsd,i386-netbsd,x86_64-solaris,i386-solaris
# 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
diff --git a/Master/tlpkg/tlpsrc/context-texlive.tlpsrc b/Master/tlpkg/tlpsrc/context-texlive.tlpsrc
index 5e969e3e8ef..2ad7c9984dd 100644
--- a/Master/tlpkg/tlpsrc/context-texlive.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-texlive.tlpsrc
@@ -4,12 +4,9 @@ runpattern d texmf-dist/tex/context/texlive
# These point to stubs, which were handwritten by us, hence include both
# the stubs (under the dir above) and the executable links here.
-# It seems harmless to include these even when luametatex itself
-# isn't available for a given platform; they won't do anything, but it
-# saves us having to list the same platform omissions as in context.tlpsrc.
-binpattern f bin/${ARCH}/contextjit
-binpattern f bin/${ARCH}/luatools
-binpattern f bin/${ARCH}/mtxrunjit
+binpattern f/!${global_no_lmtx_platforms} bin/${ARCH}/contextjit
+binpattern f/!${global_no_lmtx_platforms} bin/${ARCH}/luatools
+binpattern f/!${global_no_lmtx_platforms} bin/${ARCH}/mtxrunjit
# We have these man pages as .so links to the scripts.
docpattern +f texmf-dist/doc/man/man1/luatools.*
diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc
index c21aa8f39bf..621c3bc96c6 100644
--- a/Master/tlpkg/tlpsrc/context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context.tlpsrc
@@ -87,12 +87,8 @@ docpattern +f texmf-dist/doc/man/man1/mtxrun.*
# excluding some TL adaptations kept in package context-texlive.
runpattern !d texmf-dist/tex/context/texlive
#
-# And not all platforms have an lmtx binary.
-tlpsetvar no_lmtx_platforms \
- armhf-linux,amd64-netbsd,i386-netbsd,x86_64-solaris,i386-solaris
-#
-binpattern f/!${no_lmtx_platforms} bin/${ARCH}/context
-binpattern f/!${no_lmtx_platforms} bin/${ARCH}/context.lua
-binpattern f/!${no_lmtx_platforms} bin/${ARCH}/luametatex
-binpattern f/!${no_lmtx_platforms} bin/${ARCH}/mtxrun
-binpattern f/!${no_lmtx_platforms} bin/${ARCH}/mtxrun.lua
+binpattern f/!${global_no_lmtx_platforms} bin/${ARCH}/context
+binpattern f/!${global_no_lmtx_platforms} bin/${ARCH}/context.lua
+binpattern f/!${global_no_lmtx_platforms} bin/${ARCH}/luametatex
+binpattern f/!${global_no_lmtx_platforms} bin/${ARCH}/mtxrun
+binpattern f/!${global_no_lmtx_platforms} bin/${ARCH}/mtxrun.lua