diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-11-17 12:28:11 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-11-17 12:28:11 +0000 |
| commit | f9abbd4480558852ac23ae084ffdfe7314c85055 (patch) | |
| tree | e5e9166ac8da83f93fd93814718574343b015b9f /Build/source | |
| parent | c7e0b092294e4f2c5a1accbd07694c7e42017bbd (diff) | |
Build system: Use 64-bit Windows wrapper binaries for 64-bit MinGW
git-svn-id: svn://tug.org/texlive/trunk@35596 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
47 files changed, 1026 insertions, 142 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index a3a1768bd2c..cc4e595f6cd 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,3 +1,7 @@ +2014-11-17 Karl Berry <karl@tug.org> + + * am/script_links.am: Use w32_wrapper or w64_wrapper. + 2014-10-21 Karl Berry <karl@tug.org> * configure.ac: report CC/CXX values, with --version output diff --git a/Build/source/am/script_links.am b/Build/source/am/script_links.am index 102d56707d0..e12e09edc9c 100644 --- a/Build/source/am/script_links.am +++ b/Build/source/am/script_links.am @@ -1,6 +1,6 @@ ## am/script_links.am: Makefile fragment for lua/perl/shell script links. ## -## Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ## Install/uninstall 'linked scripts' or win32 wrappers: @@ -29,7 +29,7 @@ if WIN32_WRAP ## We treat the WIN32 wrappers as SCRIPTS to avoid automatic build rules wrappers = $(all_scripts:=.exe) nodist_bin_SCRIPTS += $(wrappers) -runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe +runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe $(wrappers): $(runscript) $(AM_V_GEN)$(LN_S) $(runscript) $@ endif WIN32_WRAP diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index 15d9eeada3b..d5882502be9 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,7 @@ +2014-11-17 Peter Breitenlohner <peb@mppmu.mpg.de> + + * kpse-win32.m4: Check for WIN64 and AC_SUBST([WIN_WRAPPER]). + 2014-10-22 Peter Breitenlohner <peb@mppmu.mpg.de> * kpse-lua52-flags.m4: Lua52 is now a Libtool library. diff --git a/Build/source/m4/kpse-win32.m4 b/Build/source/m4/kpse-win32.m4 index 4f1ac085149..9d6375404fa 100644 --- a/Build/source/m4/kpse-win32.m4 +++ b/Build/source/m4/kpse-win32.m4 @@ -13,10 +13,10 @@ AC_CACHE_CHECK([for native WIN32 or MINGW32], [kpse_cv_have_win32], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef WIN32 choke me -#endif]], [[]])], +#endif]])], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef __MINGW32__ choke me -#endif]], [[]])], +#endif]])], [kpse_cv_have_win32=mingw32], [kpse_cv_have_win32=native])], [kpse_cv_have_win32=no])]) @@ -43,8 +43,19 @@ AM_CONDITIONAL([MINGW32], [test "x$kpse_cv_have_win32" = xmingw32]) # Define the conditionals WIN32 and WIN32_WRAP. AC_DEFUN([KPSE_COND_WIN32_WRAP], [dnl AC_REQUIRE([KPSE_COND_WIN32])[]dnl +AC_CACHE_CHECK([for WIN64], + [kpse_cv_have_win64], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef _WIN64 + choke me +#endif]])], + [kpse_cv_have_win64=yes], + [kpse_cv_have_win64=no])]) +AS_CASE([$kpse_cv_have_win64], + [yes], [WIN_WRAPPER=w64_wrapper], + [WIN_WRAPPER=w32_wrapper]) +AC_SUBST([WIN_WRAPPER]) AM_CONDITIONAL([WIN32_WRAP], - [test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"]) + [test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"]) ]) # KPSE_COND_WIN32_WRAP # KPSE_WIN32_CALL diff --git a/Build/source/texk/chktex/Makefile.in b/Build/source/texk/chktex/Makefile.in index 3d7a3f7df29..62fd19ab85b 100644 --- a/Build/source/texk/chktex/Makefile.in +++ b/Build/source/texk/chktex/Makefile.in @@ -506,6 +506,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +WIN_WRAPPER = @WIN_WRAPPER@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -595,7 +596,7 @@ scriptsdir = texmf-dist/scripts/chktex nodist_bin_SCRIPTS = $(am__append_2) all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) -@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe +@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(perl_scripts:=.pl) texmf_SCRIPTS = $(CHKTEX_TREE)/chkweb.sh diff --git a/Build/source/texk/chktex/configure b/Build/source/texk/chktex/configure index 936720caaf4..69c35425898 100755 --- a/Build/source/texk/chktex/configure +++ b/Build/source/texk/chktex/configure @@ -644,6 +644,7 @@ PERL5 CHKTEX_TREE WIN32_WRAP_FALSE WIN32_WRAP_TRUE +WIN_WRAPPER MINGW32_FALSE MINGW32_TRUE WIN32_FALSE @@ -13272,7 +13273,41 @@ else fi - if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WIN64" >&5 +$as_echo_n "checking for WIN64... " >&6; } +if ${kpse_cv_have_win64+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef _WIN64 + choke me +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_win64=yes +else + kpse_cv_have_win64=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win64" >&5 +$as_echo "$kpse_cv_have_win64" >&6; } +case $kpse_cv_have_win64 in #( + yes) : + WIN_WRAPPER=w64_wrapper ;; #( + *) : + WIN_WRAPPER=w32_wrapper ;; +esac + + if test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"; then WIN32_WRAP_TRUE= WIN32_WRAP_FALSE='#' else diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index e4a2a5ca804..69e6fd8582c 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -110,8 +110,8 @@ DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/c-auto.in \ - $(srcdir)/kpathsea.pc.in putenv.c strcasecmp.c strstr.c \ - strtol.c $(dist_noinst_SCRIPTS) $(dist_web2c_SCRIPTS) \ + $(srcdir)/kpathsea.pc.in putenv.c strtol.c strstr.c \ + strcasecmp.c $(dist_noinst_SCRIPTS) $(dist_web2c_SCRIPTS) \ $(top_srcdir)/../../build-aux/depcomp $(dist_noinst_DATA) \ $(dist_web2c_DATA) $(kpseinclude_HEADERS) $(noinst_HEADERS) \ $(top_srcdir)/../../build-aux/test-driver AUTHORS ChangeLog \ diff --git a/Build/source/texk/psutils/Makefile.in b/Build/source/texk/psutils/Makefile.in index e78f73d697f..d2191164434 100644 --- a/Build/source/texk/psutils/Makefile.in +++ b/Build/source/texk/psutils/Makefile.in @@ -537,6 +537,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +WIN_WRAPPER = @WIN_WRAPPER@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -628,7 +629,7 @@ scriptsdir = texmf-dist/scripts/psutils nodist_bin_SCRIPTS = $(am__append_1) all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) -@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe +@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe texmfdir = $(datarootdir)/$(scriptsdir) texmf_SCRIPTS = $(perl_scripts:=.pl) man1_MANS = \ diff --git a/Build/source/texk/psutils/configure b/Build/source/texk/psutils/configure index b557a3a7a6a..448eeab3985 100755 --- a/Build/source/texk/psutils/configure +++ b/Build/source/texk/psutils/configure @@ -639,6 +639,7 @@ LIBOBJS PSUTILS_TREE WIN32_WRAP_FALSE WIN32_WRAP_TRUE +WIN_WRAPPER WIN32_FALSE WIN32_TRUE LIBPAPER_RULE @@ -14503,7 +14504,41 @@ else fi - if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WIN64" >&5 +$as_echo_n "checking for WIN64... " >&6; } +if ${kpse_cv_have_win64+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef _WIN64 + choke me +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_win64=yes +else + kpse_cv_have_win64=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win64" >&5 +$as_echo "$kpse_cv_have_win64" >&6; } +case $kpse_cv_have_win64 in #( + yes) : + WIN_WRAPPER=w64_wrapper ;; #( + *) : + WIN_WRAPPER=w32_wrapper ;; +esac + + if test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"; then WIN32_WRAP_TRUE= WIN32_WRAP_FALSE='#' else diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index a6da6413ec4..eaf369530f2 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -312,6 +312,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +WIN_WRAPPER = @WIN_WRAPPER@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -392,7 +393,7 @@ scriptsdir = texmf-dist/scripts/tex4ht nodist_bin_SCRIPTS = $(am__append_1) all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) -@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe +@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe texmfdir = $(datarootdir)/$(scriptsdir) dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) @WIN32_TRUE@dist_bin_SCRIPTS = $(shell_scripts:=.bat) diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure index e08eee83fd1..e393e79f692 100755 --- a/Build/source/texk/tex4htk/configure +++ b/Build/source/texk/tex4htk/configure @@ -638,6 +638,7 @@ LTLIBOBJS LIBOBJS WIN32_WRAP_FALSE WIN32_WRAP_TRUE +WIN_WRAPPER WIN32_FALSE WIN32_TRUE KPATHSEA_RULE @@ -14669,7 +14670,41 @@ else fi - if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WIN64" >&5 +$as_echo_n "checking for WIN64... " >&6; } +if ${kpse_cv_have_win64+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef _WIN64 + choke me +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_win64=yes +else + kpse_cv_have_win64=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win64" >&5 +$as_echo "$kpse_cv_have_win64" >&6; } +case $kpse_cv_have_win64 in #( + yes) : + WIN_WRAPPER=w64_wrapper ;; #( + *) : + WIN_WRAPPER=w32_wrapper ;; +esac + + if test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"; then WIN32_WRAP_TRUE= WIN32_WRAP_FALSE='#' else diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog index 2fe43b5633f..9109c82fb95 100644 --- a/Build/source/texk/texlive/ChangeLog +++ b/Build/source/texk/texlive/ChangeLog @@ -1,3 +1,8 @@ +2014-11-17 Peter Breitenlohner <peb@mppmu.mpg.de> + + * w64_wrapper: Directory with WIN64 executables. + * Makefile.am: Add the new directory. + 2014-07-15 Peter Breitenlohner <peb@mppmu.mpg.de> * w32_wrapper/callexe.c: Replace the deprecated spawnvp() by diff --git a/Build/source/texk/texlive/Makefile.am b/Build/source/texk/texlive/Makefile.am index 3b617605028..ab4c5d27cb9 100644 --- a/Build/source/texk/texlive/Makefile.am +++ b/Build/source/texk/texlive/Makefile.am @@ -8,9 +8,9 @@ if LINKED_SCRIPTS SUBDIRS += linked_scripts endif LINKED_SCRIPTS -## Windows wrapper sources. +## Windows wrapper and sources. ## -EXTRA_DIST = w32_wrapper +EXTRA_DIST = w32_wrapper w64_wrapper ## Tests ## diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in index 08cde43a943..aed50619a99 100644 --- a/Build/source/texk/texlive/Makefile.in +++ b/Build/source/texk/texlive/Makefile.in @@ -444,6 +444,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +WIN_WRAPPER = @WIN_WRAPPER@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -487,7 +488,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = tl_scripts $(am__append_1) -EXTRA_DIST = w32_wrapper $(TESTS) +EXTRA_DIST = w32_wrapper w64_wrapper $(TESTS) TESTS = tests/updmap-cmdline-test.pl all: all-recursive diff --git a/Build/source/texk/texlive/configure b/Build/source/texk/texlive/configure index 3a2d6da9e44..664a58b451f 100755 --- a/Build/source/texk/texlive/configure +++ b/Build/source/texk/texlive/configure @@ -591,6 +591,7 @@ LTLIBOBJS LIBOBJS WIN32_WRAP_FALSE WIN32_WRAP_TRUE +WIN_WRAPPER WIN32_FALSE WIN32_TRUE LN_S @@ -3593,7 +3594,41 @@ else fi - if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WIN64" >&5 +$as_echo_n "checking for WIN64... " >&6; } +if ${kpse_cv_have_win64+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef _WIN64 + choke me +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_win64=yes +else + kpse_cv_have_win64=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win64" >&5 +$as_echo "$kpse_cv_have_win64" >&6; } +case $kpse_cv_have_win64 in #( + yes) : + WIN_WRAPPER=w64_wrapper ;; #( + *) : + WIN_WRAPPER=w32_wrapper ;; +esac + + if test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"; then WIN32_WRAP_TRUE= WIN32_WRAP_FALSE='#' else diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog index 694c28d4a01..a48f9ca7370 100644 --- a/Build/source/texk/texlive/linked_scripts/ChangeLog +++ b/Build/source/texk/texlive/linked_scripts/ChangeLog @@ -1,3 +1,7 @@ +2014-11-17 Karl Berry <karl@tug.org> + + * Makefile.am: Use WIN_WRAPPER (w32_wrapper or w64_wrapper). + 2014-07-18 Karl Berry <karl@tug.org> * Makefile.am (bin_links): mkluatexfontdb gone. diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am index d55a854cabb..dd9cf08d2fb 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.am +++ b/Build/source/texk/texlive/linked_scripts/Makefile.am @@ -39,9 +39,11 @@ installdirs-local: ## On Unix systems a symlink from $(bindir) to the script is installed ## for all of them; on Windows nothing is installed in $(bindir) for ## `shell' scripts whereas for `other' (usually perl, lua, ...) scripts -## the standard wrapper ../w32_wrapper/runscript.exe is installed or the -## ConTeXt wrapper ../w32_wrapper/context/mtxrun.exe for `context' -## scripts. +## the standard wrapper ../$(WIN_WRAPPER)/runscript.exe is installed or +## the ConTeXt wrapper ../$(WIN_WRAPPER)/context/mtxrun.exe for +## `context' scripts. +## +## WIN_WRAPPER is w32_wrapper for 32-bit or w64_wrapper for 64-bit. ## ## Some /bin/sh scripts are listed as `other' or `context' ## scripts because they are correctly handled by the wrapper binaries. @@ -200,7 +202,7 @@ bin_links = \ # ../../texmf-dist/scripts/foo/foo.pl. That way we save a bit of disk # space, but more importantly omit duplication, and most # importantly of all make it possible to invoke the same Perl script on -# Windows (see ../w32_wrapper). +# Windows (see ../$(WIN_WRAPPER)). # # The installation into texmf*/scripts is ideally done with ctan2tl. # The copy of the wrapper for Windows is also done by ctan2tl. (And @@ -217,8 +219,8 @@ bin_links = \ # EXTRA_DIST += ../../../build-aux/relpath relpath = $(SHELL) $(top_srcdir)/../../build-aux/relpath -runscript = $(top_srcdir)/w32_wrapper/runscript.exe -ctxscript = $(top_srcdir)/w32_wrapper/context/mtxrun.exe +runscript = $(top_srcdir)/$(WIN_WRAPPER)/runscript.exe +ctxscript = $(top_srcdir)/$(WIN_WRAPPER)/context/mtxrun.exe install-data-hook: installdirs-local if WIN32 @for s in $(texmf_other_scripts); do \ @@ -226,15 +228,15 @@ if WIN32 echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$t.exe'"; \ $(INSTALL_SCRIPT) $(runscript) $(DESTDIR)$(bindir)/$$t.exe; \ done - $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/runscript.dll $(DESTDIR)$(bindir) - $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/runscript.exe $(DESTDIR)$(bindir) - $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/runscript.tlu $(DESTDIR)$(bindir) + $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.dll $(DESTDIR)$(bindir) + $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.exe $(DESTDIR)$(bindir) + $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.tlu $(DESTDIR)$(bindir) @for s in $(texmf_context_scripts); do \ t=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \ echo "$(INSTALL_SCRIPT) '$(ctxscript)' '$(DESTDIR)$(bindir)/$$t.exe'"; \ $(INSTALL_SCRIPT) $(ctxscript) $(DESTDIR)$(bindir)/$$t.exe; \ done - $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/context/mtxrun.dll $(DESTDIR)$(bindir) + $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/context/mtxrun.dll $(DESTDIR)$(bindir) $(INSTALL_SCRIPT) $(srcdir)/context/stubs/unix/mtxrun $(DESTDIR)$(bindir)/mtxrun.lua @for s in $(bin_links); do \ link=`echo $$s | sed 's,.*:,,'`; \ diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in index da0994089d8..9e742211964 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.in +++ b/Build/source/texk/texlive/linked_scripts/Makefile.in @@ -182,6 +182,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +WIN_WRAPPER = @WIN_WRAPPER@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -231,7 +232,7 @@ DISTCLEANFILES = scripts-list # ../../texmf-dist/scripts/foo/foo.pl. That way we save a bit of disk # space, but more importantly omit duplication, and most # importantly of all make it possible to invoke the same Perl script on -# Windows (see ../w32_wrapper). +# Windows (see ../$(WIN_WRAPPER)). # # The installation into texmf*/scripts is ideally done with ctan2tl. # The copy of the wrapper for Windows is also done by ctan2tl. (And @@ -400,8 +401,8 @@ bin_links = \ pdfcrop:rpdfcrop relpath = $(SHELL) $(top_srcdir)/../../build-aux/relpath -runscript = $(top_srcdir)/w32_wrapper/runscript.exe -ctxscript = $(top_srcdir)/w32_wrapper/context/mtxrun.exe +runscript = $(top_srcdir)/$(WIN_WRAPPER)/runscript.exe +ctxscript = $(top_srcdir)/$(WIN_WRAPPER)/context/mtxrun.exe @WIN32_TRUE@WINEXT = $(EXEEXT) shell_scripts = $(texmf_shell_scripts) $(texmf_context_scripts) all: all-am @@ -657,15 +658,15 @@ install-data-hook: installdirs-local @WIN32_TRUE@ echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$t.exe'"; \ @WIN32_TRUE@ $(INSTALL_SCRIPT) $(runscript) $(DESTDIR)$(bindir)/$$t.exe; \ @WIN32_TRUE@ done -@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/runscript.dll $(DESTDIR)$(bindir) -@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/runscript.exe $(DESTDIR)$(bindir) -@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/runscript.tlu $(DESTDIR)$(bindir) +@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.dll $(DESTDIR)$(bindir) +@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.exe $(DESTDIR)$(bindir) +@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.tlu $(DESTDIR)$(bindir) @WIN32_TRUE@ @for s in $(texmf_context_scripts); do \ @WIN32_TRUE@ t=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \ @WIN32_TRUE@ echo "$(INSTALL_SCRIPT) '$(ctxscript)' '$(DESTDIR)$(bindir)/$$t.exe'"; \ @WIN32_TRUE@ $(INSTALL_SCRIPT) $(ctxscript) $(DESTDIR)$(bindir)/$$t.exe; \ @WIN32_TRUE@ done -@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/context/mtxrun.dll $(DESTDIR)$(bindir) +@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/context/mtxrun.dll $(DESTDIR)$(bindir) @WIN32_TRUE@ $(INSTALL_SCRIPT) $(srcdir)/context/stubs/unix/mtxrun $(DESTDIR)$(bindir)/mtxrun.lua @WIN32_TRUE@ @for s in $(bin_links); do \ @WIN32_TRUE@ link=`echo $$s | sed 's,.*:,,'`; \ diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in index a589541673d..63eec894656 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.in +++ b/Build/source/texk/texlive/tl_scripts/Makefile.in @@ -197,6 +197,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +WIN_WRAPPER = @WIN_WRAPPER@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -268,7 +269,7 @@ nodist_bin_SCRIPTS = $(am__append_1) scriptsdir = texmf-dist/scripts/texlive all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) -@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe +@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe # # texmfdir = $(datarootdir)/$(scriptsdir) diff --git a/Build/source/texk/texlive/w64_wrapper/context/mtxrun.dll b/Build/source/texk/texlive/w64_wrapper/context/mtxrun.dll Binary files differnew file mode 100755 index 00000000000..094ab77ff71 --- /dev/null +++ b/Build/source/texk/texlive/w64_wrapper/context/mtxrun.dll diff --git a/Build/source/texk/texlive/w64_wrapper/context/mtxrun.exe b/Build/source/texk/texlive/w64_wrapper/context/mtxrun.exe Binary files differnew file mode 100755 index 00000000000..d44b1f3f97a --- /dev/null +++ b/Build/source/texk/texlive/w64_wrapper/context/mtxrun.exe diff --git a/Build/source/texk/texlive/w64_wrapper/runscript.dll b/Build/source/texk/texlive/w64_wrapper/runscript.dll Binary files differnew file mode 100755 index 00000000000..f7bf32d1e06 --- /dev/null +++ b/Build/source/texk/texlive/w64_wrapper/runscript.dll diff --git a/Build/source/texk/texlive/w64_wrapper/runscript.exe b/Build/source/texk/texlive/w64_wrapper/runscript.exe Binary files differnew file mode 100755 index 00000000000..99b5c531e9e --- /dev/null +++ b/Build/source/texk/texlive/w64_wrapper/runscript.exe diff --git a/Build/source/texk/texlive/w64_wrapper/runscript.tlu b/Build/source/texk/texlive/w64_wrapper/runscript.tlu new file mode 100755 index 00000000000..921c1887d7f --- /dev/null +++ b/Build/source/texk/texlive/w64_wrapper/runscript.tlu @@ -0,0 +1,679 @@ +
+
+local svnrevision = string.match("$Revision: 33766 $", "%d+") or "0"
+local svndate = string.match("$Date: 2014-04-30 18:03:08 +0200 (Wed, 30 Apr 2014) $", "[-%d]+") or "2009-12-04"
+local bannerstr = "runscript wrapper utility (rev. " ..
+ svnrevision .. ", " .. svndate .. ")\n" ..
+ "usage: runscript script-name [arguments]\n" ..
+ "try -help [-v] for more information"
+
+local helpstr = [[
+
+ Script wrappers in TeX Live on Windows
+
+ Rationale
+
+ Wrappers enable use of scripts on Windows as regular programs.
+ They are also required for some binary programs to set up the
+ right environment for them.
+
+ Batch scripts can be used for wrapping but they are not as universal
+ as binaries (there are some odd cases where they don't work) and
+ it is hard to make them robust and secure. Compiled binary wrappers
+ don't suffer from these problems but they are harder to write, debug
+ and maintain in comparison to scripts. For these reasons a hybrid
+ approach is taken that combines a binary stub with a launcher script.
+
+ Adding wrappers for user scripts
+
+ The script wrapping machinery is not limited to scripts shipped with
+ TeX Live. You can also use it for script programs from manually
+ installed packages. This should minimize problems when using them
+ with TeX Live.
+
+ First, make sure that there is an interpreter program available on
+ your system for the script you want to use. Interpreters for Perl
+ and Lua are bundled with TeX Live, all others have to be installed
+ independently. Lua scripts are the most efficient to run, so if you
+ consider writing a new script, that would be the recommended choice.
+
+ The following script types and their file extensions are currently
+ supported and searched in that order:
+
+ Lua (.tlu;.texlua;.lua) -- included
+ Perl (.pl) -- included
+ Ruby (.rb) -- requires installation
+ Python (.py) -- requires installation
+ Tcl (.tcl) -- requires installation
+ Java (.jar) -- requires installation
+ VBScript (.vbs) -- part of Windows
+ JScript (.js) -- part of Windows
+ Batch (.bat;.cmd) -- part of Windows
+
+ Finally, Unix-style extensionless scripts are searched as last and
+ the interpreter program is established based on the she-bang (#!)
+ specification on the very first line of the script. This can be
+ an arbitrary program but it must be present on the search path.
+
+ Next, the script program needs to be installed somewhere below the
+ 'scripts' directory under one of the TEXMF trees (consult the
+ documentation or texmf/web2c/texmf.cnf file for a list). You may
+ need to update the file search database afterwards with:
+
+ mktexlsr [TEXMFDIR]
+
+ It is also possible to use scripts that are outside of TEXMF hierarchy
+ by adjusting TEXMFSCRIPTS environment or kpathsea variable, see
+ kpathsea documentation for more information on setting its variables.
+
+ Test if the script can be located with:
+
+ kpsewhich --format=texmfscripts <script-name>.<ext>
+
+ This should output the full path to the script if everything is
+ properly installed and configured. If this test is successful,
+ the script can be run immediately with:
+
+ runscript <script-name> [script arguments]
+
+ If you prefer to call the script program simply by its name, copy
+ and rename bin/win64/runscript.exe to <script-name>.exe and put it
+ somewhere on the search path.]]
+
+local docstr = [[
+
+ Wrapper structure
+
+ Wrappers consist of small binary stubs and a common texlua script.
+ The binary stubs are all the same, just different names (but CLI
+ and GUI stubs differ, see below, and GUI stubs are actually all
+ different due to different embedded icons).
+
+ The job of the binary stub is twofold: (a) call the texlua launcher
+ script 'runscript.tlu' from the same directory (or more precisely
+ from the directory containing 'runscript.dll') and (b) pass to it
+ argv[0] and the unparsed argument string as the last two arguments
+ (after adding a sentinel argument, which ends with a new line
+ character). Arbitrary C strings can be passed, because the script
+ is executed by linking with luatex.dll and calling the lua
+ interpreter internally rather than by spawning a new process.
+
+ There are two flavours of the binary stub: one for CLI programs
+ and another one for GUI programs. The GUI variant does not open
+ a console window nor does it block the command prompt if started
+ from there. It also uses a dialog box to display an error message
+ in addition to outputting to stderr.
+
+ The stubs are further split into a common DLL and EXE proxies
+ to it. This is for maintenance reasons - updates can be done by
+ replacement of a single DLL rather than all binary stubs.
+
+ The launcher script knows, which variant has been used to invoke it
+ based on the sentinel argument. The lack of this argument means
+ that it was invoked in a standard way, i.e., through texlua.exe.
+
+ All the hard work of locating a script/program to execute happens
+ in the launcher script. The located script/program is always
+ executed directly by spawning its interpreter (or binary) in a new
+ process. The system shell (cmd.exe) is never called (except for
+ batch scripts, of course). If the located script happens to be
+ a (tex)lua script, it is loaded and called internally from within
+ this script, i.e. no new process is spawned. Execution is done
+ using a protected call, so any compile or runtime errors are catched.
+
+ Source files
+
+ runscript.tlu launcher script for locating and dispatching
+ target scripts/programs
+ runscript_dll.c common DLL part of the binary stubs; locates and
+ calls the launcher script
+ runscript_exe.c EXE proxy to the common DLL for CLI mode stubs
+ wrunscript_exe.c EXE proxy to the common DLL for GUI mode stubs
+
+ Compilation of binaries (requires luatex.dll in the same directory)
+
+ with gcc (size optimized):
+
+ gcc -Os -s -shared -o runscript.dll runscript_dll.c -L./ -lluatex
+ gcc -Os -s -o runscript.exe runscript_exe.c -L./ -lrunscript
+ gcc -mwindows -Os -s -o wrunscript.exe wrunscript_exe.c -L./ -lrunscript
+
+ with tcc (extra small size):
+
+ tiny_impdef luatex.dll
+ tcc -shared -o runscript.dll runscript_dll.c luatex.def
+ tcc -o runscript.exe runscript_exe.c runscript.def
+ tcc -o wrunscript.exe wrunscript_exe.c runscript.def
+
+ License
+
+ Originally written in 2009 by Tomasz M. Trzeciak, Public Domain.
+
+ Prior work:
+ 'tl-w32-wrapper.texlua' by Reinhard Kotucha and Norbert Preining.
+ 'tl-w32-wrapper.cmd' by Tomasz M. Trzeciak.
+
+ Changelog
+
+ 2009/12/04
+ - initial version
+ 2009/12/15
+ - minor fixes for path & extension list parsing
+ 2010/01/09
+ - added support for GUI mode stubs
+ 2010/02/28
+ - enable GUI mode stubs for dviout, psv and texworks;
+ - added generic handling of sys programs
+ - added restricted repstopdf to alias_table
+ 2010/03/13
+ - added 'readme.txt' and changelog
+ - added support and docs for calling user added scripts;
+ (use path of 'runscript.dll' instead of .exe stub to
+ locate 'runscript.tlu' script)
+ - limit search for shell_escape_commands to system trees
+ - added function for creating directory hierarchy
+ - fixed directory creation for dviout & texworks aliases
+ - fixed arg[0] of repstopdf & rpdfcrop
+ 2010/03/28
+ - restructured docs, added --help and --version options
+ (available only when invoked under 'runscript' name)
+ - use TEXMF_RESTRICTED_SCRIPTS kpse var for searching
+ shell_escape_commands
+ - changed command validation to handle a list of commands
+ - prepend GUI mode command(s) to the command list
+ - added support for .tcl scripts
+ 2010/03/31
+ - fixed fatal bug in extention_map definition for GUI mode
+ 2010/04/15
+ - encapsulated main chunk in a function to execute with
+ pcall for more robustness and better error catching
+ - added texdoctk to scripts4tlperl table
+ - added tlgs and tlperl to alias_table; callable as e.g.:
+ runscript tlperl ...
+ - doc tweaks
+ 2010/04/22
+ - ensure only backslash is used in USERPROFILE variable
+ (Adobe Reader crash case)
+ - fixed argument processing for direct execution under texlua
+ - more doc tweaks
+ 2010/05/30
+ - Windows XP or newer required to run TeXworks
+ 2010/06/04
+ - added support for Perl scripts starting with eval-exec-perl
+ construct in place of she-bang (#!)
+ 2010/06/25
+ - run internal tlperl only with our Perl
+ - added fontinst to alias_table
+ - added support for all tex4ht commands from mk4ht.pl
+ - removed some unsued aliases
+ - some code refactoring and cleanup
+ 2010/12/28
+ - use of external Perl now requires kpathsea variable
+ TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL to be explicitly set to 1
+ - alias_table replaced with if-elseif-end tests to streamline
+ special cases and to avoid hardcoding of texmf* file paths
+ - added a2ping to special cases (requires -x switch to Perl)
+ - set ASYMPTOTE_GS (for asy) to full path to tlgs
+ 2011/01/09
+ - removed tex4ht commands starting with ht from mk4ht aliases;
+ they have their own scripts and mk4ht calls them internally,
+ so aliasing results in an infinite recursion
+ - removed alias for fontinst (no fontinst.exe any more)
+ - fixed GUI-mode interpreter for Ruby
+ 2011/09/10
+ - added -dDisableFAPI=true to psview argument list. Needed by
+ gs-9.xx
+ 2012/03/12
+ - added '-i', '.' to psview argument list (author's request)
+ - added environment clean up from Perl specific variables
+ (when not using external Perl)
+ 2012/08/05
+ - added alias for fmtutil
+ 2013/05/09
+ - added alias mkluatexfontdb -> luaotfload-tool
+ 2013/07/03
+ - fix for psview and UNC paths in unix-style
+ - remove not needed is_abs_path function
+ 2013/08/07
+ - handle updmap-sys via updmap --sys
+ 2013/08/08
+ - allow overriding gs/gs_dll/gs_lib with kpse variables
+ TEXLIVE_WINDOWS_EXTERNAL_GS, ..._GS_LIB, ..._GS_DLL
+ 2013/08/30
+ - do not pass -NULL to dviout, to allow users changing and
+ saving settings. Patch by Yusuke KUROKI
+ 2013/09/22
+ - add TEXMFDIST/fonts to the GS_LIB path. Patch by Yusuke KUROKI
+ 2014/04/30
+ - fix for argument duplication in fmtutil
+]]
+
+-- HELPER SUBROUTINES --
+
+-- quotes string with spaces
+local function _q(str)
+ str = string.gsub(str, '"', '') -- disallow embedded double quotes
+ return string.find(str, "%s") and '"'..str..'"' or str
+end
+
+-- prepends directories to path if they are not already there
+local function prepend_path(path, ...)
+ local pathcmp = string.lower(string.gsub(path, '/', '\\'))..';'
+ for k = 1, select('#', ...) do
+ local dir = string.lower(string.gsub(select(k, ...), '/', '\\'))..';'
+ if not string.find(pathcmp, dir, 1, true) then path = dir..path end
+ end
+ return path
+end
+
+-- searches the PATH for a file
+local function search_path(fname, PATH, PATHEXT)
+ if string.find(fname, '[/\\]') then
+ return nil, "directory part not allowed for PATH search: "..fname
+ end
+ PATH = PATH or os.getenv('PATH')
+ PATHEXT = PATHEXT or '\0' -- '\0' for no extension
+ for dir in string.gmatch(PATH, '[^;]+') do
+ local dirsep = (string.find(dir, '\\') and '\\' or '/')
+ for ext in string.gmatch(PATHEXT, '[^;]+') do
+ local f = dir..dirsep..fname..ext
+ if lfs.isfile(f) then return f, ext end
+ end
+ end
+ return nil, "file or program not on PATH: "..fname
+end
+
+-- tests for tex4ht command (as given in mk4ht.pl)
+-- except for commands starting with 'ht' (they have their own scripts)
+local function is_tex4ht_command(progname)
+ local prefixes = 'xh uxh xhm mz oo es js jm tei teim db dbm w jh jh1'
+ local formats = 'context latex tex texi xelatex xetex'
+ for p in string.gmatch(prefixes, '%S+') do
+ for q in string.gmatch(formats, '%S+') do
+ if (progname == p..q) then
+ -- we have a hit, but not all combinations are valid
+ return (p ~= 'teim' and p ~= 'dbm') or (q ~= 'xelatex' and q~= 'xetex')
+ end
+ end
+ end
+ return false
+end
+
+-- locates texmfscript to execute
+local function find_texmfscript(progname, ext_list)
+ ext_list = ext_list or '\0'
+ for ext in string.gmatch(ext_list, '[^;]+') do
+ local progfullname = kpse.find_file(progname..ext, 'texmfscripts')
+ if progfullname then return progfullname, ext end
+ end
+ return nil, "no appropriate script or program found: "..progname
+end
+
+-- converts the #! line to arg table
+-- used for scripts w/o extension
+-- only the two most common cases are considered:
+-- #! /path/to/command [options]
+-- #! /usr/bin/env command [options]
+-- ([options] after the command are retained as well)
+local function shebang_to_argv(progfullname)
+ local fid, errmsg = io.open(progfullname, 'r')
+ if not fid then return nil, errmsg end
+ local fstln = fid:read('*line')
+ fid:close()
+ if string.find(fstln, "eval.*exit.*exec.*perl") then
+ -- special case of Perl's time-honoured "totally devious construct":
+ -- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
+ return {"perl"}
+ elseif (string.sub(fstln, 1, 2) ~= '#!') then
+ return nil, "don't know how to execute script: "..progfullname
+ end
+ local argv = string.explode( string.sub(fstln, 3) ) -- split on spaces
+ argv[1] = string.match(argv[1], '[^/]+$')
+ if (argv[1] == 'env') then table.remove(argv, 1) end
+ return argv
+end
+
+-- checks if command exists on the path and returns its full path
+local function check_command(cmdlist, PATH)
+ for cmd in string.gmatch(cmdlist, '%S+') do
+ local cmdext = cmd..(string.find(cmd, '%.[^\\/.]*$') and '' or '.exe')
+ local fullcmd = search_path(cmdext, PATH)
+ if fullcmd then
+ return fullcmd, cmd
+ end
+ end
+ return nil, 'program not found (not part of TeX Live): '..cmdlist
+end
+
+-- creates directory or directory hierarchy
+local function mkdir_plus(dir)
+ if lfs.mkdir(dir) then
+ return true
+ end
+ -- try with system's mkdir in case we need to create intermediate dirs too
+ local ret = os.spawn({[0]=search_path("cmd.exe"),
+ string.format('cmd.exe /x /c mkdir "%s"', dir)})
+ if ret == 0 then
+ return true
+ else
+ return nil, string.format("cannot create directory (error code %d): %s", ret, dir)
+ end
+end
+
+-- MAIN_CHUNK -- encapsulated in a function for more robust execution with pcall
+
+local function MAIN_CHUNK()
+
+-- preprocess arguments
+
+local guimode = false
+local argline = ''
+-- check for the sentinel argment coming from the .exe stub
+if arg[#arg-2] and ( string.sub(arg[#arg-2], -1) == '\n' ) then
+ -- argv[0] and unparsed argument line are passed
+ -- from the .exe stub as the two last arguments
+ -- pop them up from the arg table
+ argline = table.remove(arg) -- pop unparsed arguments
+ arg[0] = table.remove(arg) -- pop C stub's argv[0]
+ guimode = (table.remove(arg) == 'GUI_MODE\n') -- pop sentinel argument
+else
+ -- we must be called as: texlua runscript.tlu progname ...
+ -- this is treated the same as: runscript[.exe] progname ...
+ -- we don't have the unparsed arument line in this case, so construct one
+ for k = #arg, 1, -1 do argline = _q(arg[k]) .. ' ' .. argline end
+end
+
+-- program name
+
+-- lower arg[0] : get file name part : remove extension
+local progname, substcount = string.lower(arg[0]):gsub('^.*[\\/]', ''):gsub('%.[^.]*$', '')
+-- special behaviour when called under 'runscript' name
+if (progname == 'runscript') then
+ -- we are called as: runscript progname ...
+ -- or as: runscript --help|-h|--version ...
+ -- handle options first (only --help and --version)
+ local opt, param = {}, nil
+ while true do
+ -- remove the first argument from the arg table and from the argline string
+ -- (this argument should have no embedded spaces!)
+ param = table.remove(arg, 1)
+ if not param then break end
+ argline = string.gsub(argline, '^%S+%s*', '')
+ local optname = string.lower(param):match('^%-%-?(.*)$')
+ if not optname then
+ break
+ elseif (optname == 'h') or (optname == 'help') then
+ opt.help = true
+ elseif (optname == 'v') then
+ opt.v = true
+ elseif (optname == 'version') then
+ opt.version = true
+ else
+ error("unknown option: "..param.."\n"..bannerstr)
+ end
+ end
+ if opt.help then
+ print(helpstr)
+ if opt.v then print(docstr) end
+ os.exit(0)
+ elseif opt.version or opt.v then
+ print(bannerstr)
+ os.exit(0)
+ end
+ -- make sure progname is valid
+ arg[0] = assert(param, "not enough arguments!\n"..bannerstr)
+ progname = string.lower(arg[0]):gsub('^.*[\\/]', ''):gsub('%.[^.]*$', '')
+ assert(progname == string.lower(arg[0]), "bad command name: " .. arg[0])
+end
+-- special case of sys programs
+progname, substcount = string.gsub(progname, '%-sys$', '')
+local sysprog = (substcount > 0) -- true if there was a -sys suffix removed
+-- prevent recursive calls to this script
+assert(progname ~= 'runscript', "oops! wrapping the wrapper?")
+
+-- kpse and environment set-up
+
+-- init kpathsea
+local k = -1
+while arg[k-1] do k = k - 1 end -- in case of a call: luatex --luaonly ...
+local lua_binary = arg[k]
+kpse.set_program_name(lua_binary, progname)
+-- various dir-vars
+local TEXDIR = kpse.var_value('SELFAUTOPARENT')
+local TEXMFDIST = kpse.var_value('TEXMFDIST')
+local BINDIR = kpse.var_value('SELFAUTOLOC')
+local PATH = os.getenv('PATH') or ''
+-- restricted programs
+local shell_escape_commands = string.lower(kpse.var_value('shell_escape_commands') or '')
+local is_restricted_progname = string.find( ','..shell_escape_commands..',',
+ ','..progname..',', 1, true)
+if is_restricted_progname then
+ -- limit search path to the restricted (system) trees
+ -- (not really necessary for entries in the alias_table,
+ -- because they are not searched for with kpathsea)
+ os.setenv('TEXMFSCRIPTS', kpse.var_value('TEXMF_RESTRICTED_SCRIPTS'))
+end
+-- perl stuff
+local scripts4tlperl = {
+ tlperl = true,
+ updmap = true,
+ ['updmap-sys'] = true,
+}
+local try_extern_perl = (kpse.var_value('TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL') == '1') and
+ not (guimode or is_restricted_progname or scripts4tlperl[progname])
+local PERLEXE = try_extern_perl and search_path('perl.exe', PATH)
+if not PERLEXE then
+ PERLEXE = TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
+ os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
+ PATH = prepend_path(PATH, TEXDIR..'/tlpkg/tlperl/bin')
+ local PERLENV = 'PERL5OPT;PERLIO;PERLIO_DEBUG;PERLLIB;PERL5DB;PERL5DB_THREADED;' ..
+ 'PERL5SHELL;PERL_ALLOW_NON_IFS_LSP;PERL_DEBUG_MSTATS;' ..
+ 'PERL_DESTRUCT_LEVEL;PERL_DL_NONLAZY;PERL_ENCODING;PERL_HASH_SEED;' ..
+ 'PERL_HASH_SEED_DEBUG;PERL_ROOT;PERL_SIGNALS;PERL_UNICODE'
+ for var in string.gmatch(PERLENV, '[^;]+') do os.setenv(var, nil) end
+end
+-- gs stuff
+local override_gs
+if not is_restricted_progname then
+ override_gs = kpse.var_value('TEXLIVE_WINDOWS_EXTERNAL_GS')
+end
+-- the full path to the executable
+local GSEXE
+-- the directory where the gs executable resides
+local GSDIR
+-- the name of the gs executable
+local GSNAME
+if override_gs then
+ -- first check whether we got an absolute path or only executable name
+ if string.find(override_gs, '[/\\]') then
+ GSEXE = override_gs
+ else
+ -- search in the path
+ GSEXE = search_path(override_gs, PATH)
+ end
+end
+if GSEXE then
+ -- split the dir and progname part so that we can set the path
+ -- work on a string with all forward slashes
+ local foo = string.lower(string.gsub(GSEXE, '\\', '/'))
+ GSNAME = string.gsub(foo, '^.*[\\/]', '')
+ GSDIR = string.gsub(foo, '^(.*)[\\/].*$', '%1')
+ -- search also for a GS_DLL setting
+ -- we do not need to check for is_restricted_progname, since
+ -- GSEXE is only defined when it is not set
+ local GSDLL = kpse.var_value('TEXLIVE_WINDOWS_EXTERNAL_GS_DLL')
+ if GSDLL then
+ os.setenv('GS_DLL', GSDLL)
+ end
+ local GSLIB = kpse.var_value('TEXLIVE_WINDOWS_EXTERNAL_GS_LIB')
+ if GSLIB then
+ os.setenv('GS_LIB', GSLIB)
+ end
+else
+ -- use built in gs
+ os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts;'
+ ..os.getenv('WINDIR')..'/Fonts;'..TEXMFDIST..'/fonts')
+ os.setenv('GS_DLL', TEXDIR..'/tlpkg/tlgs/bin/gsdll32.dll')
+ GSEXE = TEXDIR..'/tlpkg/tlgs/bin/gswin32c.exe'
+ GSNAME = 'gswin32c.exe'
+ GSDIR = TEXDIR..'/tlpkg/tlgs/bin'
+end
+-- now setup the path so that the gs program will be found
+PATH = prepend_path(PATH, GSDIR, BINDIR)
+os.setenv('PATH', PATH);
+
+-- sys stuff
+if (sysprog and not (progname == 'updmap')) then
+ os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
+ os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
+end
+-- Adobe Reader crash case: make sure USERPROFILE is not "slashed"
+os.setenv("USERPROFILE", os.getenv("USERPROFILE"):gsub('/', '\\'))
+
+-- extension to interpeter mapping
+
+-- the extension is mapped to argv table
+-- the command to execute is given as the first element of the table
+-- (it can be a whitespace separated list of names to try)
+local extension_map = {
+ ['.bat'] = {'cmd', '/c', 'call'},
+ ['.jar'] = {'java.exe', '-jar'},
+ ['.pl' ] = {'perl.exe'},
+ ['.py' ] = {'python.exe'},
+ ['.rb' ] = {'ruby.exe'},
+ ['.tcl'] = {'tclsh.exe tclsh85.exe tclsh84.exe'},
+ ['.vbs'] = {'cscript.exe', '-nologo'},
+}
+if guimode then
+ -- for GUI mode wrappers we try GUI mode interpeters where possible
+ extension_map['.jar'][1] = 'javaw.exe ' .. extension_map['.jar'][1]
+ extension_map['.pl' ][1] = 'wperl.exe ' .. extension_map['.pl' ][1]
+ extension_map['.py' ][1] = 'pythonw.exe ' .. extension_map['.py' ][1]
+ extension_map['.rb' ][1] = 'rubyw.exe ' .. extension_map['.rb' ][1]
+ extension_map['.tcl'][1] = 'wish.exe wish85.exe wish84.exe ' .. extension_map['.tcl'][1]
+ extension_map['.vbs'][1] = 'wscript.exe ' .. extension_map['.vbs'][1]
+end
+extension_map['.cmd'] = extension_map['.bat']
+extension_map['.js'] = extension_map['.vbs']
+
+-- set up argv table
+
+local ARGV = nil
+
+-- special cases (aliases)
+
+if is_tex4ht_command(progname) then
+ argline = progname .. ' ' .. argline
+ progname = 'mk4ht'
+elseif progname == 'a2ping' then
+ table.insert(extension_map['.pl'], '-x')
+elseif progname == 'updmap' then
+ if sysprog then
+ argline = progname .. ' --sys ' .. argline
+ end
+elseif progname == 'asy' then
+ os.setenv('ASYMPTOTE_GS', GSEXE)
+ os.setenv('CYGWIN', 'nodosfilewarning')
+ ARGV = {[0]=TEXDIR..'/tlpkg/asymptote/asy.exe', 'asy'}
+elseif progname == 'dviout' then
+ local fontsdir = kpse.var_value('TEXMFVAR') .. '/fonts'
+ if (lfs.attributes(fontsdir, 'mode') ~= 'directory') then
+ assert(mkdir_plus(fontsdir))
+ end
+ local tfmpath = kpse.show_path('tfm')
+ tfmpath = string.gsub(tfmpath, '!!', '')
+ tfmpath = string.gsub(tfmpath, '/', '\\')
+ local texrt = {}
+ for d in string.gmatch(tfmpath, '([^;]+\\fonts)\\tfm[^;]*') do
+ if (lfs.attributes(d, 'mode') == 'directory') then
+ table.insert(texrt, d)
+ end
+ end
+ local par = [["-gen=']] .. string.gsub(TEXDIR, '/', '\\') ..
+ [[\tlpkg\dviout\gen_pk'" "-TEXROOT=']] ..
+ table.concat(texrt, ';') .. [['" "-gsx=']] .. GSEXE .. [['"]];
+ ARGV = {[0]=TEXDIR..'/tlpkg/dviout/dviout.exe', 'dviout', par}
+elseif progname == 'fmtutil' and sysprog then
+ ARGV = {[0]=BINDIR..'/fmtutil.exe', 'fmtutil'}
+elseif progname == 'mkluatexfontdb' then
+ progname = 'luaotfload-tool'
+ table.insert(arg, '--alias=mkluatexfontdb')
+elseif progname == 'psv' then
+ argline = '-sINPUT='..argline
+ ARGV = {[0]=TEXDIR..'/tlpkg/tlpsv/gswxlua.exe', 'gswxlua',
+ '-dDisableFAPI=true',
+ '-l', (_q(TEXDIR..'/tlpkg/tlpsv/psv.wx.lua'):gsub('/','\\')),
+ '-p', (_q(TEXDIR..'/tlpkg/tlpsv/psv_view.ps'):gsub('/','\\')),
+ '-i', '.'}
+elseif progname == 'repstopdf' or progname == 'rpdfcrop' then
+ argline = '--restricted ' .. argline
+ progname = string.sub(progname, 2, -1)
+elseif progname == 'texworks' then
+ local winver = tonumber(string.match(os.uname().version, '%D*(%d+%.?%d*)'))
+ assert(winver >= 5.01, "Windows XP or newer required to run TeXworks")
+ local TW_LIBPATH = kpse.var_value('TW_LIBPATH') or
+ kpse.var_value('TEXMFCONFIG')..'/texworks'
+ local TW_INIPATH = kpse.var_value('TW_INIPATH') or TW_LIBPATH
+ os.setenv('TW_LIBPATH', TW_LIBPATH)
+ os.setenv('TW_INIPATH', TW_INIPATH)
+ if (TW_INIPATH and lfs.attributes(TW_INIPATH, 'mode') ~= 'directory') then
+ -- TeXworks needs directory holding its configuration to exist
+ assert(mkdir_plus(TW_INIPATH))
+ end
+ ARGV = {[0]=TEXDIR..'/tlpkg/texworks/texworks.exe', 'texworks'}
+elseif progname == 'tlgs' then
+ ARGV = {[0]=GSEXE, GSNAME}
+elseif progname == 'tlperl' then
+ ARGV = {[0]=PERLEXE, 'perl'}
+end
+
+-- general case
+
+if not ARGV then
+ local extlist = '.tlu;.texlua;.lua;.pl;.rb;.py;.tcl;.jar;.vbs;.js;.bat;.cmd;\0'
+ local progfullname = search_path(progname, BINDIR, '.tlu;.bat;.cmd') or
+ assert(find_texmfscript(progname, extlist))
+ local ext = string.match(string.lower(progfullname), '%.[^\\/.]*$') or ''
+ if (ext == '.lua') or (ext == '.tlu') or (ext == '.texlua') then -- lua script
+ arg[0] = progfullname
+ else
+ ARGV = extension_map[ext] or assert(shebang_to_argv(progfullname))
+ table.insert(ARGV, _q(progfullname))
+ if not ARGV[0] then
+ ARGV[0], ARGV[1] = assert(check_command(ARGV[1], PATH))
+ end
+ end
+end
+
+-- run the program/script
+
+if ARGV then
+ table.insert(ARGV, argline) -- pass through original arguments
+ local ret = assert(os.spawn(ARGV))
+ if ret ~= 0 then
+ local dbginfo = debug.getinfo(1)
+ local errormsg = string.format("%s:%d: command failed with exit code %d:\n%s",
+ dbginfo.short_src, dbginfo.currentline - 2,
+ ret, table.concat(ARGV, ' ') )
+ os.setenv('RUNSCRIPT_ERROR_MESSAGE', errormsg)
+ io.stderr:write(errormsg, '\n')
+ end
+ os.exit(ret)
+else -- must be a lua script
+ dofile(arg[0])
+end
+
+end -- MAIN_CHUNK
+
+-- execute MAIN_CHUNK with pcall to catch any runtime errors
+
+local success, errormsg = pcall(MAIN_CHUNK)
+if not success then
+ os.setenv('RUNSCRIPT_ERROR_MESSAGE', errormsg)
+ error(errormsg)
+end
+
+-- about RUNSCRIPT_ERROR_MESSAGE environment variable:
+-- it stores an error message that is catched and displayed
+-- in a message box on the C side at process exit
+-- (currently used only by gui mode stubs)
diff --git a/Build/source/utils/m-tx/ChangeLog b/Build/source/utils/m-tx/ChangeLog index 8382f27fd49..f7652601175 100644 --- a/Build/source/utils/m-tx/ChangeLog +++ b/Build/source/utils/m-tx/ChangeLog @@ -1,6 +1,10 @@ +2014-11-17 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Drop KPSE_COND_WIN32_WRAP. + 2014-05-11 Peter Breitenlohner <peb@mppmu.mpg.de> - * m-tx.1 (removed): Maintained under Mastr, not here. + * m-tx.1 (removed): Maintained under Master, not here. * Makefile.am: Adjusted. 2013-01-30 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/utils/m-tx/Makefile.in b/Build/source/utils/m-tx/Makefile.in index 57ef25dd9ee..90f1cf2cbbc 100644 --- a/Build/source/utils/m-tx/Makefile.in +++ b/Build/source/utils/m-tx/Makefile.in @@ -93,8 +93,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ - $(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \ - $(top_srcdir)/configure.ac + $(top_srcdir)/version.ac $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/Build/source/utils/m-tx/aclocal.m4 b/Build/source/utils/m-tx/aclocal.m4 index 084accf15c3..7788d8b5d0a 100644 --- a/Build/source/utils/m-tx/aclocal.m4 +++ b/Build/source/utils/m-tx/aclocal.m4 @@ -1185,4 +1185,3 @@ AC_SUBST([am__untar]) m4_include([../../m4/kpse-common.m4]) m4_include([../../m4/kpse-warnings.m4]) -m4_include([../../m4/kpse-win32.m4]) diff --git a/Build/source/utils/m-tx/configure b/Build/source/utils/m-tx/configure index dec329db232..d0984a130a5 100755 --- a/Build/source/utils/m-tx/configure +++ b/Build/source/utils/m-tx/configure @@ -633,10 +633,6 @@ GREP CPP RANLIB LN_S -WIN32_WRAP_FALSE -WIN32_WRAP_TRUE -WIN32_FALSE -WIN32_TRUE WARNING_CFLAGS am__fastdepCC_FALSE am__fastdepCC_TRUE @@ -4716,71 +4712,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5 -$as_echo_n "checking for native WIN32 or MINGW32... " >&6; } -if ${kpse_cv_have_win32+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef WIN32 - choke me -#endif -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __MINGW32__ - choke me -#endif -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - kpse_cv_have_win32=mingw32 -else - kpse_cv_have_win32=native -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - kpse_cv_have_win32=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5 -$as_echo "$kpse_cv_have_win32" >&6; } - - if test "x$kpse_cv_have_win32" != xno; then - WIN32_TRUE= - WIN32_FALSE='#' -else - WIN32_TRUE='#' - WIN32_FALSE= -fi - - - if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then - WIN32_WRAP_TRUE= - WIN32_WRAP_FALSE='#' -else - WIN32_WRAP_TRUE='#' - WIN32_WRAP_FALSE= -fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } @@ -5781,14 +5712,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then - as_fn_error $? "conditional \"WIN32\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${WIN32_WRAP_TRUE}" && test -z "${WIN32_WRAP_FALSE}"; then - as_fn_error $? "conditional \"WIN32_WRAP\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/Build/source/utils/m-tx/configure.ac b/Build/source/utils/m-tx/configure.ac index 5cf672a5ba0..2767e285260 100644 --- a/Build/source/utils/m-tx/configure.ac +++ b/Build/source/utils/m-tx/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -18,8 +18,6 @@ KPSE_BASIC([m-tx]) dnl Check compiler and flags AC_PROG_CC -KPSE_COND_WIN32_WRAP - dnl Checks for programs. AC_PROG_INSTALL AC_PROG_LN_S diff --git a/Build/source/utils/pmx/ChangeLog b/Build/source/utils/pmx/ChangeLog index 87832e9bb1c..d3b0d433d68 100644 --- a/Build/source/utils/pmx/ChangeLog +++ b/Build/source/utils/pmx/ChangeLog @@ -1,3 +1,7 @@ +2014-11-17 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Replace KPSE_COND_WIN32_WRAP => KPSE_COND_WIN32. + 2014-05-11 Peter Breitenlohner <peb@mppmu.mpg.de> * pmx2pdf.1 (removed): Maintained under Mastr, not here. diff --git a/Build/source/utils/pmx/configure b/Build/source/utils/pmx/configure index 8e07c76e67d..61558985972 100755 --- a/Build/source/utils/pmx/configure +++ b/Build/source/utils/pmx/configure @@ -632,8 +632,6 @@ GREP CPP RANLIB LN_S -WIN32_WRAP_FALSE -WIN32_WRAP_TRUE WIN32_FALSE WIN32_TRUE PMX_DEFINES @@ -4745,15 +4743,6 @@ else fi - if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then - WIN32_WRAP_TRUE= - WIN32_WRAP_FALSE='#' -else - WIN32_WRAP_TRUE='#' - WIN32_WRAP_FALSE= -fi - - case $kpse_cv_have_win32 in #( native) : PMX_DEFINES="$PMX_DEFINES -DMSDOS" ;; #( @@ -5576,10 +5565,6 @@ if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then as_fn_error $? "conditional \"WIN32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${WIN32_WRAP_TRUE}" && test -z "${WIN32_WRAP_FALSE}"; then - as_fn_error $? "conditional \"WIN32_WRAP\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/Build/source/utils/pmx/configure.ac b/Build/source/utils/pmx/configure.ac index 4130a9561d7..86967e1c173 100644 --- a/Build/source/utils/pmx/configure.ac +++ b/Build/source/utils/pmx/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -21,7 +21,7 @@ AC_PROG_CC dnl initial value for PMX_DEFINES AC_SUBST([PMX_DEFINES], ['-DNON_UNIX_STDIO']) -KPSE_COND_WIN32_WRAP +KPSE_COND_WIN32 dnl WIN32 has no <sys/times.h>, native WIN32 is as MSDOS AS_CASE([$kpse_cv_have_win32], [native], [PMX_DEFINES="$PMX_DEFINES -DMSDOS"], diff --git a/Build/source/utils/ps2eps/Makefile.in b/Build/source/utils/ps2eps/Makefile.in index 45ae243a04b..977fb41ab0e 100644 --- a/Build/source/utils/ps2eps/Makefile.in +++ b/Build/source/utils/ps2eps/Makefile.in @@ -435,6 +435,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +WIN_WRAPPER = @WIN_WRAPPER@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -493,7 +494,7 @@ scriptsdir = texmf-dist/scripts/ps2eps nodist_bin_SCRIPTS = $(am__append_1) all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) -@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe +@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(PS2EPS_TREE)/bin/ps2eps.pl CLEANFILES = $(nodist_bin_SCRIPTS) diff --git a/Build/source/utils/ps2eps/configure b/Build/source/utils/ps2eps/configure index fbdbfa893dd..6a45d5de78a 100755 --- a/Build/source/utils/ps2eps/configure +++ b/Build/source/utils/ps2eps/configure @@ -592,6 +592,7 @@ LIBOBJS PS2EPS_TREE WIN32_WRAP_FALSE WIN32_WRAP_TRUE +WIN_WRAPPER WIN32_FALSE WIN32_TRUE LN_S @@ -4449,7 +4450,41 @@ else fi - if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WIN64" >&5 +$as_echo_n "checking for WIN64... " >&6; } +if ${kpse_cv_have_win64+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef _WIN64 + choke me +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_win64=yes +else + kpse_cv_have_win64=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win64" >&5 +$as_echo "$kpse_cv_have_win64" >&6; } +case $kpse_cv_have_win64 in #( + yes) : + WIN_WRAPPER=w64_wrapper ;; #( + *) : + WIN_WRAPPER=w32_wrapper ;; +esac + + if test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"; then WIN32_WRAP_TRUE= WIN32_WRAP_FALSE='#' else diff --git a/Build/source/utils/texdoctk/Makefile.in b/Build/source/utils/texdoctk/Makefile.in index 64d46ec0e02..2e7ebdef190 100644 --- a/Build/source/utils/texdoctk/Makefile.in +++ b/Build/source/utils/texdoctk/Makefile.in @@ -216,6 +216,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +WIN_WRAPPER = @WIN_WRAPPER@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -264,7 +265,7 @@ scriptsdir = texmf-dist/scripts/texdoctk nodist_bin_SCRIPTS = $(am__append_1) all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) -@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe +@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe # # texmfdir = $(datarootdir)/$(scriptsdir) diff --git a/Build/source/utils/texdoctk/configure b/Build/source/utils/texdoctk/configure index 214ac9ff3d4..ffe1bc45faa 100755 --- a/Build/source/utils/texdoctk/configure +++ b/Build/source/utils/texdoctk/configure @@ -591,6 +591,7 @@ LTLIBOBJS LIBOBJS WIN32_WRAP_FALSE WIN32_WRAP_TRUE +WIN_WRAPPER WIN32_FALSE WIN32_TRUE LN_S @@ -3691,7 +3692,41 @@ else fi - if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WIN64" >&5 +$as_echo_n "checking for WIN64... " >&6; } +if ${kpse_cv_have_win64+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef _WIN64 + choke me +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_win64=yes +else + kpse_cv_have_win64=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win64" >&5 +$as_echo "$kpse_cv_have_win64" >&6; } +case $kpse_cv_have_win64 in #( + yes) : + WIN_WRAPPER=w64_wrapper ;; #( + *) : + WIN_WRAPPER=w32_wrapper ;; +esac + + if test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"; then WIN32_WRAP_TRUE= WIN32_WRAP_FALSE='#' else diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in index db2decec7f3..4634c32dc4e 100644 --- a/Build/source/utils/xindy/Makefile.in +++ b/Build/source/utils/xindy/Makefile.in @@ -284,6 +284,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +WIN_WRAPPER = @WIN_WRAPPER@ XINDY_RUN = @XINDY_RUN@ XINDY_TREE = @XINDY_TREE@ abs_builddir = @abs_builddir@ @@ -349,7 +350,7 @@ scriptsdir = texmf-dist/scripts/xindy nodist_bin_SCRIPTS = $(am__append_1) all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe) -@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe +@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe texmfdir = $(datarootdir)/$(scriptsdir) nodist_texmf_SCRIPTS = $(perl_scripts:=.pl) CLEANFILES = $(nodist_bin_SCRIPTS) $(nodist_texmf_SCRIPTS) diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure index cc5dce3d9da..487facb72a4 100755 --- a/Build/source/utils/xindy/configure +++ b/Build/source/utils/xindy/configure @@ -598,6 +598,7 @@ CLISP_RUNTIME_TRUE XINDY_TREE WIN32_WRAP_FALSE WIN32_WRAP_TRUE +WIN_WRAPPER WIN32_FALSE WIN32_TRUE LISP_RUN @@ -5067,7 +5068,41 @@ else fi - if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WIN64" >&5 +$as_echo_n "checking for WIN64... " >&6; } +if ${kpse_cv_have_win64+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef _WIN64 + choke me +#endif +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_win64=yes +else + kpse_cv_have_win64=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win64" >&5 +$as_echo "$kpse_cv_have_win64" >&6; } +case $kpse_cv_have_win64 in #( + yes) : + WIN_WRAPPER=w64_wrapper ;; #( + *) : + WIN_WRAPPER=w32_wrapper ;; +esac + + if test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"; then WIN32_WRAP_TRUE= WIN32_WRAP_FALSE='#' else diff --git a/Build/source/utils/xindy/xindy-2.5.1/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/Makefile.in index 477ad26c51d..9d91ba8bbd2 100644 --- a/Build/source/utils/xindy/xindy-2.5.1/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.5.1/Makefile.in @@ -263,6 +263,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +WIN_WRAPPER = @WIN_WRAPPER@ XINDY_RUN = @XINDY_RUN@ XINDY_TREE = @XINDY_TREE@ abs_builddir = @abs_builddir@ diff --git a/Build/source/utils/xindy/xindy-2.5.1/doc/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/doc/Makefile.in index 36daf1bed30..3a321148e87 100644 --- a/Build/source/utils/xindy/xindy-2.5.1/doc/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.5.1/doc/Makefile.in @@ -195,6 +195,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +WIN_WRAPPER = @WIN_WRAPPER@ XINDY_RUN = @XINDY_RUN@ XINDY_TREE = @XINDY_TREE@ abs_builddir = @abs_builddir@ diff --git a/Build/source/utils/xindy/xindy-2.5.1/make-rules/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/make-rules/Makefile.in index d5cf8d4b567..6476a43c7d5 100644 --- a/Build/source/utils/xindy/xindy-2.5.1/make-rules/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.5.1/make-rules/Makefile.in @@ -224,6 +224,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +WIN_WRAPPER = @WIN_WRAPPER@ XINDY_RUN = @XINDY_RUN@ XINDY_TREE = @XINDY_TREE@ abs_builddir = @abs_builddir@ diff --git a/Build/source/utils/xindy/xindy-2.5.1/make-rules/alphabets/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/make-rules/alphabets/Makefile.in index 027d5aa179b..078ceec8221 100644 --- a/Build/source/utils/xindy/xindy-2.5.1/make-rules/alphabets/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.5.1/make-rules/alphabets/Makefile.in @@ -221,6 +221,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +WIN_WRAPPER = @WIN_WRAPPER@ XINDY_RUN = @XINDY_RUN@ XINDY_TREE = @XINDY_TREE@ abs_builddir = @abs_builddir@ diff --git a/Build/source/utils/xindy/xindy-2.5.1/make-rules/inputenc/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/make-rules/inputenc/Makefile.in index 8675d639774..0db63b3c54a 100644 --- a/Build/source/utils/xindy/xindy-2.5.1/make-rules/inputenc/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.5.1/make-rules/inputenc/Makefile.in @@ -194,6 +194,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +WIN_WRAPPER = @WIN_WRAPPER@ XINDY_RUN = @XINDY_RUN@ XINDY_TREE = @XINDY_TREE@ abs_builddir = @abs_builddir@ diff --git a/Build/source/utils/xindy/xindy-2.5.1/modules/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/modules/Makefile.in index edffbd642de..51da8b123dc 100644 --- a/Build/source/utils/xindy/xindy-2.5.1/modules/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.5.1/modules/Makefile.in @@ -199,6 +199,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +WIN_WRAPPER = @WIN_WRAPPER@ XINDY_RUN = @XINDY_RUN@ XINDY_TREE = @XINDY_TREE@ abs_builddir = @abs_builddir@ diff --git a/Build/source/utils/xindy/xindy-2.5.1/src/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/src/Makefile.in index 73098f10481..449a6c8a93d 100644 --- a/Build/source/utils/xindy/xindy-2.5.1/src/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.5.1/src/Makefile.in @@ -194,6 +194,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +WIN_WRAPPER = @WIN_WRAPPER@ XINDY_RUN = @XINDY_RUN@ XINDY_TREE = @XINDY_TREE@ abs_builddir = @abs_builddir@ diff --git a/Build/source/utils/xindy/xindy-2.5.1/tex2xindy/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/tex2xindy/Makefile.in index a39a1543f3f..69ba8343de1 100644 --- a/Build/source/utils/xindy/xindy-2.5.1/tex2xindy/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.5.1/tex2xindy/Makefile.in @@ -244,6 +244,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +WIN_WRAPPER = @WIN_WRAPPER@ XINDY_RUN = @XINDY_RUN@ XINDY_TREE = @XINDY_TREE@ abs_builddir = @abs_builddir@ diff --git a/Build/source/utils/xindy/xindy-2.5.1/user-commands/Makefile.in b/Build/source/utils/xindy/xindy-2.5.1/user-commands/Makefile.in index 452e14f112f..691b846b94d 100644 --- a/Build/source/utils/xindy/xindy-2.5.1/user-commands/Makefile.in +++ b/Build/source/utils/xindy/xindy-2.5.1/user-commands/Makefile.in @@ -198,6 +198,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ +WIN_WRAPPER = @WIN_WRAPPER@ XINDY_RUN = @XINDY_RUN@ XINDY_TREE = @XINDY_TREE@ abs_builddir = @abs_builddir@ |