diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a8b5c02..f97565a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,6 +45,7 @@ option ( LUA_USE_ASSERT "Turn on assertions for the whole LuaJIT VM. This signif option ( LUAJIT_CPU_SSE2 "Disable SSE2." OFF ) option ( LUAJIT_CPU_NOCMOV "Disable NOCMOV." OFF ) +option ( LUA_SHARED_LIB "Build liblua as a dynamically linked library." ON ) # Tunable variables set ( LUAI_MAXSTACK 65500 CACHE NUMBER "Max. # of stack slots for a thread (<64K)." ) @@ -59,6 +60,12 @@ set ( LUA_MODULE_SUFFIX ${CMAKE_SHARED_MODULE_SUFFIX} ) set ( LUA_LDIR ${INSTALL_LMOD} ) set ( LUA_CDIR ${INSTALL_CMOD} ) +if ( LUA_SHARED_LIB ) + set ( LUA_LIB_TYPE SHARED ) +else () + set ( LUA_LIB_TYPE STATIC ) +endif () + if ( LUA_USE_RELATIVE_LOADLIB ) # This will set up relative paths to lib string ( REGEX REPLACE "[^!/]+" ".." LUA_DIR "!/${INSTALL_BIN}/" ) @@ -303,7 +310,7 @@ set ( LJCORE_C ${LJLIB_C} ) -add_library ( liblua SHARED ${LJCORE_C} ${DEPS} ) +add_library ( liblua ${LUA_LIB_TYPE} ${LJCORE_C} ${DEPS} ) target_link_libraries ( liblua ${LIBS} ) set_target_properties ( liblua PROPERTIES OUTPUT_NAME lua CLEAN_DIRECT_OUTPUT 1 ) diff --git a/COPYRIGHT b/COPYRIGHT index 08936dfb..6ed40025 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ =============================================================================== LuaJIT -- a Just-In-Time Compiler for Lua. http://luajit.org/ -Copyright (C) 2005-2014 Mike Pall. All rights reserved. +Copyright (C) 2005-2017 Mike Pall. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Makefile b/Makefile index b23b6481..ecce9ec5 100644 --- a/Makefile +++ b/Makefile @@ -10,12 +10,12 @@ # For MSVC, please follow the instructions given in src/msvcbuild.bat. # For MinGW and Cygwin, cd to src and run make with the Makefile there. # -# Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h +# Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h ############################################################################## MAJVER= 2 MINVER= 0 -RELVER= 3 +RELVER= 5 VERSION= $(MAJVER).$(MINVER).$(RELVER) ABIVER= 5.1 @@ -46,17 +46,18 @@ INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig INSTALL_TNAME= luajit-$(VERSION) INSTALL_TSYMNAME= luajit INSTALL_ANAME= libluajit-$(ABIVER).a -INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) -INSTALL_SOSHORT= libluajit-$(ABIVER).so -INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib +INSTALL_SOSHORT1= libluajit-$(ABIVER).so +INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER) +INSTALL_SONAME= $(INSTALL_SOSHORT2).$(MINVER).$(RELVER) INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib +INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib INSTALL_PCNAME= luajit.pc INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME) INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME) -INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT) -INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT) +INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT1) +INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT2) INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) @@ -87,12 +88,17 @@ FILES_JITLIB= bc.lua v.lua dump.lua dis_x86.lua dis_x64.lua dis_arm.lua \ dis_ppc.lua dis_mips.lua dis_mipsel.lua bcsave.lua vmdef.lua ifeq (,$(findstring Windows,$(OS))) - ifeq (Darwin,$(shell uname -s)) - INSTALL_SONAME= $(INSTALL_DYLIBNAME) - INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_DYLIBSHORT1) - INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_DYLIBSHORT2) - LDCONFIG= : - endif + HOST_SYS:= $(shell uname -s) +else + HOST_SYS= Windows +endif +TARGET_SYS?= $(HOST_SYS) + +ifeq (Darwin,$(TARGET_SYS)) + INSTALL_SONAME= $(INSTALL_DYLIBNAME) + INSTALL_SOSHORT1= $(INSTALL_DYLIBSHORT1) + INSTALL_SOSHORT2= $(INSTALL_DYLIBSHORT2) + LDCONFIG= : endif ############################################################################## diff --git a/README.md b/README.md index 902a6d2e..6cb7cebb 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -README for LuaJIT 2.0.3 +README for LuaJIT 2.0.5 ----------------------- LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language. Project Homepage: http://luajit.org/ -LuaJIT is Copyright (C) 2005-2014 Mike Pall. +LuaJIT is Copyright (C) 2005-2017 Mike Pall. LuaJIT is free software, released under the MIT license. See full Copyright Notice in the COPYRIGHT file or in luajit.h. diff --git a/dist.info b/dist.info index 76b6311f..64038489 100644 --- a/dist.info +++ b/dist.info @@ -1,7 +1,7 @@ --- This file is part of LuaDist project name = "luajit" -version = "2.0.3" +version = "2.0.5" desc = "LuaJIT is JIT compiler for the Lua language." author = "Mike Pall" diff --git a/doc/bluequad-print.css b/doc/bluequad-print.css index 21da8688..d5a3ea3a 100644 --- a/doc/bluequad-print.css +++ b/doc/bluequad-print.css @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2014 Mike Pall. +/* Copyright (C) 2004-2018 Mike Pall. * * You are welcome to use the general ideas of this design for your own sites. * But please do not steal the stylesheet, the layout or the color scheme. diff --git a/doc/bluequad.css b/doc/bluequad.css index 05b092e4..cfc889af 100644 --- a/doc/bluequad.css +++ b/doc/bluequad.css @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2014 Mike Pall. +/* Copyright (C) 2004-2018 Mike Pall. * * You are welcome to use the general ideas of this design for your own sites. * But please do not steal the stylesheet, the layout or the color scheme. diff --git a/doc/changes.html b/doc/changes.html index 98412293..c1848e8e 100644 --- a/doc/changes.html +++ b/doc/changes.html @@ -3,8 +3,7 @@ LuaJIT Change History - - + @@ -63,7 +62,7 @@

LuaJIT Change History

This is a list of changes between the released versions of LuaJIT.
-The current stable version is LuaJIT 2.0.3.
+The current stable version is LuaJIT 2.0.5.

Please check the @@ -72,6 +71,98 @@

LuaJIT Change History

+

LuaJIT 2.0.5 — 2017-05-01

+ + +

LuaJIT 2.0.4 — 2015-05-14

+ +

LuaJIT 2.0.3 — 2014-03-12

+If you want to report bugs, propose fixes or suggest enhancements, +please use the +GitHub issue tracker. +

+

Please send general questions to the » LuaJIT mailing list. +

+

You can also send any questions you have directly to me:

@@ -84,7 +90,7 @@

Contact

Copyright

All documentation is -Copyright © 2005-2014 Mike Pall. +Copyright © 2005-2018 Mike Pall.

@@ -92,7 +98,7 @@

Copyright