From f100e939b3262ac391fe767d591d1a316ab59f3a Mon Sep 17 00:00:00 2001 From: Luigi Scarso Date: Wed, 17 Jan 2018 18:00:12 +0000 Subject: Luatex 1.07 --- luatex and luatex53 git-svn-id: svn://tug.org/texlive/trunk@46348 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/am/libluatex.am | 28 +++- Build/source/texk/web2c/luatexdir/am/luaffi.am | 11 +- Build/source/texk/web2c/luatexdir/am/luamisc.am | 10 +- Build/source/texk/web2c/luatexdir/am/luasocket.am | 168 +++++++++++++++------- Build/source/texk/web2c/luatexdir/am/luatex.am | 35 ++++- 5 files changed, 190 insertions(+), 62 deletions(-) (limited to 'Build/source/texk/web2c/luatexdir/am') diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index cabbaa0b5d6..3e90186acc3 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -9,11 +9,20 @@ LUA_INCLUDES = $(LUA52_INCLUDES) $(LUA52_DEFINES) LUA_LIBS = $(LUA52_LIBS) LUA_DEPEND = $(LUA52_DEPEND) +## liblua53 +## +LUA_LUA53_INCLUDES = $(LUA53_INCLUDES) $(LUA53_DEFINES) +LUA_LUA53_LIBS = $(LUA53_LIBS) +LUA_LUA53_DEPEND = $(LUA53_DEPEND) + + + ## libluatex ## -EXTRA_LIBRARIES += libluatex.a libluajittex.a +EXTRA_LIBRARIES += libluatex.a liblua53tex.a libluajittex.a libluatex_a_DEPENDENCIES = libff.a libluamisc.a +liblua53tex_a_DEPENDENCIES = libff.a liblua53misc.a libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) @@ -25,10 +34,12 @@ libluatex_a_preflags += -DLUA_FF_LIB=1 -I$(srcdir)/luatexdir/luafontloader/fontf libluatex_a_preflags += -DSYNCTEX_ENGINE_H='' -I$(srcdir)/synctexdir libluatex_a_CPPFLAGS = $(libluatex_a_preflags) $(LUA_INCLUDES) +liblua53tex_a_CPPFLAGS = $(libluatex_a_preflags) $(LUA_LUA53_INCLUDES) libluajittex_a_CPPFLAGS = $(libluatex_a_preflags) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES) libluajittex_a_CPPFLAGS += -DLuajitTeX libluatex_a_CXXFLAGS = $(WARNING_CXXFLAGS) +liblua53tex_a_CXXFLAGS = $(WARNING_CXXFLAGS) libluajittex_a_CXXFLAGS = $(WARNING_CXXFLAGS) dist_libluatex_a_SOURCES = \ @@ -37,6 +48,12 @@ nodist_libluatex_a_SOURCES = \ helpers.c luastuff.c texluac.c \ $(dist_libluatex_sources) \ $(nodist_libluatex_sources) +dist_liblua53tex_a_SOURCES = \ + luatexdir/lua/lstrlibext.c +nodist_liblua53tex_a_SOURCES = \ + helpers.c luastuff.c texluac.c \ + $(dist_libluatex_sources) \ + $(nodist_libluatex_sources) dist_libluajittex_a_SOURCES = \ luatexdir/lua/lauxlib_bridge.h \ luatexdir/lua/lstrlibext.c @@ -47,6 +64,7 @@ nodist_libluajittex_a_SOURCES = \ ## mplib "stub" backends are in mplibstuff.c $(libluatex_a_OBJECTS): libff.a libmplibcore.a libluamisc.a $(POPPLER_DEPEND) +$(liblua53tex_a_OBJECTS): libff.a libmplibcore.a liblua53misc.a $(POPPLER_DEPEND) $(libluajittex_a_OBJECTS): libff.a libmplibcore.a libluajitmisc.a $(POPPLER_DEPEND) @@ -97,8 +115,6 @@ pkin.c: ctangle$(EXEEXT) luatexdir/font/pkin.w $(luatex_font_ctangle) pkin.w sfnt.c: ctangle$(EXEEXT) luatexdir/font/sfnt.w $(luatex_font_ctangle) sfnt.w -subfont.c: ctangle$(EXEEXT) luatexdir/font/subfont.w - $(luatex_font_ctangle) subfont.w texfont.c: ctangle$(EXEEXT) luatexdir/font/texfont.w $(luatex_font_ctangle) texfont.w tfmofm.c: ctangle$(EXEEXT) luatexdir/font/tfmofm.w @@ -131,7 +147,7 @@ writetype2.c: ctangle$(EXEEXT) luatexdir/font/writetype2.w $(luatex_font_ctangle) writetype2.w libluatex_web += luatexdir/font/dofont.w luatexdir/font/luafont.w luatexdir/font/mapfile.w -libluatex_web += luatexdir/font/pkin.w luatexdir/font/sfnt.w luatexdir/font/subfont.w +libluatex_web += luatexdir/font/pkin.w luatexdir/font/sfnt.w libluatex_web += luatexdir/font/texfont.w luatexdir/font/tfmofm.w libluatex_web += luatexdir/font/tounicode.w luatexdir/font/tt_glyf.w libluatex_web += luatexdir/font/tt_table.w luatexdir/font/vfovf.w @@ -141,7 +157,7 @@ libluatex_web += luatexdir/font/writet1.w luatexdir/font/writet3.w libluatex_web += luatexdir/font/writettf.w luatexdir/font/writetype0.w libluatex_web += luatexdir/font/writetype2.w -nodist_libluatex_sources += dofont.c luafont.c mapfile.c pkin.c sfnt.c subfont.c +nodist_libluatex_sources += dofont.c luafont.c mapfile.c pkin.c sfnt.c nodist_libluatex_sources += texfont.c tfmofm.c tounicode.c tt_glyf.c tt_table.c vfovf.c vfpacket.c nodist_libluatex_sources += writecff.c writeenc.c writefont.c writet1.c writet3.c writettf.c nodist_libluatex_sources += writetype0.c writetype2.c @@ -550,6 +566,8 @@ dist_libluatex_sources += \ synctexdir/synctex.c \ synctexdir/synctex.h +dist_liblua53tex_sources = $(dist_libluatex_sources) + EXTRA_DIST += \ $(dist_libluatex_sources) \ $(libluatex_web) diff --git a/Build/source/texk/web2c/luatexdir/am/luaffi.am b/Build/source/texk/web2c/luatexdir/am/luaffi.am index 3e64258cacf..c927b3df7af 100644 --- a/Build/source/texk/web2c/luatexdir/am/luaffi.am +++ b/Build/source/texk/web2c/luatexdir/am/luaffi.am @@ -12,19 +12,25 @@ ## -EXTRA_LIBRARIES += libluaffi.a +EXTRA_LIBRARIES += libluaffi.a liblua53ffi.a #libluaffi_a_DEPENDENCIES = $(ZLIB_DEPEND) $(libluaffi_a_OBJECTS): $(LUA_DEPEND) +$(liblua53ffi_a_OBJECTS): $(LUA_LUA53_DEPEND) libluaffi_a_CPPFLAGS = \ -I$(top_srcdir)/luatexdir/luaffi -I$(top_srcdir)/luatexdir/luaffi/dynasm $(LUA_INCLUDES) +liblua53ffi_a_CPPFLAGS = \ + -I$(top_srcdir)/luatexdir/luaffi -I$(top_srcdir)/luatexdir/luaffi/dynasm $(LUA_LUA53_INCLUDES) + + libluaffi_a_CFLAGS = # $(WARNING_CFLAGS) +liblua53ffi_a_CFLAGS = # $(WARNING_CFLAGS) nodist_libluaffi_a_SOURCES = $(libluaffi_sources) - +nodist_liblua53ffi_a_SOURCES = $(libluaffi_sources) libluaffi_sources = \ @@ -38,6 +44,7 @@ libluaffi_sources = \ luatexdir/luaffi/ffi.h \ luatexdir/luaffi/parser.c +liblua53ffi_sources = $(libluaffi_sources) ## Not used ## #EXTRA_DIST diff --git a/Build/source/texk/web2c/luatexdir/am/luamisc.am b/Build/source/texk/web2c/luatexdir/am/luamisc.am index 1a9c22f854d..7e874ae09af 100644 --- a/Build/source/texk/web2c/luatexdir/am/luamisc.am +++ b/Build/source/texk/web2c/luatexdir/am/luamisc.am @@ -6,22 +6,27 @@ ## libluamisc (luafilesystem, luamd5, luapeg, luazip, luazlib, ## and slnunicode) -EXTRA_LIBRARIES += libluamisc.a libluajitmisc.a +EXTRA_LIBRARIES += libluamisc.a liblua53misc.a libluajitmisc.a libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a libluaffi.a +liblua53misc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) liblua53socket.a liblua53ffi.a libluajitmisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluajitsocket.a $(libluamisc_a_OBJECTS): $(libluamisc_a_DEPENDENCIES) +$(liblua53misc_a_OBJECTS): $(liblua53misc_a_DEPENDENCIES) $(libluajitmisc_a_OBJECTS): $(libluajitmisc_a_DEPENDENCIES) libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUA_INCLUDES) +liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUA_LUA53_INCLUDES) libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(LUAJIT_INCLUDES) libluajitmisc_a_CPPFLAGS += -DLuajitTeX -I$(srcdir)/luatexdir libluamisc_a_CFLAGS = # $(WARNING_CFLAGS) +liblua53misc_a_CFLAGS = # $(WARNING_CFLAGS) libluajitmisc_a_CFLAGS = # $(WARNING_CFLAGS) nodist_libluamisc_a_SOURCES = $(libluamisc_sources) +nodist_liblua53misc_a_SOURCES = $(libluamisc_sources) nodist_libluajitmisc_a_SOURCES = $(libluamisc_sources) libluamisc_sources = \ @@ -49,7 +54,8 @@ EXTRA_DIST += \ EXTRA_DIST += \ luatexdir/luafilesystem/Makefile \ luatexdir/luafilesystem/Makefile.win \ - luatexdir/luafilesystem/README \ + luatexdir/luafilesystem/LICENSE \ + luatexdir/luafilesystem/README.md \ luatexdir/luafilesystem/config \ luatexdir/luafilesystem/config.win \ luatexdir/luafilesystem/doc \ diff --git a/Build/source/texk/web2c/luatexdir/am/luasocket.am b/Build/source/texk/web2c/luatexdir/am/luasocket.am index dd1c2fbd48d..8f8e1ab44ee 100644 --- a/Build/source/texk/web2c/luatexdir/am/luasocket.am +++ b/Build/source/texk/web2c/luatexdir/am/luasocket.am @@ -5,16 +5,22 @@ ## luasocket ## -EXTRA_LIBRARIES += libluasocket.a libluajitsocket.a +EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) +liblua53socket_a_DEPENDENCIES = $(ZLIB_DEPEND) libluajitsocket_a_DEPENDENCIES = $(ZLIB_DEPEND) $(libluasocket_a_OBJECTS): $(LUA_DEPEND) +$(liblua53socket_a_OBJECTS): $(LUA_DEPEND) $(libluajitsocket_a_OBJECTS): $(LUAJIT_DEPEND) libluasocket_a_CPPFLAGS = \ -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket $(LUA_INCLUDES) + +liblua53socket_a_CPPFLAGS = \ + -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket $(LUA_LUA53_INCLUDES) + libluajitsocket_a_CPPFLAGS = \ -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket $(LUAJIT_INCLUDES) @@ -22,38 +28,42 @@ libluasocket_a_CFLAGS = # $(WARNING_CFLAGS) libluajitsocket_a_CFLAGS = # $(WARNING_CFLAGS) nodist_libluasocket_a_SOURCES = $(libluasocket_sources) +nodist_liblua53socket_a_SOURCES = $(libluasocket_sources) nodist_libluajitsocket_a_SOURCES = $(libluasocket_sources) libluasocket_sources = \ - luatexdir/luasocket/src/auxiliar.c \ - luatexdir/luasocket/src/auxiliar.h \ - luatexdir/luasocket/src/buffer.c \ - luatexdir/luasocket/src/buffer.h \ - luatexdir/luasocket/src/except.c \ - luatexdir/luasocket/src/except.h \ - luatexdir/luasocket/src/inet.c \ - luatexdir/luasocket/src/inet.h \ - luatexdir/luasocket/src/io.c \ - luatexdir/luasocket/src/io.h \ + luatexdir/luasocket/src/auxiliar.c \ + luatexdir/luasocket/src/auxiliar.h \ + luatexdir/luasocket/src/buffer.c \ + luatexdir/luasocket/src/buffer.h \ + luatexdir/luasocket/src/compat.c \ + luatexdir/luasocket/src/compat.h \ + luatexdir/luasocket/src/except.c \ + luatexdir/luasocket/src/except.h \ + luatexdir/luasocket/src/inet.c \ + luatexdir/luasocket/src/inet.h \ + luatexdir/luasocket/src/io.c \ + luatexdir/luasocket/src/io.h \ luatexdir/luasocket/src/lua_preload.c \ - luatexdir/luasocket/src/luasocket.c \ - luatexdir/luasocket/src/luasocket.h \ - luatexdir/luasocket/src/mime.c \ - luatexdir/luasocket/src/mime.h \ - luatexdir/luasocket/src/options.c \ - luatexdir/luasocket/src/options.h \ - luatexdir/luasocket/src/select.c \ - luatexdir/luasocket/src/select.h \ - luatexdir/luasocket/src/serial.c \ - luatexdir/luasocket/src/socket.c \ - luatexdir/luasocket/src/socket.h \ - luatexdir/luasocket/src/tcp.c \ - luatexdir/luasocket/src/tcp.h \ - luatexdir/luasocket/src/timeout.c \ - luatexdir/luasocket/src/timeout.h \ - luatexdir/luasocket/src/udp.c \ - luatexdir/luasocket/src/udp.h \ - luatexdir/luasocket/src/usocket.h + luatexdir/luasocket/src/luasocket.c \ + luatexdir/luasocket/src/luasocket.h \ + luatexdir/luasocket/src/mime.c \ + luatexdir/luasocket/src/mime.h \ + luatexdir/luasocket/src/options.c \ + luatexdir/luasocket/src/options.h \ + luatexdir/luasocket/src/select.c \ + luatexdir/luasocket/src/select.h \ + luatexdir/luasocket/src/serial.c \ + luatexdir/luasocket/src/socket.h \ + luatexdir/luasocket/src/socket.c \ + luatexdir/luasocket/src/tcp.c \ + luatexdir/luasocket/src/tcp.h \ + luatexdir/luasocket/src/timeout.c \ + luatexdir/luasocket/src/timeout.h \ + luatexdir/luasocket/src/udp.c \ + luatexdir/luasocket/src/udp.h \ + luatexdir/luasocket/src/usocket.h + ## The files *_lua.c are included from lua_preload.c ## @@ -68,35 +78,16 @@ EXTRA_DIST += \ luatexdir/luasocket/src/smtp_lua.c \ luatexdir/luasocket/src/socket_lua.c \ luatexdir/luasocket/src/tp_lua.c \ - luatexdir/luasocket/src/url_lua.c + luatexdir/luasocket/src/url_lua.c ## Not used ## EXTRA_DIST += \ - luatexdir/luasocket/src/Makefile \ - luatexdir/luasocket/src/unix.c \ - luatexdir/luasocket/src/unix.h \ - luatexdir/luasocket/src/usocket.c \ - luatexdir/luasocket/src/wsocket.c \ - luatexdir/luasocket/src/wsocket.h \ - luatexdir/luasocket/src/ftp.lua \ - luatexdir/luasocket/src/headers.lua \ - luatexdir/luasocket/src/http.lua \ - luatexdir/luasocket/src/smtp.lua \ - luatexdir/luasocket/src/socket.lua \ - luatexdir/luasocket/src/tp.lua \ - luatexdir/luasocket/src/url.lua \ - luatexdir/luasocket/src/ltn12.lua \ - luatexdir/luasocket/src/mbox.lua \ - luatexdir/luasocket/src/mime.lua \ luatexdir/luasocket/LICENSE \ + luatexdir/luasocket/Lua51.props \ + luatexdir/luasocket/Lua52.props \ luatexdir/luasocket/NEW \ luatexdir/luasocket/README \ - luatexdir/luasocket/config \ - luatexdir/luasocket/luasocket.sln \ - luatexdir/luasocket/makefile \ - luatexdir/luasocket/mime.vcproj \ - luatexdir/luasocket/socket.vcproj \ luatexdir/luasocket/doc/dns.html \ luatexdir/luasocket/doc/ftp.html \ luatexdir/luasocket/doc/http.html \ @@ -104,6 +95,7 @@ EXTRA_DIST += \ luatexdir/luasocket/doc/installation.html \ luatexdir/luasocket/doc/introduction.html \ luatexdir/luasocket/doc/ltn12.html \ + luatexdir/luasocket/doc/lua05.ppt \ luatexdir/luasocket/doc/luasocket.png \ luatexdir/luasocket/doc/mime.html \ luatexdir/luasocket/doc/reference.css \ @@ -117,14 +109,20 @@ EXTRA_DIST += \ luatexdir/luasocket/etc/b64.lua \ luatexdir/luasocket/etc/check-links.lua \ luatexdir/luasocket/etc/check-memory.lua \ + luatexdir/luasocket/etc/cookie.lua \ luatexdir/luasocket/etc/dict.lua \ luatexdir/luasocket/etc/dispatch.lua \ luatexdir/luasocket/etc/eol.lua \ luatexdir/luasocket/etc/forward.lua \ luatexdir/luasocket/etc/get.lua \ + luatexdir/luasocket/etc/links \ luatexdir/luasocket/etc/lp.lua \ luatexdir/luasocket/etc/qp.lua \ luatexdir/luasocket/etc/tftp.lua \ + luatexdir/luasocket/luasocket.sln \ + luatexdir/luasocket/makefile \ + luatexdir/luasocket/mime.vcxproj \ + luatexdir/luasocket/mime.vcxproj.filters \ luatexdir/luasocket/samples/README \ luatexdir/luasocket/samples/cddb.lua \ luatexdir/luasocket/samples/daytimeclnt.lua \ @@ -132,10 +130,76 @@ EXTRA_DIST += \ luatexdir/luasocket/samples/echosrvr.lua \ luatexdir/luasocket/samples/listener.lua \ luatexdir/luasocket/samples/lpr.lua \ + luatexdir/luasocket/samples/mclisten.lua \ + luatexdir/luasocket/samples/mcsend.lua \ luatexdir/luasocket/samples/talker.lua \ luatexdir/luasocket/samples/tinyirc.lua \ + luatexdir/luasocket/socket.vcxproj \ + luatexdir/luasocket/socket.vcxproj.filters \ + luatexdir/luasocket/src/ftp.lua \ + luatexdir/luasocket/src/headers.lua \ + luatexdir/luasocket/src/http.lua \ + luatexdir/luasocket/src/ltn12.lua \ + luatexdir/luasocket/src/makefile \ + luatexdir/luasocket/src/mbox.lua \ + luatexdir/luasocket/src/mime.lua \ + luatexdir/luasocket/src/pierror.h \ + luatexdir/luasocket/src/serial.c \ + luatexdir/luasocket/src/smtp.lua \ + luatexdir/luasocket/src/socket.h \ + luatexdir/luasocket/src/socket.lua \ + luatexdir/luasocket/src/tp.lua \ + luatexdir/luasocket/src/unix.c \ + luatexdir/luasocket/src/unix.h \ + luatexdir/luasocket/src/unixdgram.c \ + luatexdir/luasocket/src/unixdgram.h \ + luatexdir/luasocket/src/unixstream.c \ + luatexdir/luasocket/src/unixstream.h \ + luatexdir/luasocket/src/url.lua \ + luatexdir/luasocket/src/usocket.c \ + luatexdir/luasocket/src/wsocket.c \ + luatexdir/luasocket/src/wsocket.h \ luatexdir/luasocket/test/README \ + luatexdir/luasocket/test/auth/.htaccess \ + luatexdir/luasocket/test/auth/.htpasswd \ + luatexdir/luasocket/test/auth/index.html \ + luatexdir/luasocket/test/cgi/cat \ + luatexdir/luasocket/test/cgi/cat-index-html \ + luatexdir/luasocket/test/cgi/env \ + luatexdir/luasocket/test/cgi/query-string \ + luatexdir/luasocket/test/cgi/redirect-loop \ + luatexdir/luasocket/test/cgi/request-uri \ + luatexdir/luasocket/test/dicttest.lua \ + luatexdir/luasocket/test/excepttest.lua \ + luatexdir/luasocket/test/find-connect-limit \ + luatexdir/luasocket/test/ftptest.lua \ + luatexdir/luasocket/test/hello.lua \ + luatexdir/luasocket/test/httptest.lua \ + luatexdir/luasocket/test/index.html \ + luatexdir/luasocket/test/ltn12test.lua \ + luatexdir/luasocket/test/luasocket.png \ + luatexdir/luasocket/test/mimetest.lua \ + luatexdir/luasocket/test/smtptest.lua \ + luatexdir/luasocket/test/stufftest.lua \ + luatexdir/luasocket/test/tcp-getoptions \ + luatexdir/luasocket/test/test_bind.lua \ + luatexdir/luasocket/test/test_getaddrinfo.lua \ + luatexdir/luasocket/test/test_socket_error.lua \ luatexdir/luasocket/test/testclnt.lua \ + luatexdir/luasocket/test/testmesg.lua \ luatexdir/luasocket/test/testsrvr.lua \ - luatexdir/luasocket/test/testsupport.lua + luatexdir/luasocket/test/testsupport.lua \ + luatexdir/luasocket/test/tftptest.lua \ + luatexdir/luasocket/test/udp-zero-length-send \ + luatexdir/luasocket/test/udp-zero-length-send-recv \ + luatexdir/luasocket/test/udpconnectclnt.lua \ + luatexdir/luasocket/test/udpconnectsrvr.lua \ + luatexdir/luasocket/test/unixdgramclnt.lua \ + luatexdir/luasocket/test/unixdgramsrvr.lua \ + luatexdir/luasocket/test/unixstreamclnt.lua \ + luatexdir/luasocket/test/unixstreamsrvr.lua \ + luatexdir/luasocket/test/upload.html \ + luatexdir/luasocket/test/urltest.lua \ + luatexdir/luasocket/test/utestclnt.lua \ + luatexdir/luasocket/test/utestsrvr.lua diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index 41b8610a251..048adfa6c85 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -16,6 +16,17 @@ bin_links += luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac endif !WIN32 endif LUATEX +if LUATEX53 +bin_PROGRAMS += luatex53 +if WIN32 +noinst_PROGRAMS += call_luatex53 +install_exe_links += install-luatex53-links +uninstall_exe_links += uninstall-luatex53-links +else !WIN32 +bin_links += luatex53$(EXEEXT):texlua53 luatex53$(EXEEXT):texlua53c +endif !WIN32 +endif LUATEX53 + if LUAJITTEX bin_PROGRAMS += luajittex if WIN32 @@ -27,10 +38,11 @@ bin_links += luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc endif !WIN32 endif LUAJITTEX -EXTRA_PROGRAMS += luatex luajittex +EXTRA_PROGRAMS += luatex luatex53 luajittex # Force Automake to use CXXLD for linking nodist_EXTRA_luatex_SOURCES = dummy.cxx +nodist_EXTRA_luatex53_SOURCES = dummy.cxx nodist_EXTRA_luajittex_SOURCES = dummy.cxx luatex_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(POPPLER_INCLUDES) @@ -39,32 +51,41 @@ luatex_postflags += -Dextra_version_info=`date +-%Y%m%d%H` luatex_postflags += -I$(srcdir)/synctexdir -DSYNCTEX_ENGINE_H='' luatex_CPPFLAGS = $(luatex_preflags) $(LUA_INCLUDES) $(luatex_postflags) +luatex53_CPPFLAGS = $(luatex_preflags) $(LUA_LUA53_INCLUDES) $(luatex_postflags) luajittex_CPPFLAGS = $(luatex_preflags) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES) $(luatex_postflags) luajittex_CPPFLAGS += -DLuajitTeX luatex_CXXFLAGS = $(WARNING_CXXFLAGS) +luatex53_CXXFLAGS = $(WARNING_CXXFLAGS) luajittex_CXXFLAGS = $(WARNING_CXXFLAGS) luatex_LDFLAGS = -export-dynamic +luatex53_LDFLAGS = -export-dynamic luajittex_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA) luatex_postldadd = libmplibcore.a $(MPFR_LIBS) $(GMP_LIBS) luatex_postldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) luatex_postldadd += $(LDADD) libmputil.a libunilib.a libmd5.a $(lua_socketlibs) + luatex_LDADD = libluatex.a libff.a libluamisc.a libluasocket.a libluaffi.a $(LUA_LIBS) $(luatex_postldadd) +luatex53_LDADD = liblua53tex.a libff.a liblua53misc.a liblua53socket.a liblua53ffi.a $(LUA_LUA53_LIBS) $(luatex_postldadd) luajittex_LDADD = libluajittex.a libff.a libluajitmisc.a libluajitsocket.a $(LUAJIT_LIBS) $(luatex_postldadd) luatex_depend = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) libmputil.a libmd5.a luatex_DEPENDENCIES = $(luatex_depend) libluatex.a +luatex53_DEPENDENCIES = $(luatex_depend) liblua53tex.a luajittex_DEPENDENCIES = $(luatex_depend) libluajittex.a $(luatex_OBJECTS): libluatex.a +$(luatex53_OBJECTS): liblua53tex.a $(luajittex_OBJECTS): libluajittex.a nodist_luatex_SOURCES = $(luatex_sources) +nodist_luatex53_SOURCES = $(luatex_sources) nodist_luajittex_SOURCES = $(luatex_sources) + luatex_sources = \ luatexdir/luatex_svnversion.h \ luatexdir/luatex.c \ @@ -77,6 +98,11 @@ EXTRA_DIST += \ call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\" nodist_call_luatex_SOURCES = callexe.c call_luatex_LDADD = + +call_luatex53_CPPFLAGS = -DEXEPROG=\"luatex53.exe\" +nodist_call_luatex53_SOURCES = callexe.c +call_luatex53_LDADD = + call_luajittex_CPPFLAGS = -DEXEPROG=\"luajittex.exe\" nodist_call_luajittex_SOURCES = callexe.c call_luajittex_LDADD = @@ -102,6 +128,10 @@ endif WIN32 # luatex_tests = luatexdir/luatex.test luatexdir/luaimage.test luatexdir/luatex.log luatexdir/luaimage.log: luatex$(EXEEXT) +luatex53_tests = luatexdir/luatex.test luatexdir/luaimage.test +luatexdir/luatex53.log luatexdir/luaimage53.log: luatex53$(EXEEXT) + + luajittex_tests = luatexdir/luajittex.test luatexdir/luajitimage.test luatexdir/luajittex.log luatexdir/luajitimage.log: luajittex$(EXEEXT) @@ -110,6 +140,9 @@ EXTRA_DIST += $(luatex_tests) $(luajittex_tests) if LUATEX TESTS += $(luatex_tests) endif LUATEX +if LUATEX53 +TESTS += $(luatex_tests) +endif LUATEX53 if LUAJITTEX TESTS += $(luajittex_tests) endif LUAJITTEX -- cgit v1.2.3