Switch build system to rolling releases.

diff --git a/Makefile b/Makefile
index 9fc0032cb6fae0f9ba6d24ac24eab54f32b12979..792d7e5698a30212d6701b28acbb6a0b6ef545a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,10 +15,16 @@
 
 MAJVER=  2
 MINVER=  0
-RELVER=  5
-VERSION= $(MAJVER).$(MINVER).$(RELVER)
 ABIVER=  5.1
 
+# LuaJIT uses rolling releases. The release version is based on the time of
+# the latest git commit. The 'git' command must be available during the build.
+RELVER= $(shell cat src/luajit_relver.txt 2>/dev/null || : )
+# Note: setting it with := doesn't work, since it will change during the build.
+
+MMVERSION= $(MAJVER).$(MINVER)
+VERSION= $(MMVERSION).$(RELVER)
+
 ##############################################################################
 #
 # Change the installation path as needed. This automatically adjusts
@@ -32,10 +38,10 @@ DPREFIX= $(DESTDIR)$(PREFIX)
 INSTALL_BIN=   $(DPREFIX)/bin
 INSTALL_LIB=   $(DPREFIX)/$(MULTILIB)
 INSTALL_SHARE= $(DPREFIX)/share
-INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
+INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION)
 INSTALL_INC=   $(INSTALL_DEFINC)
 
-INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
+INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION)
 INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
 INSTALL_LMODD= $(INSTALL_SHARE)/lua
 INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
@@ -49,10 +55,10 @@ INSTALL_TSYMNAME= luajit
 INSTALL_ANAME= libluajit-$(ABIVER).a
 INSTALL_SOSHORT1= libluajit-$(ABIVER).so
 INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER)
-INSTALL_SONAME= $(INSTALL_SOSHORT2).$(MINVER).$(RELVER)
+INSTALL_SONAME= libluajit-$(ABIVER).so.$(VERSION)
 INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib
 INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib
-INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
+INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(VERSION).dylib
 INSTALL_PCNAME= luajit.pc
 
 INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME)
@@ -77,7 +83,8 @@ INSTALL_F= install -m 0644
 UNINSTALL= $(RM)
 LDCONFIG= ldconfig -n 2>/dev/null
 SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
-            -e "s|^multilib=.*|multilib=$(MULTILIB)|"
+           -e "s|^multilib=.*|multilib=$(MULTILIB)|" \
+           -e "s|^relver=.*|relver=$(RELVER)|"
 ifneq ($(INSTALL_DEFINC),$(INSTALL_INC))
   SED_PC+= -e "s|^includedir=.*|includedir=$(INSTALL_INC)|"
 endif
@@ -110,9 +117,9 @@ endif
 INSTALL_DEP= src/luajit
 
 default all $(INSTALL_DEP):
-       @echo "==== Building LuaJIT $(VERSION) ===="
+       @echo "==== Building LuaJIT $(MMVERSION) ===="
        $(MAKE) -C src
-       @echo "==== Successfully built LuaJIT $(VERSION) ===="
+       @echo "==== Successfully built LuaJIT $(MMVERSION) ===="
 
 install: $(INSTALL_DEP)
        @echo "==== Installing LuaJIT $(VERSION) to $(PREFIX) ===="
@@ -150,8 +157,9 @@ uninstall:
 ##############################################################################
 
 amalg:
-       @echo "Building LuaJIT $(VERSION)"
+       @echo "==== Building LuaJIT $(MMVERSION) (amalgamation) ===="
        $(MAKE) -C src amalg
+       @echo "==== Successfully built LuaJIT $(MMVERSION) (amalgamation) ===="
 
 clean:
        $(MAKE) -C src clean

diff --git a/etc/luajit.pc b/etc/luajit.pc
index 9bac3a8bc064562d48375d1924183f266f1859f5..68f8d5cc0b1e26a1fca428ee8f4a9db247c71972 100644 (file)
--- a/etc/luajit.pc
+++ b/etc/luajit.pc
@@ -1,7 +1,7 @@
 # Package information for LuaJIT to be used by pkg-config.
 majver=2
 minver=0
-relver=5
+relver=ROLLING
 version=${majver}.${minver}.${relver}
 abiver=5.1
 

diff --git a/src/.gitignore b/src/.gitignore
index fc94e82cc88c983b162a528b5eeb668f6874ec37..19f2a00eeed3df713b60512daaea00b7045a252d 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,4 +1,6 @@
 luajit
+luajit.h
+luajit_relver.txt
 lj_bcdef.h
 lj_ffdef.h
 lj_libdef.h

diff --git a/src/Makefile b/src/Makefile
index aac78beb15ba6540b04b5c9cc4b1b2591ddf35c3..e6954a9550d1b340adc73076b44a01475aae5d28 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,7 +12,6 @@
 
 MAJVER=  2
 MINVER=  0
-RELVER=  5
 ABIVER=  5.1
 NODOTABIVER= 51
 
@@ -308,7 +307,7 @@ ifeq (Darwin,$(TARGET_SYS))
   TARGET_STRIP+= -x
   TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
   TARGET_DYNXLDOPTS=
-  TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
+  TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).255
   ifeq (x64,$(TARGET_LJARCH))
     TARGET_XLDFLAGS+= -pagezero_size 10000 -image_base 100000000
     TARGET_XSHLDFLAGS+= -image_base 7fff04c4a000
@@ -318,7 +317,7 @@ ifeq (iOS,$(TARGET_SYS))
   TARGET_STRIP+= -x
   TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
   TARGET_DYNXLDOPTS=
-  TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
+  TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).255
 else
   ifneq (SunOS,$(TARGET_SYS))
     ifneq (PS3,$(TARGET_SYS))
@@ -367,10 +366,11 @@ MINILUA_O= host/minilua.o
 MINILUA_LIBS= -lm
 MINILUA_T= host/minilua
 MINILUA_X= $(MINILUA_T)
+MINILUA_DEP=
 
 ifeq (,$(HOST_LUA))
   HOST_LUA= $(MINILUA_X)
-  DASM_DEP= $(MINILUA_T)
+  MINILUA_DEP= $(MINILUA_T)
 endif
 
 DASM_DIR= ../dynasm
@@ -445,6 +445,10 @@ endif
 DASM_FLAGS= $(DASM_XFLAGS) $(DASM_AFLAGS)
 DASM_DASC= vm_$(DASM_ARCH).dasc
 
+GIT= git
+GIT_RELVER= [ -d ../.git ] && $(GIT) show -s --format=%ct >luajit_relver.txt 2>/dev/null || cat ../.relver >luajit_relver.txt 2>/dev/null || :
+GIT_DEP= $(wildcard ../.git/HEAD ../.git/refs/heads/*)
+
 BUILDVM_O= host/buildvm.o host/buildvm_asm.o host/buildvm_peobj.o \
           host/buildvm_lib.o host/buildvm_fold.o
 BUILDVM_T= host/buildvm
@@ -488,8 +492,8 @@ LUAJIT_T= luajit
 
 ALL_T= $(LUAJIT_T) $(LUAJIT_A) $(LUAJIT_SO) $(HOST_T)
 ALL_HDRGEN= lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h \
-           host/buildvm_arch.h
-ALL_GEN= $(LJVM_S) $(ALL_HDRGEN) $(LIB_VMDEFP)
+           host/buildvm_arch.h luajit.h
+ALL_GEN= $(LJVM_S) $(ALL_HDRGEN) luajit_relver.txt $(LIB_VMDEFP)
 WIN_RM= *.obj *.lib *.exp *.dll *.exe *.manifest *.pdb *.ilk
 ALL_RM= $(ALL_T) $(ALL_GEN) *.o host/*.o $(WIN_RM)
 
@@ -610,7 +614,12 @@ $(MINILUA_T): $(MINILUA_O)
        $(E) "HOSTLINK  $@"
        $(Q)$(HOST_CC) $(HOST_ALDFLAGS) -o $@ $(MINILUA_O) $(MINILUA_LIBS) $(HOST_ALIBS)
 
-host/buildvm_arch.h: $(DASM_DASC) $(DASM_DEP) lj_arch.h lua.h luaconf.h
+luajit.h: $(MINILUA_DEP) $(GIT_DEP) luajit_rolling.h
+       $(E) "VERSION   $@"
+       $(Q)$(GIT_RELVER)
+       $(Q)$(HOST_LUA) host/genversion.lua
+
+host/buildvm_arch.h: $(DASM_DASC) $(MINILUA_DEP) lj_arch.h lua.h luaconf.h
        $(E) "DYNASM    $@"
        $(Q)$(DASM) $(DASM_FLAGS) -o $@ $(DASM_DASC)
 

diff --git a/src/host/buildvm.c b/src/host/buildvm.c
index ef393ff8dda1ce22b999751a950c82a3fe3483e1..39c2bc24f07303caf9e57d2879021909e8b0a934 100644 (file)
--- a/src/host/buildvm.c
+++ b/src/host/buildvm.c
@@ -320,6 +320,7 @@ static void emit_vmdef(BuildCtx *ctx)
   char buf[80];
   int i;
   fprintf(ctx->fp, "-- This is a generated file. DO NOT EDIT!\n\n");
+  fprintf(ctx->fp, "assert(require(\"jit\").version == \"%s\", \"LuaJIT core/library version mismatch\")\n\n", LUAJIT_VERSION);
   fprintf(ctx->fp, "module(...)\n\n");
 
   fprintf(ctx->fp, "bcnames = \"");

diff --git a/src/host/genversion.lua b/src/host/genversion.lua
new file mode 100644 (file)
index 0000000..a38cec5
--- /dev/null
+++ b/src/host/genversion.lua
@@ -0,0 +1,43 @@
+----------------------------------------------------------------------------
+-- Lua script to embed the rolling release version in luajit.h.
+----------------------------------------------------------------------------
+-- Copyright (C) 2005-2023 Mike Pall. All rights reserved.
+-- Released under the MIT license. See Copyright Notice in luajit.h
+----------------------------------------------------------------------------
+
+local FILE_INPUT_H = "luajit_rolling.h"
+local FILE_INPUT_R = "luajit_relver.txt"
+local FILE_OUTPUT_H = "luajit.h"
+
+local function file_read(file)
+  local fp = assert(io.open(file, "rb"), "run from the wrong directory")
+  local data = assert(fp:read("*a"))
+  fp:close()
+  return data
+end
+
+local function file_write_mod(file, data)
+  local fp = io.open(file, "rb")
+  if fp then
+    local odata = assert(fp:read("*a"))
+    fp:close()
+    if odata == data then return end
+  end
+  fp = assert(io.open(file, "wb"))
+  assert(fp:write(data))
+  assert(fp:close())
+end
+
+local text = file_read(FILE_INPUT_H)
+local relver = file_read(FILE_INPUT_R):match("(%d+)")
+
+if relver then
+  text = text:gsub("ROLLING", relver)
+else
+  io.stderr:write([[
+**** WARNING Cannot determine rolling release version from git log.
+**** WARNING The 'git' command must be available during the build.
+]])
+end
+
+file_write_mod(FILE_OUTPUT_H, text)

diff --git a/src/jit/bc.lua b/src/jit/bc.lua
index b128d35a31db90b233a4c290d84c9c2dc96c5370..4b3840121d5c8bd493f80b08107cfae80bcf2b63 100644 (file)
--- a/src/jit/bc.lua
+++ b/src/jit/bc.lua
@@ -41,7 +41,6 @@
 
 -- Cache some library functions and objects.
 local jit = require("jit")
-assert(jit.version_num == 20005, "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 fcd80334c737cd10b8989aa6675449a42f762103..55fae993554bb34845a650488ce049b856c8daa1 100644 (file)
--- a/src/jit/bcsave.lua
+++ b/src/jit/bcsave.lua
@@ -11,7 +11,7 @@
 ------------------------------------------------------------------------------
 
 local jit = require("jit")
-assert(jit.version_num == 20005, "LuaJIT core/library version mismatch")
+assert(jit.version_num == 20099, "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 87950cb2536764465c99e90a61ba8ff33ddbbf54..86f11e2607e2eb53a566422dfeb03e5ab5404c69 100644 (file)
--- a/src/jit/dump.lua
+++ b/src/jit/dump.lua
@@ -55,7 +55,6 @@
 
 -- Cache some library functions and objects.
 local jit = require("jit")
-assert(jit.version_num == 20005, "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 19b6949d7d05a299f1bc8bf089da4c888f5a10eb..29edcf2ba34090f2a8aaba8d1ccfed0486f86823 100644 (file)
--- a/src/jit/v.lua
+++ b/src/jit/v.lua
@@ -59,7 +59,6 @@
 
 -- Cache some library functions and objects.
 local jit = require("jit")
-assert(jit.version_num == 20005, "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/lib_jit.c b/src/lib_jit.c
index c2f1ee7c6fa0420016154b5a302743f0acfe7860..04a564c7681c932c3b3312e632a4c28628ae2fda 100644 (file)
--- a/src/lib_jit.c
+++ b/src/lib_jit.c
@@ -648,7 +648,7 @@ LUALIB_API int luaopen_jit(lua_State *L)
 {
   lua_pushliteral(L, LJ_OS_NAME);
   lua_pushliteral(L, LJ_ARCH_NAME);
-  lua_pushinteger(L, LUAJIT_VERSION_NUM);
+  lua_pushinteger(L, LUAJIT_VERSION_NUM);  /* Deprecated. */
   lua_pushliteral(L, LUAJIT_VERSION);
   LJ_LIB_REG(L, LUA_JITLIBNAME, jit);
 #ifndef LUAJIT_DISABLE_JITUTIL

diff --git a/src/luaconf.h b/src/luaconf.h
index c1c9b4d32384bb598eba651c8e576e6925041d4d..8fc3eee5dae2b9c4b71834b692748768f7ee29b4 100644 (file)
--- a/src/luaconf.h
+++ b/src/luaconf.h
@@ -37,7 +37,7 @@
 #endif
 #define LUA_LROOT      "/usr/local"
 #define LUA_LUADIR     "/lua/5.1/"
-#define LUA_LJDIR      "/luajit-2.0.5/"
+#define LUA_LJDIR      "/luajit-2.0/"
 
 #ifdef LUA_ROOT
 #define LUA_JROOT      LUA_ROOT

diff --git a/src/luajit.h b/src/luajit_rolling.h
similarity index 94%
rename from src/luajit.h
rename to src/luajit_rolling.h
index 8b09f3762b8a05a9f27f36afcd699174c4164131..273688361b38dbd0bfa8f836c27e06792110dba0 100644 (file)
--- a/src/luajit.h
+++ b/src/luajit_rolling.h
@@ -30,9 +30,9 @@
 
 #include "lua.h"
 
-#define LUAJIT_VERSION         "LuaJIT 2.0.5"
-#define LUAJIT_VERSION_NUM     20005  /* Version 2.0.5 = 02.00.05. */
-#define LUAJIT_VERSION_SYM     luaJIT_version_2_0_5
+#define LUAJIT_VERSION         "LuaJIT 2.0.ROLLING"
+#define LUAJIT_VERSION_NUM     20099  /* Deprecated. */
+#define LUAJIT_VERSION_SYM     luaJIT_version_2_0_ROLLING
 #define LUAJIT_COPYRIGHT       "Copyright (C) 2005-2023 Mike Pall"
 #define LUAJIT_URL             "https://luajit.org/"