summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-04-16 11:15:39 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-04-16 11:15:39 +0000
commit3629c81cd8a170f182e5f4e7016383afcc81f1af (patch)
tree21102add069405405c7f76b27d75739220b2c8e3 /Build
parentc2afce19174c2c2c9f276ba20bb3b8ddfeea3a52 (diff)
Update ConTeXt wrappers (from Hans)
git-svn-id: svn://tug.org/texlive/trunk@29971 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/texlive/linked_scripts/ChangeLog5
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.am8
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.in8
-rwxr-xr-xBuild/source/texk/texlive/w32_wrapper/context/context.exebin6144 -> 0 bytes
-rwxr-xr-xBuild/source/texk/texlive/w32_wrapper/context/mtxrun.dllbin38400 -> 7680 bytes
-rwxr-xr-xBuild/source/texk/texlive/w32_wrapper/context/mtxrun.exebin34816 -> 4608 bytes
6 files changed, 11 insertions, 10 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index 8ab3cbf1398..bc60926f723 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am [WIN32], ../w32_wrapper/context/mtxrun.{dll,exe}:
+ Update ConTeXt wrappers (from Hans).
+
2013-04-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am [WIN32]: Install runscript.* and ConTeXt wrappers.
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 5ab5c8e0db5..76485006461 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -192,8 +192,7 @@ 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/context.exe
-mtxscript = $(top_srcdir)/w32_wrapper/context/mtxrun.exe
+ctxscript = $(top_srcdir)/w32_wrapper/context/mtxrun.exe
install-data-hook: installdirs-local
if WIN32
@for s in $(texmf_other_scripts); do \
@@ -206,9 +205,8 @@ if WIN32
$(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]'`; \
- 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; \
+ 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) $(srcdir)/context/stubs/unix/mtxrun $(DESTDIR)$(bindir)/mtxrun.lua
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index b9fbf09e5f0..37118e3d689 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -348,8 +348,7 @@ bin_links = \
relpath = $(SHELL) $(top_srcdir)/../../build-aux/relpath
runscript = $(top_srcdir)/w32_wrapper/runscript.exe
-ctxscript = $(top_srcdir)/w32_wrapper/context/context.exe
-mtxscript = $(top_srcdir)/w32_wrapper/context/mtxrun.exe
+ctxscript = $(top_srcdir)/w32_wrapper/context/mtxrun.exe
@WIN32_TRUE@WINEXT = $(EXEEXT)
shell_scripts = $(texmf_shell_scripts) $(texmf_context_scripts)
all: all-am
@@ -610,9 +609,8 @@ install-data-hook: installdirs-local
@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@ 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@ 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) $(srcdir)/context/stubs/unix/mtxrun $(DESTDIR)$(bindir)/mtxrun.lua
diff --git a/Build/source/texk/texlive/w32_wrapper/context/context.exe b/Build/source/texk/texlive/w32_wrapper/context/context.exe
deleted file mode 100755
index 2d45f27494d..00000000000
--- a/Build/source/texk/texlive/w32_wrapper/context/context.exe
+++ /dev/null
Binary files differ
diff --git a/Build/source/texk/texlive/w32_wrapper/context/mtxrun.dll b/Build/source/texk/texlive/w32_wrapper/context/mtxrun.dll
index 6ba2597d56f..5a79e1bad2e 100755
--- a/Build/source/texk/texlive/w32_wrapper/context/mtxrun.dll
+++ b/Build/source/texk/texlive/w32_wrapper/context/mtxrun.dll
Binary files differ
diff --git a/Build/source/texk/texlive/w32_wrapper/context/mtxrun.exe b/Build/source/texk/texlive/w32_wrapper/context/mtxrun.exe
index acd99ddbf3b..faae5caa7c4 100755
--- a/Build/source/texk/texlive/w32_wrapper/context/mtxrun.exe
+++ b/Build/source/texk/texlive/w32_wrapper/context/mtxrun.exe
Binary files differ