summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-09-28 18:30:44 +0000
committerKarl Berry <karl@freefriends.org>2008-09-28 18:30:44 +0000
commit40ea2db99a6e549681b8025355970e7cdcc15c40 (patch)
tree8a66499256208d0004a50bc351c997ed5f13d8fe /Build/source/texk
parent47ce4b4525dfb52a317806c2d697b7c6db710243 (diff)
luatools + mtxrun for future builds
git-svn-id: svn://tug.org/texlive/trunk@10775 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/texlive/ChangeLog6
-rw-r--r--Build/source/texk/texlive/Makefile.in4
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/luatools.lua (renamed from Build/source/texk/texlive/linked_scripts/luatools)3
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/mtxrun.lua (renamed from Build/source/texk/texlive/linked_scripts/mtxrun)3
4 files changed, 14 insertions, 2 deletions
diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog
index f7f9b4784dd..ea571ebf26d 100644
--- a/Build/source/texk/texlive/ChangeLog
+++ b/Build/source/texk/texlive/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-28 Karl Berry <karl@tug.org>
+
+ * Makefile.in (LINKED_SCRIPTS): mtxrun and luatools now link to
+ the .lua files instead of stubs. tldev mail from mojca,
+ 25 Sep 2008 11:38:14.
+
2008-07-11 Karl Berry <karl@tug.org>
* Makefile.in (LINKED_SCRIPTS): mistyped epsf for eps.
diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in
index a9dc4566ad0..33959868f09 100644
--- a/Build/source/texk/texlive/Makefile.in
+++ b/Build/source/texk/texlive/Makefile.in
@@ -41,14 +41,14 @@ LINKED_SCRIPTS = \
texmf-dist/scripts/thumbpdf/thumbpdf.pl \
texmf-dist/scripts/vpe/vpe.pl \
texmf-dist/scripts/context/ruby/texmfstart.rb \
+ texmf-dist/scripts/context/lua/luatools.lua \
+ texmf-dist/scripts/context/lua/mtxrun.lua \
texmf-dist/scripts/context/stubs/unix/context \
texmf-dist/scripts/context/stubs/unix/ctxtools \
texmf-dist/scripts/context/stubs/unix/exatools \
- texmf-dist/scripts/context/stubs/unix/luatools \
texmf-dist/scripts/context/stubs/unix/makempy \
texmf-dist/scripts/context/stubs/unix/mpstools \
texmf-dist/scripts/context/stubs/unix/mptopdf \
- texmf-dist/scripts/context/stubs/unix/mtxrun \
texmf-dist/scripts/context/stubs/unix/mtxtools \
texmf-dist/scripts/context/stubs/unix/pdftools \
texmf-dist/scripts/context/stubs/unix/pdftrimwhite \
diff --git a/Build/source/texk/texlive/linked_scripts/luatools b/Build/source/texk/texlive/linked_scripts/luatools.lua
index 89e5e0eb4db..35986137950 100755
--- a/Build/source/texk/texlive/linked_scripts/luatools
+++ b/Build/source/texk/texlive/linked_scripts/luatools.lua
@@ -3739,7 +3739,10 @@ function input.expand_variables(instance)
end
if not busy then break end
end
+ local homedir =
+ instance.environment[(os.type == "windows" and 'USERPROFILE') or 'HOME'] or '~'
for k,v in pairs(instance.expansions) do
+ v = v:gsub("^~", homedir)
instance.expansions[k] = v:gsub("\\", '/')
end
end
diff --git a/Build/source/texk/texlive/linked_scripts/mtxrun b/Build/source/texk/texlive/linked_scripts/mtxrun.lua
index 040214178b8..0fb45cc635b 100755
--- a/Build/source/texk/texlive/linked_scripts/mtxrun
+++ b/Build/source/texk/texlive/linked_scripts/mtxrun.lua
@@ -5815,7 +5815,10 @@ function input.expand_variables(instance)
end
if not busy then break end
end
+ local homedir =
+ instance.environment[(os.type == "windows" and 'USERPROFILE') or 'HOME'] or '~'
for k,v in pairs(instance.expansions) do
+ v = v:gsub("^~", homedir)
instance.expansions[k] = v:gsub("\\", '/')
end
end