From 864ebb89e0034d532b6bcacb2c5b88bdaef4eee4 Mon Sep 17 00:00:00 2001 From: Taco Hoekwater Date: Tue, 1 Jun 2010 18:02:18 +0000 Subject: Update mtxrun.dll to look in its own directory for texlua.exe when %PATH% is exhausted. git-svn-id: svn://tug.org/texlive/trunk@18678 c570f23f-e606-0410-a88d-b1316a301751 --- .../scripts/context/stubs/mswin/mtxrun.dll | Bin 9216 -> 8192 bytes .../scripts/context/stubs/source/mtxrun_dll.c | 23 ++++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/scripts/context') diff --git a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.dll b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.dll index 23e476cac49..041e1a0e1d0 100755 Binary files a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.dll and b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.dll differ diff --git a/Master/texmf-dist/scripts/context/stubs/source/mtxrun_dll.c b/Master/texmf-dist/scripts/context/stubs/source/mtxrun_dll.c index 5b7cd31a07b..27841c68764 100644 --- a/Master/texmf-dist/scripts/context/stubs/source/mtxrun_dll.c +++ b/Master/texmf-dist/scripts/context/stubs/source/mtxrun_dll.c @@ -113,13 +113,22 @@ __declspec(dllexport) int dllrunscript( int argc, char *argv[] ) // find texlua.exe if ( !SearchPath( - getenv( "PATH" ), // path to search (optional) - "texlua.exe", // file name to search - NULL, // file extension to add (optional) - MAX_PATH, // output buffer size - luatexpath, // output buffer pointer - &luatexfname ) // pointer to a file part in the output buffer (optional) - ) DIE( "unable to locate texlua.exe on the search path" ); + getenv( "PATH" ), // path to search (optional) + "texlua.exe", // file name to search + NULL, // file extension to add (optional) + MAX_PATH, // output buffer size + luatexpath, // output buffer pointer + &luatexfname ) // pointer to a file part in the output buffer (optional) + ) + if ( !SearchPath( + dirpath, // path to search (optional) + "texlua.exe", // file name to search + NULL, // file extension to add (optional) + MAX_PATH, // output buffer size + luatexpath, // output buffer pointer + &luatexfname ) // pointer to a file part in the output buffer (optional) + ) + DIE( "unable to locate texlua.exe on the search path" ); // link directly with luatex.dll if available in texlua's dir -- cgit v1.2.3