diff options
Diffstat (limited to 'scripts/context/stubs/mswin')
15 files changed, 26 insertions, 164 deletions
diff --git a/scripts/context/stubs/mswin/context.exe b/scripts/context/stubs/mswin/context.exe Binary files differindex 6b2c88311..0e7882cf9 100644 --- a/scripts/context/stubs/mswin/context.exe +++ b/scripts/context/stubs/mswin/context.exe diff --git a/scripts/context/stubs/mswin/ctxtools.exe b/scripts/context/stubs/mswin/ctxtools.exe Binary files differindex 6b2c88311..0e7882cf9 100644 --- a/scripts/context/stubs/mswin/ctxtools.exe +++ b/scripts/context/stubs/mswin/ctxtools.exe diff --git a/scripts/context/stubs/mswin/first-setup.bat b/scripts/context/stubs/mswin/first-setup.bat deleted file mode 100644 index f06ad0e6b..000000000 --- a/scripts/context/stubs/mswin/first-setup.bat +++ /dev/null @@ -1,87 +0,0 @@ -@echo off - -setlocal - -:fetch - -set OWNPATH=%~dp0 -set PATH=%OWNPATH%bin;%PATH% -set PLATFORM=mswin - -set CYGWIN=nontsec - -if defined ProgramFiles(x86) ( - set PLATFORM=win64 -) else ( - if "%PROCESSOR_ARCHITEW6432%"=="AMD64" set PLATFORM=win64 -) - -REM ~ copy /y bin\mtx-update.lua bin\x.lua - -if "%PLATFORM%" == "win64" goto update-win64 - -:update-win32 - -rsync -av --exclude 'rsync.exe' --exclude 'cygwin1.dll' --exclude 'cygiconv-2.dll' rsync://contextgarden.net/minimals/setup/mswin/bin/ bin - -goto update - -:update-win64 - -rsync -av --exclude 'rsync.exe' --exclude 'cygwin1.dll' --exclude 'cygiconv-2.dll' rsync://contextgarden.net/minimals/setup/win64/bin/ bin - -goto update - -:update - -REM ~ copy /y bin\x.lua bin\mtx-update.lua - -REM --mingw --nofiledatabase --engine=luatex - -mtxrun --script ./bin/mtx-update.lua --update --force --make --engine=all --context=beta --texroot=%OWNPATH%tex %* - -echo. -echo. -echo When you want to use context, you need to initialize the tree with: -echo. -echo %OWNPATH%tex\setuptex.bat %OWNPATH%tex -echo. -echo You can associate this command with a shortcut to the cmd prompt. -echo. -echo Alternatively you can add %OWNPATH%tex\texmf-%PLATFORM%\bin to your PATH -echo variable. -echo. -echo If you run from an editor you can specify the full path to mtxrun.exe: -echo. -echo. %OWNPATH%tex\texmf-%PLATFORM%\bin\mtxrun.exe --autogenerate --script context --autopdf ... -echo. - -:ruby - -echo okay > ok.log - -ruby -e "File.delete('ok.log')" - -if not exist "ok.log" goto end - -echo. -echo The distribution has been downloaded but if you want to run pdfTeX and/or XeTeX you -echo need to run this script with the following directive: -echo. -echo --platform=all -echo. -echo You then also need to install Ruby in order to be able to use texexec. After -echo installing Ruby you can run this script again which will give you the formats -echo needed, or you can run: -echo. -echo texexec --make --pdftex -echo texexec --make --xetex -echo. - -:okay - -del /q ok.log - -:end - -endlocal diff --git a/scripts/context/stubs/mswin/luatools.exe b/scripts/context/stubs/mswin/luatools.exe Binary files differindex 6b2c88311..0e7882cf9 100644 --- a/scripts/context/stubs/mswin/luatools.exe +++ b/scripts/context/stubs/mswin/luatools.exe diff --git a/scripts/context/stubs/mswin/metatex.exe b/scripts/context/stubs/mswin/metatex.exe Binary files differindex 6b2c88311..0e7882cf9 100644 --- a/scripts/context/stubs/mswin/metatex.exe +++ b/scripts/context/stubs/mswin/metatex.exe diff --git a/scripts/context/stubs/mswin/mptopdf.exe b/scripts/context/stubs/mswin/mptopdf.exe Binary files differindex 6b2c88311..0e7882cf9 100644 --- a/scripts/context/stubs/mswin/mptopdf.exe +++ b/scripts/context/stubs/mswin/mptopdf.exe diff --git a/scripts/context/stubs/mswin/mtxrun.dll b/scripts/context/stubs/mswin/mtxrun.dll Binary files differindex 943e76a4b..3c4481c31 100644 --- a/scripts/context/stubs/mswin/mtxrun.dll +++ b/scripts/context/stubs/mswin/mtxrun.dll diff --git a/scripts/context/stubs/mswin/mtxrun.exe b/scripts/context/stubs/mswin/mtxrun.exe Binary files differindex 6b2c88311..0e7882cf9 100644 --- a/scripts/context/stubs/mswin/mtxrun.exe +++ b/scripts/context/stubs/mswin/mtxrun.exe diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index ca5957f70..24f5e7744 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -16805,17 +16805,18 @@ local ownlibs = { -- order can be made better } +-- c:/data/develop/tex-context/tex/texmf-win64/bin/../../texmf-context/tex/context/base/data-tmf.lua +-- c:/data/develop/context/sources/data-tmf.lua + local ownlist = { - '.', - ownpath , - ownpath .. "/../sources", -- HH's development path + -- '.', + -- ownpath , + owntree .. "/../../../../context/sources", -- HH's development path owntree .. "/../../texmf-local/tex/context/base", owntree .. "/../../texmf-context/tex/context/base", - owntree .. "/../../texmf-dist/tex/context/base", owntree .. "/../../texmf/tex/context/base", owntree .. "/../../../texmf-local/tex/context/base", owntree .. "/../../../texmf-context/tex/context/base", - owntree .. "/../../../texmf-dist/tex/context/base", owntree .. "/../../../texmf/tex/context/base", } @@ -17745,8 +17746,16 @@ elseif e_argument("selfmerge") then runners.loadbase() local found = locate_libs() + if found then - utilities.merger.selfmerge(own.name,own.libs,{ found }) + local mtxrun = resolvers.findfile("mtxrun.lua") -- includes local name + if lfs.isfile(mtxrun) then + utilities.merger.selfmerge(mtxrun,own.libs,{ found }) + application.report("runner updated on resolved path: %s",mtxrun) + else + utilities.merger.selfmerge(own.name,own.libs,{ found }) + application.report("runner updated on relative path: %s",own.name) + end end elseif e_argument("selfclean") then @@ -17754,7 +17763,15 @@ elseif e_argument("selfclean") then -- remove embedded libraries runners.loadbase() - utilities.merger.selfclean(own.name) + + local mtxrun = resolvers.findfile("mtxrun.lua") -- includes local name + if lfs.isfile(mtxrun) then + utilities.merger.selfclean(mtxrun) + application.report("runner cleaned on resolved path: %s",mtxrun) + else + utilities.merger.selfclean(own.name) + application.report("runner cleaned on relative path: %s",own.name) + end elseif e_argument("selfupdate") then @@ -17996,6 +18013,8 @@ elseif e_argument("version") then application.version() + application.report("source path",environment.ownbin) + elseif e_argument("directives") then directives.show() diff --git a/scripts/context/stubs/mswin/mtxrunjit.exe b/scripts/context/stubs/mswin/mtxrunjit.exe Binary files differindex 6b2c88311..0e7882cf9 100644 --- a/scripts/context/stubs/mswin/mtxrunjit.exe +++ b/scripts/context/stubs/mswin/mtxrunjit.exe diff --git a/scripts/context/stubs/mswin/mtxworks.exe b/scripts/context/stubs/mswin/mtxworks.exe Binary files differindex 6b2c88311..0e7882cf9 100644 --- a/scripts/context/stubs/mswin/mtxworks.exe +++ b/scripts/context/stubs/mswin/mtxworks.exe diff --git a/scripts/context/stubs/mswin/pstopdf.exe b/scripts/context/stubs/mswin/pstopdf.exe Binary files differindex 6b2c88311..0e7882cf9 100644 --- a/scripts/context/stubs/mswin/pstopdf.exe +++ b/scripts/context/stubs/mswin/pstopdf.exe diff --git a/scripts/context/stubs/mswin/setuptex.bat b/scripts/context/stubs/mswin/setuptex.bat deleted file mode 100644 index b61fd4494..000000000 --- a/scripts/context/stubs/mswin/setuptex.bat +++ /dev/null @@ -1,70 +0,0 @@ -@ECHO OFF - -REM author: Hans Hagen - PRAGMA ADE - Hasselt NL - www.pragma-ade.com - -:userpath - -if "%SETUPTEX%"=="done" goto done - -if "%~s1"=="" goto selftest - -set TEXMFOS=%~s1texmf-mswin-64 -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -set TEXMFOS=%~s1\texmf-mswin-64 -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -set TEXMFOS=%~s1texmf-win64 -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -set TEXMFOS=%~s1\texmf-win64 -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -set TEXMFOS=%~s1texmf-mswin -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -set TEXMFOS=%~s1\texmf-mswin -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -set TEXMFOS=%~s1texmf-win32 -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -set TEXMFOS=%~s1\texmf-win32 -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -:selftest - -set TEXMFOS=%~d0%~p0texmf-mswin-64 -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -set TEXMFOS=%~d0%~p0\texmf-mswin-64 -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -set TEXMFOS=%~d0%~p0texmf-win64 -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -set TEXMFOS=%~d0%~p0\texmf-win64 -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -set TEXMFOS=%~d0%~p0texmf-mswin -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -set TEXMFOS=%~d0%~p0\texmf-mswin -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -set TEXMFOS=%~d0%~p0texmf-win32 -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -set TEXMFOS=%~d0%~p0\texmf-win32 -if exist %TEXMFOS%\bin\mtxrun.exe goto start - -:start - -set PATH=%TEXMFOS%\bin;%PATH% - -:register - -set SETUPTEX=done -set CTXMINIMAL=yes - -:done diff --git a/scripts/context/stubs/mswin/texexec.exe b/scripts/context/stubs/mswin/texexec.exe Binary files differindex 6b2c88311..0e7882cf9 100644 --- a/scripts/context/stubs/mswin/texexec.exe +++ b/scripts/context/stubs/mswin/texexec.exe diff --git a/scripts/context/stubs/mswin/texmfstart.exe b/scripts/context/stubs/mswin/texmfstart.exe Binary files differindex 6b2c88311..0e7882cf9 100644 --- a/scripts/context/stubs/mswin/texmfstart.exe +++ b/scripts/context/stubs/mswin/texmfstart.exe |