Update CMake. Fix ODB Backend version check.

Author: Neopallium

CMakeLists.txt

@@ -10,8 +10,6 @@ set(BUILD_SHARED_LIBS TRUE)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 set(INSTALL_CMOD share/lua/cmod CACHE PATH "Directory to install Lua binary modules (configure lua via LUA_CPATH)")
-set(LUA_NATIVE_OBJECTS_PATH ../LuaNativeObjects CACHE PATH
-				"Directory to LuaNativeObjects bindings generator.")
 set(USE_PRE_GENERATED_BINDINGS TRUE CACHE BOOL
 				"Set this to FALSE to re-generate bindings using LuaNativeObjects")
 
@@ -28,7 +26,7 @@ include_directories(${LUA_INCLUDE_DIR})
 
 ## LibGit2
 include(FindPkgConfig)
-pkg_search_module(GIT2 REQUIRED libgit2=0.17.0)
+pkg_search_module(GIT2 REQUIRED libgit2>=0.17.0)
 add_definitions(${GIT2_CFLAGS})
 link_directories(${GIT2_LIBRARY_DIRS})
 include_directories(${GIT2_INCLUDE_DIRS})

cmake/LuaNativeObjects.cmake

@@ -1,27 +1,38 @@
 #
 # Lua Native Objects
 #
+
+find_program(LUA_NATIVE_OBJECTS_EXECUTABLE native_objects.lua
+	PATHS ${CMAKE_SOURCE_DIR}/../LuaNativeObjects
+	DOC "LuaNativeObjects executable path")
+set(USE_PRE_GENERATED_BINDINGS TRUE CACHE BOOL
+				"Set this to FALSE to re-generate bindings using LuaNativeObjects")
+set(GENERATE_LUADOCS TRUE CACHE BOOL
+				"Set this to FALSE to avoid generation of docs using LuaDoc")
+
 macro(GenLuaNativeObjects _src_files_var)
 	set(_new_src_files)
 	foreach(_src_file ${${_src_files_var}})
 		if(_src_file MATCHES ".nobj.lua")
 			string(REGEX REPLACE ".nobj.lua" ".nobj.c" _src_file_out ${_src_file})
-			string(REGEX REPLACE ".nobj.lua" ".nobj.h" _header_file_out ${_src_file})
-			add_custom_command(OUTPUT ${_src_file_out} ${_header_file_out}
-				COMMAND lua ${LUA_NATIVE_OBJECTS_PATH}/native_objects.lua -outpath ${CMAKE_CURRENT_BINARY_DIR} -gen lua ${_src_file}
+			string(REGEX REPLACE ".nobj.lua" ".nobj.ffi.lua" _ffi_file_out ${_src_file})
+			add_custom_command(OUTPUT ${_src_file_out} ${_ffi_file_out}
+				COMMAND ${LUA_NATIVE_OBJECTS_EXECUTABLE} -outpath ${CMAKE_CURRENT_BINARY_DIR} -gen lua ${_src_file}
 				WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 				DEPENDS ${_src_file}
 			)
 			set_source_files_properties(${_src_file_out} PROPERTIES GENERATED TRUE)
-			set_source_files_properties(${_header_file_out} PROPERTIES GENERATED TRUE)
-			string(REGEX REPLACE ".nobj.lua" "" _doc_base ${_src_file})
-			string(REGEX REPLACE ".nobj.lua" ".luadoc" _doc_file_out ${_src_file})
-			add_custom_target(${_doc_file_out} ALL
-				COMMAND lua ${LUA_NATIVE_OBJECTS_PATH}/native_objects.lua -outpath docs -gen luadoc ${_src_file}
-				COMMAND luadoc -nofiles -d docs docs
-				WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-				DEPENDS ${_src_file}
-			)
+			set_source_files_properties(${_ffi_file_out} PROPERTIES GENERATED TRUE)
+			if (${GENERATE_LUADOCS})
+				string(REGEX REPLACE ".nobj.lua" "" _doc_base ${_src_file})
+				string(REGEX REPLACE ".nobj.lua" ".luadoc" _doc_file_out ${_src_file})
+				add_custom_target(${_doc_file_out} ALL
+					COMMAND ${LUA_NATIVE_OBJECTS_EXECUTABLE} -outpath docs -gen luadoc ${_src_file}
+					COMMAND luadoc -nofiles -d docs docs
+					WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+					DEPENDS ${_src_file}
+				)
+			endif()
 			set_source_files_properties(${_doc_file_out} PROPERTIES GENERATED TRUE)
 			set(_new_src_files ${_new_src_files} ${_src_file_out})
 		else(_src_file MATCHES ".nobj.lua")

src/odb_backend.nobj.lua

@@ -228,6 +228,10 @@ static void odb_backend_free_cb(git_odb_backend *backend)
 	REF_CB(exists)
 	REF_CB(free)
 #undef REF_CB
+
+#ifdef GIT_ODB_BACKEND_VERSION
+  ${this}->backend.version = GIT_ODB_BACKEND_VERSION;
+#endif
 ]]
 	},
 	destructor {

tests/test_backend.lua

@@ -10,7 +10,7 @@ end
 local git2 = require"git2"
 require"utils"
 
-print(dump(git2))
+--print(dump(git2))
 local function dump_obj(obj)
 	print('dump OdbObject:', obj)
 	if obj == nil then
@@ -29,7 +29,7 @@ end
 local db = assert(git2.ODB.new())
 print("=============================================== new db=", db)
 print("dump ODB interface")
-print(dbg_dump(db))
+--print(dbg_dump(db))
 
 -- create backend
 local obj_cache = {}

tests/test_rep.lua

@@ -11,21 +11,21 @@ local git2 = require"git2"
 require"utils"
 
 print("dump git2 interface")
-print(dbg_dump(git2))
+-- print(dbg_dump(git2))
 
 local rep = assert(git2.Repository(git_path))
 
 print("dump Repository interface")
-print(dbg_dump(rep))
+-- print(dbg_dump(rep))
 
 local oid = git2.OID.hex("d5a93c463d4cca0068750eb6af7b4b54eea8599b")
 print("dump OID interface")
-print(dbg_dump(oid))
+-- print(dbg_dump(oid))
 print('convert OID value to string = <' .. tostring(oid) .. '>')
 
 local db = rep:odb()
 print("dump Database interface")
-print(dbg_dump(db))
+-- print(dbg_dump(db))
 
 print()
 print('test writing to the object database:')
@@ -36,7 +36,7 @@ print("read written object out of the database.")
 local odb_obj = db:read(oid)
 print()
 print("dump OdbObject interface")
-print(dbg_dump(odb_obj))
+-- print(dbg_dump(odb_obj))
 local function dump_odb_obj(obj)
 	-- check obj type
 	if obj == nil or not tostring(obj):match('^OdbObject: ') then
@@ -81,15 +81,15 @@ print("test parsing a commit object: ", commit_id)
 local commit1, err = git2.Commit.lookup(rep, commit_id)
 print(commit1, err)
 print("dump Commit interface")
-print(dbg_dump(commit1))
+--print(dbg_dump(commit1))
 local function dump_signature(pre, sig)
 	print(pre .. '.name = ', sig:name())
 	print(pre .. '.email = ', sig:email())
 	print(pre .. '.when = ', sig:when())
 end
 local function dump_blob(blob)
 	print("dump Blob interface")
-	print(dbg_dump(blob))
+	--print(dbg_dump(blob))
 	print('blob.rawcontent.size =', blob:rawsize())
 	print('blob.rawcontents =', blob:rawcontent())
 end
@@ -142,7 +142,7 @@ dump_commit(commit1)
 
 local index = rep:index()
 print("dump Index interface")
-print(dbg_dump(index))
+--print(dbg_dump(index))
 local function dump_index_entry(entry)
 	if entry == nil then
 		return
@@ -177,7 +177,7 @@ dump_index(index)
 
 local revwalk = git2.RevWalk(rep)
 print("dump RevWalk interface")
-print(dbg_dump(revwalk))
+--print(dbg_dump(revwalk))
 print('sorting:', revwalk:sorting(revwalk.SORT_TOPOLOGICAL + revwalk.SORT_REVERSE))
 local head_id = git2.OID.hex("5c697d74eb692d650799ca1b0a10254d7130953d")
 local head = assert(git2.Commit.lookup(rep, head_id))
@@ -194,7 +194,7 @@ end
 local tag_id = git2.OID.hex('82dfe36284d77b608ccc9d96e0ffa5782cb7c835')
 local tag = git2.Tag.lookup(rep, tag_id)
 print("dump Tag interface")
-print(dbg_dump(tag))
+--print(dbg_dump(tag))
 local function dump_tag(tag)
 	if tag == nil then
 		return