gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 15:14:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BRANCH LuaJIT-2.1

Browse Source
This commit is contained in:
Mike Pall 2013-02-21 16:49:04 +01:00
parent d4bc6ab756
commit 61fb587d2c
9 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -14,9 +14,10 @@
############################################################################## ##############################################################################
MAJVER= 2 MAJVER= 2
MINVER= 0 MINVER= 1
RELVER= 1 RELVER= 0
VERSION= $(MAJVER).$(MINVER).$(RELVER) PREREL= -alpha
VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL)
ABIVER= 5.1 ABIVER= 5.1
############################################################################## ##############################################################################
@ -107,7 +108,7 @@ install: $(INSTALL_DEP)
$(MKDIR) $(INSTALL_DIRS) $(MKDIR) $(INSTALL_DIRS)
cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T) cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T)
cd src && test -f $(FILE_A) && $(INSTALL_F) $(FILE_A) $(INSTALL_STATIC) || : cd src && test -f $(FILE_A) && $(INSTALL_F) $(FILE_A) $(INSTALL_STATIC) || :
$(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
cd src && test -f $(FILE_SO) && \ cd src && test -f $(FILE_SO) && \
$(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
$(LDCONFIG) $(INSTALL_LIB) && \ $(LDCONFIG) $(INSTALL_LIB) && \
@ -119,12 +120,18 @@ install: $(INSTALL_DEP)
$(RM) $(FILE_PC).tmp $(RM) $(FILE_PC).tmp
cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC) cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB) cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
$(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)
@echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ====" @echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
@echo ""
@echo "Note: the development releases deliberately do NOT install a symlink for luajit"
@echo "You can do this now by running this command (with sudo):"
@echo ""
@echo " $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)"
@echo ""
uninstall: uninstall:
@echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ====" @echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ===="
$(UNINSTALL) $(INSTALL_TSYM) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/$(FILE_MAN) $(INSTALL_PC) $(UNINSTALL) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/$(FILE_MAN) $(INSTALL_PC)
for file in $(FILES_JITLIB); do \ for file in $(FILES_JITLIB); do \
$(UNINSTALL) $(INSTALL_JITLIB)/$$file; \ $(UNINSTALL) $(INSTALL_JITLIB)/$$file; \
done done

4
README
View File

@ -1,5 +1,5 @@
README for LuaJIT 2.0.1 README for LuaJIT 2.1.0-alpha
----------------------- -----------------------------
LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language. LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.

6
etc/luajit.pc
View File

@ -1,8 +1,8 @@
# Package information for LuaJIT to be used by pkg-config. # Package information for LuaJIT to be used by pkg-config.
majver=2 majver=2
minver=0 minver=1
relver=1 relver=0
version=${majver}.${minver}.${relver} version=${majver}.${minver}.${relver}-alpha
abiver=5.1 abiver=5.1
prefix=/usr/local prefix=/usr/local

2
src/jit/bc.lua
View File

@ -41,7 +41,7 @@
-- Cache some library functions and objects. -- Cache some library functions and objects.
local jit = require("jit") local jit = require("jit")
assert(jit.version_num == 20001, "LuaJIT core/library version mismatch") assert(jit.version_num == 20100, "LuaJIT core/library version mismatch")
local jutil = require("jit.util") local jutil = require("jit.util")
local vmdef = require("jit.vmdef") local vmdef = require("jit.vmdef")
local bit = require("bit") local bit = require("bit")

2
src/jit/bcsave.lua
View File

@ -11,7 +11,7 @@
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
local jit = require("jit") local jit = require("jit")
assert(jit.version_num == 20001, "LuaJIT core/library version mismatch") assert(jit.version_num == 20100, "LuaJIT core/library version mismatch")
local bit = require("bit") local bit = require("bit")
-- Symbol name prefix for LuaJIT bytecode. -- Symbol name prefix for LuaJIT bytecode.

2
src/jit/dump.lua
View File

@ -54,7 +54,7 @@
-- Cache some library functions and objects. -- Cache some library functions and objects.
local jit = require("jit") local jit = require("jit")
assert(jit.version_num == 20001, "LuaJIT core/library version mismatch") assert(jit.version_num == 20100, "LuaJIT core/library version mismatch")
local jutil = require("jit.util") local jutil = require("jit.util")
local vmdef = require("jit.vmdef") local vmdef = require("jit.vmdef")
local funcinfo, funcbc = jutil.funcinfo, jutil.funcbc local funcinfo, funcbc = jutil.funcinfo, jutil.funcbc

2
src/jit/v.lua
View File

@ -59,7 +59,7 @@
-- Cache some library functions and objects. -- Cache some library functions and objects.
local jit = require("jit") local jit = require("jit")
assert(jit.version_num == 20001, "LuaJIT core/library version mismatch") assert(jit.version_num == 20100, "LuaJIT core/library version mismatch")
local jutil = require("jit.util") local jutil = require("jit.util")
local vmdef = require("jit.vmdef") local vmdef = require("jit.vmdef")
local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo

4
src/luaconf.h
View File

@ -30,12 +30,12 @@
#define LUA_LDIR LUA_ROOT "share/lua/5.1/" #define LUA_LDIR LUA_ROOT "share/lua/5.1/"
#define LUA_CDIR LUA_ROOT "lib/lua/5.1/" #define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
#ifdef LUA_XROOT #ifdef LUA_XROOT
#define LUA_JDIR LUA_XROOT "share/luajit-2.0.1/" #define LUA_JDIR LUA_XROOT "share/luajit-2.1.0-alpha/"
#define LUA_XPATH \ #define LUA_XPATH \
";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua" ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua"
#define LUA_XCPATH LUA_XROOT "lib/lua/5.1/?.so;" #define LUA_XCPATH LUA_XROOT "lib/lua/5.1/?.so;"
#else #else
#define LUA_JDIR LUA_ROOT "share/luajit-2.0.1/" #define LUA_JDIR LUA_ROOT "share/luajit-2.1.0-alpha/"
#define LUA_XPATH #define LUA_XPATH
#define LUA_XCPATH #define LUA_XCPATH
#endif #endif

6
src/luajit.h
View File

@ -30,9 +30,9 @@
#include "lua.h" #include "lua.h"
#define LUAJIT_VERSION "LuaJIT 2.0.1" #define LUAJIT_VERSION "LuaJIT 2.1.0-alpha"
#define LUAJIT_VERSION_NUM 20001 /* Version 2.0.1 = 02.00.01. */ #define LUAJIT_VERSION_NUM 20100 /* Version 2.1.0 = 02.01.00. */
#define LUAJIT_VERSION_SYM luaJIT_version_2_0_1 #define LUAJIT_VERSION_SYM luaJIT_version_2_1_0_alpha
#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2013 Mike Pall" #define LUAJIT_COPYRIGHT "Copyright (C) 2005-2013 Mike Pall"
#define LUAJIT_URL "http://luajit.org/" #define LUAJIT_URL "http://luajit.org/"