diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/kpathsea/doc/kpathsea.info | 80 | ||||
| -rw-r--r-- | Build/source/texk/texlive/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/texlive/Makefile.am | 8 | ||||
| -rw-r--r-- | Build/source/texk/texlive/Makefile.in | 38 | ||||
| -rwxr-xr-x | Build/source/texk/texlive/tl-w32-starter.bat | 78 | ||||
| -rw-r--r-- | Build/source/texk/texlive/tl-w32-wrapper.cmd | 90 |
6 files changed, 161 insertions, 139 deletions
diff --git a/Build/source/texk/kpathsea/doc/kpathsea.info b/Build/source/texk/kpathsea/doc/kpathsea.info index 52aefdd4ec7..ebb3184829d 100644 --- a/Build/source/texk/kpathsea/doc/kpathsea.info +++ b/Build/source/texk/kpathsea/doc/kpathsea.info @@ -1874,7 +1874,7 @@ the Pascal arrays have a lower index other than 0, and the C code will take the pointer to the allocated memory, subtract the lower index, and use the resulting pointer for the array. While this trick often works, ANSI C doesn't guarantee that it will. It it known to fail on HP-UX 10 -mchines when the native compiler is used, unless the `+u' compiler +machines when the native compiler is used, unless the `+u' compiler switch was specified. Using GCC will work on this platform as well. @@ -4876,44 +4876,44 @@ Node: Unable to find files71070 Node: Slow path searching73481 Node: Unable to generate fonts74858 Node: TeX or Metafont failing77367 -Node: Empty Makefiles79245 -Node: XtStrings80475 -Node: dlopen81311 -Node: ShellWidgetClass82129 -Node: Pointer combination warnings83761 -Node: Path searching84150 -Node: Searching overview84797 -Node: Path sources88193 -Node: Config files89264 -Node: Path expansion92909 -Node: Default expansion93858 -Node: Variable expansion95928 -Node: Tilde expansion97331 -Node: Brace expansion98311 -Node: KPSE_DOT expansion99416 -Node: Subdirectory expansion99929 -Node: Filename database102280 -Node: ls-R103334 -Node: Filename aliases106228 -Node: Database format107406 -Node: Invoking kpsewhich108419 -Node: Path searching options109364 -Node: Specially-recognized files116639 -Node: Auxiliary tasks117995 -Node: Standard options119820 -Node: TeX support120140 -Node: Supported file formats121431 -Node: File lookup128947 -Node: Glyph lookup130679 -Node: Basic glyph lookup131803 -Node: Fontmap132682 -Node: Fallback font135299 -Node: Suppressing warnings136212 -Node: Programming137317 -Node: Programming overview137830 -Node: Calling sequence140524 -Node: Program-specific files147047 -Node: Programming with config files148089 -Node: Index149401 +Node: Empty Makefiles79246 +Node: XtStrings80476 +Node: dlopen81312 +Node: ShellWidgetClass82130 +Node: Pointer combination warnings83762 +Node: Path searching84151 +Node: Searching overview84798 +Node: Path sources88194 +Node: Config files89265 +Node: Path expansion92910 +Node: Default expansion93859 +Node: Variable expansion95929 +Node: Tilde expansion97332 +Node: Brace expansion98312 +Node: KPSE_DOT expansion99417 +Node: Subdirectory expansion99930 +Node: Filename database102281 +Node: ls-R103335 +Node: Filename aliases106229 +Node: Database format107407 +Node: Invoking kpsewhich108420 +Node: Path searching options109365 +Node: Specially-recognized files116640 +Node: Auxiliary tasks117996 +Node: Standard options119821 +Node: TeX support120141 +Node: Supported file formats121432 +Node: File lookup128948 +Node: Glyph lookup130680 +Node: Basic glyph lookup131804 +Node: Fontmap132683 +Node: Fallback font135300 +Node: Suppressing warnings136213 +Node: Programming137318 +Node: Programming overview137831 +Node: Calling sequence140525 +Node: Program-specific files147048 +Node: Programming with config files148090 +Node: Index149402 End Tag Table diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog index e9358ab266f..181bf3d1fc5 100644 --- a/Build/source/texk/texlive/ChangeLog +++ b/Build/source/texk/texlive/ChangeLog @@ -1,3 +1,9 @@ +2009-09-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * tl-w32-starter.bat (removed): Replaced ... + * tl-w32-wrapper.cmd (new): ... by this. + * Makefile.am (EXTRA_DIST): Adapted. + 2009-11-25 Karl Berry <karl@tug.org> * Makefile.am (dist_man1_MANS): remove this, as getnonfreefonts diff --git a/Build/source/texk/texlive/Makefile.am b/Build/source/texk/texlive/Makefile.am index 7c5fbb00682..064ed4341a2 100644 --- a/Build/source/texk/texlive/Makefile.am +++ b/Build/source/texk/texlive/Makefile.am @@ -9,7 +9,12 @@ SUBDIRS = linked_scripts ## Win32 wrapper ## -EXTRA_DIST = runscript_dll.c runscript_exe.c runscript.dll runscript.exe +EXTRA_DIST = \ + runscript_dll.c \ + runscript_exe.c \ + runscript.dll \ + runscript.exe \ + tl-w32-wrapper.cmd ## Not used ## @@ -80,7 +85,6 @@ EXTRA_DIST += \ texinfo texinfo.bat \ texsis texsis.bat \ text1 text1.bat \ - tl-w32-starter.bat \ virmf \ virmpost \ viromega \ diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in index e5c974e6c8f..443a852df5d 100644 --- a/Build/source/texk/texlive/Makefile.in +++ b/Build/source/texk/texlive/Makefile.in @@ -192,25 +192,25 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 SUBDIRS = linked_scripts EXTRA_DIST = runscript_dll.c runscript_exe.c runscript.dll \ - runscript.exe amstex amstex.bat blue.bat cont-cz.bat cont-de \ - cont-de.bat cont-en cont-en.bat cont-nl cont-nl.bat \ - cont-ro.bat cont-uk.bat cslatex cslatex.bat cslatexd.bat \ - cslatexi.bat cslatexk.bat csplain csplain.bat csplaind.bat \ - csplaini.bat csplaink.bat einitex elatex elatex.bat eplain \ - eplain.bat evirtex giftopng hugelatex hugelatex.bat hugetex \ - hugetex.bat inimf inimpost iniomega initex jadetex jadetex.bat \ - lambda lamstex.bat latex lollipop.bat mex mex.bat mex-pl.bat \ - mllatex mllatex.bat mltex mltex.bat mptopdf nts pdfcslatex \ - pdfcslatex.bat pdfcslatexd.bat pdfcslatexi.bat pdfcslatexk.bat \ - pdfcsplain pdfcsplain.bat pdfcsplaind.bat pdfcsplaini.bat \ - pdfcsplaink.bat pdfeinitex pdfemex-pl.bat pdfevirtex pdfinitex \ - pdfjadetex pdfjadetex.bat pdflatex pdfmex pdfmex.bat \ - pdfmex-pl.bat pdfplatex pdfplatex-pl.bat pdftexinfo \ - pdftexinfo.bat pdfvirtex pdfxmltex physe physe.bat phyzzx \ - phyzzx.bat platex platex.bat platex-pl.bat startex startex.bat \ - texinfo texinfo.bat texsis texsis.bat text1 text1.bat \ - tl-w32-starter.bat virmf virmpost viromega virtex xeinitex \ - xelatex xevirtex xmltex + runscript.exe tl-w32-wrapper.cmd amstex amstex.bat blue.bat \ + cont-cz.bat cont-de cont-de.bat cont-en cont-en.bat cont-nl \ + cont-nl.bat cont-ro.bat cont-uk.bat cslatex cslatex.bat \ + cslatexd.bat cslatexi.bat cslatexk.bat csplain csplain.bat \ + csplaind.bat csplaini.bat csplaink.bat einitex elatex \ + elatex.bat eplain eplain.bat evirtex giftopng hugelatex \ + hugelatex.bat hugetex hugetex.bat inimf inimpost iniomega \ + initex jadetex jadetex.bat lambda lamstex.bat latex \ + lollipop.bat mex mex.bat mex-pl.bat mllatex mllatex.bat mltex \ + mltex.bat mptopdf nts pdfcslatex pdfcslatex.bat \ + pdfcslatexd.bat pdfcslatexi.bat pdfcslatexk.bat pdfcsplain \ + pdfcsplain.bat pdfcsplaind.bat pdfcsplaini.bat pdfcsplaink.bat \ + pdfeinitex pdfemex-pl.bat pdfevirtex pdfinitex pdfjadetex \ + pdfjadetex.bat pdflatex pdfmex pdfmex.bat pdfmex-pl.bat \ + pdfplatex pdfplatex-pl.bat pdftexinfo pdftexinfo.bat pdfvirtex \ + pdfxmltex physe physe.bat phyzzx phyzzx.bat platex platex.bat \ + platex-pl.bat startex startex.bat texinfo texinfo.bat texsis \ + texsis.bat text1 text1.bat virmf virmpost viromega virtex \ + xeinitex xelatex xevirtex xmltex all: all-recursive .SUFFIXES: diff --git a/Build/source/texk/texlive/tl-w32-starter.bat b/Build/source/texk/texlive/tl-w32-starter.bat deleted file mode 100755 index 9c8c504c1e4..00000000000 --- a/Build/source/texk/texlive/tl-w32-starter.bat +++ /dev/null @@ -1,78 +0,0 @@ -@echo off
-rem Universal script launcher
-rem
-rem Public Domain
-rem Originally written 2009 by Tomasz M. Trzeciak.
-
-rem Make environment changes local
-setlocal enableextensions
-rem Get program/script name
-set progname=%~n0
-rem Check if this is 'sys' version of program
-set TEX_SYS_PROG=
-if /i "%progname:~-4%"=="-sys" (
- set progname=%progname:~0,-4%
- set TEX_SYS_PROG=true
-)
-
-rem Default command to execute
-set command=call :noscript
-rem Make sure our dir is on the search path; avoid trailing backslash
-for %%I in ("%~f0\..") do path %%~fI;%path%
-rem Ask kpsewhich about root and texmfsys trees (the first line of output)
-rem and location of the script (the second line of output)
-rem (4NT shell acts wierd with 'if' statements in a 'for' loop,
-rem so better process this output further in a subroutine)
-for /f "tokens=1-3 delims=;" %%I in (
- 'kpsewhich --expand-var "$SELFAUTOPARENT;$TEXMFSYSCONFIG;$TEXMFSYSVAR" ^
- --format texmfscripts "%progname%.pl" "%progname%.tlu" "%progname%.rb" "%progname%.py"'
-) do (
- call :setcmdenv "%%~I" "%%~J" "%%~K"
-)
-
-rem By now we should have the command to execute (whatever that is), so
-rem pass through all the arguments we have and execute it
-%command% %*
-rem Finish with goto :eof (it will preserve the last set errorlevel)
-goto :eof
-
-REM SUBROUTINES
-
-:setcmdenv selfautoparent texmfsysconfig texmfsysvar
-rem If there is only one argument it must be a script name
-if "%~2"=="" goto :setcmd
-rem Otherwise, it is the first line from kpsewhich, so to set up the environment
-set PERL5LIB=%~f1\tlpkg\tlperl\lib
-set GS_LIB=%~f1\tlpkg\tlgs\lib;%~f1\tlpkg\tlgs\fonts
-path %~f1\tlpkg\tlgs\bin;%~f1\tlpkg\tlperl\bin;%~f1\tlpkg\installer;%~f1\tlpkg\installer\wget;%path%
-if not defined TEX_SYS_PROG goto :eof
-rem Extra stuff for sys version
-set TEXMFCONFIG=%~2
-set TEXMFVAR=%~3
-rem For sys version we might have an executable in the bin dir, so check for it
-if exist "%~f1\bin\win32\%progname%.exe" set command="%~f1\bin\win32\%progname%.exe"
-goto :eof
-
-:setcmd script
-rem Set command based on the script extension
-if /i %~x1==.pl set command=Perl.exe "%~f1"
-if /i %~x1==.tlu set command=TeXLua.exe "%~f1"
-rem For Ruby and Python we additionally check if their interpreter is available
-if /i %~x1==.rb call :chkcmd Ruby.exe "%~f1"
-if /i %~x1==.py call :chkcmd Python.exe "%~f1"
-goto :eof
-
-:chkcmd program script
-set command=%*
-rem If there is no interpreter Ruby or Python, suggest getting one
-if "%~$PATH:1"=="" set command=call :noinst %*
-goto :eof
-
-:noinst program
-echo %1 not found on search path>&2
-echo %~n1 is not distributed with TeX Live and has to be installed separately
-exit /b 1
-
-:noscript
-echo %progname%: no appropriate script or program found>&2
-exit /b 1
diff --git a/Build/source/texk/texlive/tl-w32-wrapper.cmd b/Build/source/texk/texlive/tl-w32-wrapper.cmd new file mode 100644 index 00000000000..abf2bf1578e --- /dev/null +++ b/Build/source/texk/texlive/tl-w32-wrapper.cmd @@ -0,0 +1,90 @@ +@echo off +rem Universal script launcher +rem +rem Originally written 2009 by Tomasz M. Trzeciak +rem Public Domain + +rem Make environment changes local +setlocal enableextensions +rem Get program/script name +if not defined TL_PROGNAME set TL_PROGNAME=%~n0 +rem Check if this is 'sys' version of program +set TEX_SYS_PROG= +if /i "%TL_PROGNAME:~-4%"=="-sys" ( + set TL_PROGNAME=%TL_PROGNAME:~0,-4% + set TEX_SYS_PROG=true +) + +rem Default command to execute +set CMDLINE=call :noscript "%~0" "%TL_PROGNAME%" +rem Make sure our dir is on the search path; avoid trailing backslash +set TL_ROOT=%~dp0? +set TL_ROOT=%TL_ROOT:\bin\win32\?=% +path %TL_ROOT%\bin\win32;%path% +rem Check for kpsewhich availability +if not exist "%TL_ROOT%\bin\win32\kpsewhich.exe" goto :nokpsewhich +rem Ask kpsewhich about root and texmfsys trees (the first line of output) +rem and location of the script (the second line of output) +rem (4NT shell acts wierd with 'if' statements in a 'for' loop, +rem so better process this output further in a subroutine) +for /f "tokens=1-2 delims=;" %%I in ( + 'call "%~dp0kpsewhich.exe" --expand-var "$TEXMFSYSCONFIG/?;$TEXMFSYSVAR/?" --format texmfscripts ^ + "%TL_PROGNAME%.pl" "%TL_PROGNAME%.tlu" "%TL_PROGNAME%.rb" "%TL_PROGNAME%.py"' +) do ( + call :setcmdenv "%%~I" "%%~J" +) + +rem By now we should have the command to execute (whatever it is) +rem Unset program name variable and execute the command +set TL_PROGNAME= +%CMDLINE% %* +rem Finish with goto :eof (it will preserve the last errorlevel) +goto :eof + +REM SUBROUTINES + +:setcmdenv selfautoparent texmfsysconfig texmfsysvar +rem If there is only one argument it must be a script name +if "%~2"=="" goto :setcmd +rem Otherwise, it is the first line from kpsewhich, so to set up the environment +set PERL5LIB=%TL_ROOT%\tlpkg\tlperl\lib +set GS_LIB=%TL_ROOT%\tlpkg\tlgs\lib;%TL_ROOT%\tlpkg\tlgs\fonts +path %TL_ROOT%\tlpkg\tlgs\bin;%TL_ROOT%\tlpkg\tlperl\bin;%TL_ROOT%\tlpkg\installer;%TL_ROOT%\tlpkg\installer\wget;%path% +if not defined TEX_SYS_PROG goto :eof +rem Extra stuff for sys version +set TEXMFCONFIG=%~1 +set TEXMFCONFIG=%TEXMFCONFIG:/?=% +set TEXMFVAR=%~2 +set TEXMFVAR=%TEXMFVAR:/?=% +rem For sys version we might have an executable in the bin dir, so check for it +if exist "%TL_ROOT%\bin\win32\%TL_PROGNAME%.exe" set CMDLINE="%TL_ROOT%\bin\win32\%TL_PROGNAME%.exe" +goto :eof + +:setcmd script +rem Set command based on the script extension +if /i %~x1==.pl set CMDLINE="%TL_ROOT%\tlpkg\tlperl\bin\perl.exe" "%~f1" +if /i %~x1==.tlu set CMDLINE="%TL_ROOT%\bin\win32\texlua.exe" "%~f1" +rem For Ruby and Python we additionally check if their interpreter is available +if /i %~x1==.rb call :chkcmd Ruby.exe "%~f1" +if /i %~x1==.py call :chkcmd Python.exe "%~f1" +goto :eof + +:chkcmd program script +set CMDLINE=%* +rem If there is no interpreter Ruby or Python, suggest getting one +if "%~$PATH:1"=="" set CMDLINE=call :notinstalled %* +goto :eof + +:notinstalled program +echo %1 not found on search path>&2 +echo %~n1 is not distributed with TeX Live and has to be installed separately +exit /b 1 + +:noscript this_file program_name +echo %~nx1: no appropriate script or program found: "%~2">&2 +exit /b 1 + +:nokpsewhich +echo %~nx0: kpsewhich not found: "%~dp0kpsewhich.exe">&2 +exit /b 1 + |