Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Prepare for 2.1.2 release
Browse files Browse the repository at this point in the history
Rename `LUAJIT_VERSION` to `LuaJIT .*` since applications seem to
expect that.  The copyright and URL ought to help differentiate from
the original LuaJIT project.  Eventually we need to change name for
consistency.  Perhaps for 3.x.

Signed-off-by: Siddhesh Poyarekar <siddhesh@gotplt.org>
  • Loading branch information
siddhesh committed Nov 24, 2019
1 parent 41af731 commit 9916847
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

MAJVER= 2
MINVER= 1
RELVER= 1
RELVER= 2
PREREL=
VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL)
ABIVER= 5.1
Expand Down
2 changes: 1 addition & 1 deletion etc/luajit.pc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Package information for LuaJIT to be used by pkg-config.
majver=2
minver=1
relver=1
relver=2
version=${majver}.${minver}.${relver}
abiver=5.1

Expand Down
2 changes: 1 addition & 1 deletion src/jit/bc.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

-- Cache some library functions and objects.
local jit = require("jit")
assert(jit.version_num == 20101, "LuaJIT core/library version mismatch")
assert(jit.version_num == 20102, "LuaJIT core/library version mismatch")
local jutil = require("jit.util")
local vmdef = require("jit.vmdef")
local bit = require("bit")
Expand Down
2 changes: 1 addition & 1 deletion src/jit/bcsave.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
------------------------------------------------------------------------------

local jit = require("jit")
assert(jit.version_num == 20101, "LuaJIT core/library version mismatch")
assert(jit.version_num == 20102, "LuaJIT core/library version mismatch")
local bit = require("bit")

-- Symbol name prefix for LuaJIT bytecode.
Expand Down
2 changes: 1 addition & 1 deletion src/jit/dump.lua
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

-- Cache some library functions and objects.
local jit = require("jit")
assert(jit.version_num == 20101, "LuaJIT core/library version mismatch")
assert(jit.version_num == 20102, "LuaJIT core/library version mismatch")
local jutil = require("jit.util")
local vmdef = require("jit.vmdef")
local funcinfo, funcbc = jutil.funcinfo, jutil.funcbc
Expand Down
2 changes: 1 addition & 1 deletion src/jit/p.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

-- Cache some library functions and objects.
local jit = require("jit")
assert(jit.version_num == 20101, "LuaJIT core/library version mismatch")
assert(jit.version_num == 20102, "LuaJIT core/library version mismatch")
local profile = require("jit.profile")
local vmdef = require("jit.vmdef")
local math = math
Expand Down
2 changes: 1 addition & 1 deletion src/jit/v.lua
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

-- Cache some library functions and objects.
local jit = require("jit")
assert(jit.version_num == 20101, "LuaJIT core/library version mismatch")
assert(jit.version_num == 20102, "LuaJIT core/library version mismatch")
local jutil = require("jit.util")
local vmdef = require("jit.vmdef")
local funcinfo, traceinfo = jutil.funcinfo, jutil.traceinfo
Expand Down
2 changes: 1 addition & 1 deletion src/luaconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#endif
#define LUA_LROOT "/usr/local"
#define LUA_LUADIR "/lua/5.1/"
#define LUA_LJDIR "/luajit-2.1.1/"
#define LUA_LJDIR "/luajit-2.1.2/"

#ifdef LUA_ROOT
#define LUA_JROOT LUA_ROOT
Expand Down
6 changes: 3 additions & 3 deletions src/luajit.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

#include "lua.h"

#define LUAJIT_VERSION "moonjit 2.1.1"
#define LUAJIT_VERSION_NUM 20101 /* Version 2.1.1 = 02.01.01. */
#define LUAJIT_VERSION_SYM luaJIT_version_2_1_1
#define LUAJIT_VERSION "LuaJIT 2.1.2"
#define LUAJIT_VERSION_NUM 20102 /* Version 2.1.2 = 02.01.02. */
#define LUAJIT_VERSION_SYM luaJIT_version_2_1_2
#define LUAJIT_COPYRIGHT "Copyright (C) 2019 moonjit developers"
#define LUAJIT_URL "https://github.com/moonjit/moonjit"

Expand Down

0 comments on commit 9916847

Please sign in to comment.