BRANCH LuaJIT-2.1

9 files changed, 27 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 7976b925..40c22434 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,10 @@
 ##############################################################################
 
 MAJVER=  2
-MINVER=  0
-RELVER=  1
-VERSION= $(MAJVER).$(MINVER).$(RELVER)
+MINVER=  1
+RELVER=  0
+PREREL=  -alpha
+VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL)
 ABIVER=  5.1
 
 ##############################################################################
@@ -107,7 +108,7 @@ install: $(INSTALL_DEP)
         $(MKDIR) $(INSTALL_DIRS)
         cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T)
         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) && \
           $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
           $(LDCONFIG) $(INSTALL_LIB) && \
@@ -119,12 +120,18 @@ install: $(INSTALL_DEP)
           $(RM) $(FILE_PC).tmp
         cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
         cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
-        $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)
         @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:
         @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 \
           $(UNINSTALL) $(INSTALL_JITLIB)/$$file; \
           done
diff --git a/README b/README
index e68604b7..f9ba16b9 100644
--- a/README
+++ b/README
@@ -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.
 
diff --git a/etc/luajit.pc b/etc/luajit.pc
index 2ce6e94c..d3c7d9a2 100644
--- a/etc/luajit.pc
+++ b/etc/luajit.pc
@@ -1,8 +1,8 @@
 # Package information for LuaJIT to be used by pkg-config.
 majver=2
-minver=0
-relver=1
-version=${majver}.${minver}.${relver}
+minver=1
+relver=0
+version=${majver}.${minver}.${relver}-alpha
 abiver=5.1
 
 prefix=/usr/local
diff --git a/src/jit/bc.lua b/src/jit/bc.lua
index 5c00ebe3..dd1c1f3b 100644
--- a/src/jit/bc.lua
+++ b/src/jit/bc.lua
@@ -41,7 +41,7 @@
 
 -- Cache some library functions and objects.
 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 vmdef = require("jit.vmdef")
 local bit = require("bit")
diff --git a/src/jit/bcsave.lua b/src/jit/bcsave.lua
index 25bd6042..a54094dd 100644
--- a/src/jit/bcsave.lua
+++ b/src/jit/bcsave.lua
@@ -11,7 +11,7 @@
 ------------------------------------------------------------------------------
 
 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")
 
 -- Symbol name prefix for LuaJIT bytecode.
diff --git a/src/jit/dump.lua b/src/jit/dump.lua
index 70a59280..b9c6cf41 100644
--- a/src/jit/dump.lua
+++ b/src/jit/dump.lua
@@ -54,7 +54,7 @@
 
 -- Cache some library functions and objects.
 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 vmdef = require("jit.vmdef")
 local funcinfo, funcbc = jutil.funcinfo, jutil.funcbc
diff --git a/src/jit/v.lua b/src/jit/v.lua
index f4a9b054..88c358b5 100644
--- a/src/jit/v.lua
+++ b/src/jit/v.lua
@@ -59,7 +59,7 @@
 
 -- Cache some library functions and objects.
 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 vmdef = require("jit.vmdef")
 local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo
diff --git a/src/luaconf.h b/src/luaconf.h
index 8e3a7aaa..d283233d 100644
--- a/src/luaconf.h
+++ b/src/luaconf.h
@@ -30,12 +30,12 @@
 #define LUA_LDIR        LUA_ROOT "share/lua/5.1/"
 #define LUA_CDIR        LUA_ROOT "lib/lua/5.1/"
 #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 \
   ";" 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;"
 #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_XCPATH
 #endif
diff --git a/src/luajit.h b/src/luajit.h
index ed39d014..a4c939bf 100644
--- a/src/luajit.h
+++ b/src/luajit.h
@@ -30,9 +30,9 @@
 
 #include "lua.h"
 
-#define LUAJIT_VERSION          "LuaJIT 2.0.1"
-#define LUAJIT_VERSION_NUM      20001  /* Version 2.0.1 = 02.00.01. */
-#define LUAJIT_VERSION_SYM      luaJIT_version_2_0_1
+#define LUAJIT_VERSION          "LuaJIT 2.1.0-alpha"
+#define LUAJIT_VERSION_NUM      20100  /* Version 2.1.0 = 02.01.00. */
+#define LUAJIT_VERSION_SYM      luaJIT_version_2_1_0_alpha
 #define LUAJIT_COPYRIGHT        "Copyright (C) 2005-2013 Mike Pall"
 #define LUAJIT_URL              "http://luajit.org/"