From 19f6913e489a9d6ae6e00484c2db4b0a3738ab58 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 15 Apr 2013 07:49:40 +0000 Subject: linked scripts: Install ConTeXt wrappers for MinGW32 git-svn-id: svn://tug.org/texlive/trunk@29932 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/texlive/linked_scripts/ChangeLog | 4 ++++ Build/source/texk/texlive/linked_scripts/Makefile.am | 13 ++++++++++--- Build/source/texk/texlive/linked_scripts/Makefile.in | 13 ++++++++++--- .../texk/texlive/w32_wrapper/context/context.exe | Bin 0 -> 6144 bytes .../texk/texlive/w32_wrapper/context/mtxrun.dll | Bin 9216 -> 38400 bytes .../texk/texlive/w32_wrapper/context/mtxrun.exe | Bin 6144 -> 34816 bytes 6 files changed, 24 insertions(+), 6 deletions(-) create mode 100755 Build/source/texk/texlive/w32_wrapper/context/context.exe diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog index 11b3395c237..8ab3cbf1398 100644 --- a/Build/source/texk/texlive/linked_scripts/ChangeLog +++ b/Build/source/texk/texlive/linked_scripts/ChangeLog @@ -1,3 +1,7 @@ +2013-04-15 Peter Breitenlohner + + * Makefile.am [WIN32]: Install runscript.* and ConTeXt wrappers. + 2013-02-21 Peter Breitenlohner * Makefile.am [WIN32]: Install arara.exe wrapper. diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am index b9715d12db5..bc322b3c412 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.am +++ b/Build/source/texk/texlive/linked_scripts/Makefile.am @@ -192,7 +192,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 +ctxscript = $(top_srcdir)/w32_wrapper/context/context.exe +mtxscript = $(top_srcdir)/w32_wrapper/context/mtxrun.exe install-data-hook: installdirs-local if WIN32 @for s in $(texmf_other_scripts); do \ @@ -200,11 +201,17 @@ 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) @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; \ + if test "x$$t" = xmtxrun; then f=$(mtxscript); else f=$(ctxscript); fi; \ + echo "$(INSTALL_SCRIPT) '$$f' '$(DESTDIR)$(bindir)/$$t.exe'"; \ + $(INSTALL_SCRIPT) $$f $(DESTDIR)$(bindir)/$$t.exe; \ done + $(INSTALL_SCRIPT) $(top_srcdir)/w32_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,.*:,,'`; \ echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$link.exe'"; \ diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in index 58bc635805e..b91af58b461 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.in +++ b/Build/source/texk/texlive/linked_scripts/Makefile.in @@ -348,7 +348,8 @@ bin_links = \ relpath = $(SHELL) $(top_srcdir)/../../build-aux/relpath runscript = $(top_srcdir)/w32_wrapper/runscript.exe -ctxscript = $(top_srcdir)/w32_wrapper/context/mtxrun.exe +ctxscript = $(top_srcdir)/w32_wrapper/context/context.exe +mtxscript = $(top_srcdir)/w32_wrapper/context/mtxrun.exe @WIN32_TRUE@WINEXT = $(EXEEXT) shell_scripts = $(texmf_shell_scripts) $(texmf_context_scripts) all: all-am @@ -604,11 +605,17 @@ 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@ @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@ if test "x$$t" = xmtxrun; then f=$(mtxscript); else f=$(ctxscript); fi; \ +@WIN32_TRUE@ echo "$(INSTALL_SCRIPT) '$$f' '$(DESTDIR)$(bindir)/$$t.exe'"; \ +@WIN32_TRUE@ $(INSTALL_SCRIPT) $$f $(DESTDIR)$(bindir)/$$t.exe; \ @WIN32_TRUE@ done +@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/w32_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,.*:,,'`; \ @WIN32_TRUE@ echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$link.exe'"; \ diff --git a/Build/source/texk/texlive/w32_wrapper/context/context.exe b/Build/source/texk/texlive/w32_wrapper/context/context.exe new file mode 100755 index 00000000000..2d45f27494d Binary files /dev/null and b/Build/source/texk/texlive/w32_wrapper/context/context.exe differ diff --git a/Build/source/texk/texlive/w32_wrapper/context/mtxrun.dll b/Build/source/texk/texlive/w32_wrapper/context/mtxrun.dll index 4116c5a24a6..6ba2597d56f 100755 Binary files a/Build/source/texk/texlive/w32_wrapper/context/mtxrun.dll and b/Build/source/texk/texlive/w32_wrapper/context/mtxrun.dll differ diff --git a/Build/source/texk/texlive/w32_wrapper/context/mtxrun.exe b/Build/source/texk/texlive/w32_wrapper/context/mtxrun.exe index 745eaf22464..acd99ddbf3b 100755 Binary files a/Build/source/texk/texlive/w32_wrapper/context/mtxrun.exe and b/Build/source/texk/texlive/w32_wrapper/context/mtxrun.exe differ -- cgit v1.2.3