Set luajit version from luajit_relver.txt

Fixes #4

Author: khvzak

luajit_relver.txt

@@ -0,0 +1 @@
+1744318430

src/lib.rs

@@ -69,11 +69,12 @@ impl Build {
         self.build_unix()
     }
 
-    pub fn build_unix(&mut self) -> Artifacts {
+    fn build_unix(&mut self) -> Artifacts {
         let target = &self.target.as_ref().expect("TARGET not set")[..];
         let host = &self.host.as_ref().expect("HOST not set")[..];
         let out_dir = self.out_dir.as_ref().expect("OUT_DIR not set");
-        let source_dir = Path::new(env!("CARGO_MANIFEST_DIR")).join("luajit2");
+        let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR"));
+        let source_dir = manifest_dir.join("luajit2");
         let build_dir = out_dir.join("luajit-build");
 
         // Cleanup
@@ -84,6 +85,10 @@ impl Build {
             .unwrap_or_else(|e| panic!("cannot create {}: {}", build_dir.display(), e));
         cp_r(&source_dir, &build_dir);
 
+        // Copy release version file
+        #[rustfmt::skip]
+        fs::copy(&manifest_dir.join("luajit_relver.txt"), &build_dir.join(".relver")).unwrap();
+
         let mut cc = cc::Build::new();
         cc.warnings(false);
         let compiler = cc.get_compiler();
@@ -192,7 +197,7 @@ impl Build {
         }
     }
 
-    pub fn build_msvc(&mut self) -> Artifacts {
+    fn build_msvc(&mut self) -> Artifacts {
         let target = &self.target.as_ref().expect("TARGET not set")[..];
         let out_dir = self.out_dir.as_ref().expect("OUT_DIR not set");
         let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR"));
@@ -208,6 +213,10 @@ impl Build {
             .unwrap_or_else(|e| panic!("cannot create {}: {}", build_dir.display(), e));
         cp_r(&source_dir, &build_dir);
 
+        // Copy release version file
+        #[rustfmt::skip]
+        fs::copy(&manifest_dir.join("luajit_relver.txt"), &build_dir.join(".relver")).unwrap();
+
         let mut msvcbuild = Command::new(build_dir.join("src").join("msvcbuild.bat"));
         msvcbuild.current_dir(build_dir.join("src"));
         if self.lua52compat {

testcrate/src/lib.rs

@@ -9,64 +9,82 @@ extern "C" {
     pub fn lua_pcall(state: *mut c_void, nargs: c_int, nresults: c_int, errfunc: c_int) -> c_int;
 }
 
-pub unsafe fn lua_getglobal(state: *mut c_void, k: *const c_char) {
-    lua_getfield(state, -10002 /* LUA_GLOBALSINDEX */, k);
-}
-
-#[test]
-fn test_lua() {
+#[cfg(test)]
+mod tests {
     use std::{ptr, slice};
-    unsafe {
-        let state = luaL_newstate();
-        assert!(state != ptr::null_mut());
 
-        luaL_openlibs(state);
+    use super::*;
 
-        let version = {
-            lua_getglobal(state, "_VERSION\0".as_ptr().cast());
-            let mut len: c_long = 0;
-            let version_ptr = lua_tolstring(state, -1, &mut len);
-            slice::from_raw_parts(version_ptr as *const u8, len as usize)
-        };
+    pub unsafe fn lua_getglobal(state: *mut c_void, k: *const c_char) {
+        lua_getfield(state, -10002 /* LUA_GLOBALSINDEX */, k);
+    }
 
-        assert_eq!(version, b"Lua 5.1");
+    pub unsafe fn to_string<'a>(state: *mut c_void, index: c_int) -> &'a str {
+        let mut len: c_long = 0;
+        let str_ptr = lua_tolstring(state, index, &mut len);
+        let bytes = slice::from_raw_parts(str_ptr as *const u8, len as usize);
+        str::from_utf8(bytes).unwrap()
     }
-}
 
-#[test]
-fn test_lua52compat() {
-    use std::{ptr, slice};
-    unsafe {
-        let state = luaL_newstate();
-        assert!(state != ptr::null_mut());
+    #[test]
+    fn test_lua() {
+        unsafe {
+            let state = luaL_newstate();
+            assert!(state != ptr::null_mut());
+
+            luaL_openlibs(state);
+
+            let version = {
+                lua_getglobal(state, "_VERSION\0".as_ptr().cast());
+                to_string(state, -1)
+            };
+            assert_eq!(version, "Lua 5.1");
+
+            let jit_version = {
+                luaL_loadstring(state, c"return jit.version".as_ptr().cast());
+                let ret = lua_pcall(state, 0, 1, 0);
+                assert_eq!(0, ret);
+                to_string(state, -1)
+            };
+            let mut version_it = jit_version.split('.');
+            assert_eq!(version_it.next().unwrap(), "LuaJIT 2");
+            assert_eq!(version_it.next().unwrap(), "1");
+            assert!(version_it.next().unwrap().parse::<u32>().is_ok());
+        }
+    }
+
+    #[test]
+    fn test_lua52compat() {
+        unsafe {
+            let state = luaL_newstate();
+            assert!(state != ptr::null_mut());
 
-        luaL_openlibs(state);
+            luaL_openlibs(state);
 
-        let code = "
-            lua52compat = \"no\"
-            t = setmetatable({}, {
-                __pairs = function(t)
-                    lua52compat = \"yes\"
-                    return next, t, nil
-                end
-            })
-            for k,v in pairs(t) do end
-        \0";
-        let ret1 = luaL_loadstring(state, code.as_ptr().cast());
-        assert_eq!(0, ret1);
-        let ret2 = lua_pcall(state, 0, 0, 0);
-        assert_eq!(0, ret2);
+            let code = "
+                lua52compat = \"no\"
+                t = setmetatable({}, {
+                    __pairs = function(t)
+                        lua52compat = \"yes\"
+                        return next, t, nil
+                    end
+                })
+                for k,v in pairs(t) do end
+            \0";
+            let ret1 = luaL_loadstring(state, code.as_ptr().cast());
+            assert_eq!(0, ret1);
+            let ret2 = lua_pcall(state, 0, 0, 0);
+            assert_eq!(0, ret2);
 
-        let lua52compat = {
-            lua_getglobal(state, "lua52compat\0".as_ptr().cast());
-            let mut len: c_long = 0;
-            let lua52compat_ptr = lua_tolstring(state, -1, &mut len);
-            slice::from_raw_parts(lua52compat_ptr as *const u8, len as usize)
-        };
+            let lua52compat = {
+                lua_getglobal(state, "lua52compat\0".as_ptr().cast());
+                to_string(state, -1)
+            };
 
-        #[cfg(feature = "lua52compat")]
-        assert_eq!(lua52compat, b"yes");
-        #[cfg(not(feature = "lua52compat"))]
-        assert_eq!(lua52compat, b"no");
+            #[cfg(feature = "lua52compat")]
+            assert_eq!(lua52compat, "yes");
+            #[cfg(not(feature = "lua52compat"))]
+            assert_eq!(lua52compat, "no");
+        }
     }
 }

update.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -eux
+
+cd luajit2
+git pull
+git show -s --format=%ct > ../luajit_relver.txt