Prepare for adding to Ravi distro

Author: Dibyendu Majumdar

CMakeLists.txt

@@ -0,0 +1,56 @@
+cmake_minimum_required(VERSION 2.6)
+
+option(USE_LUA53 "Controls whether the library will be for Lua 5.3 or Ravi, default is OFF" OFF)
+
+SET(CMAKE_MODULE_PATH
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
+  "${CMAKE_MODULE_PATH}")
+
+find_package(Lua REQUIRED)
+
+message(STATUS "LUA_INCLUDE_DIR: ${LUA_INCLUDE_DIR}")
+message(STATUS "LUA_LIBRARIES  : ${LUA_LIBRARIES}")
+
+message(STATUS "LUA_INCDIR     : ${LUA_INCDIR}")
+message(STATUS "LUA_LIBDIR     : ${LUA_LIBDIR}")
+message(STATUS "LUA_BINDIR     : ${LUA_BINDIR}")
+message(STATUS "LUALIB         : ${LUALIB}")
+message(STATUS "LIBDIR (LUA_CPATH)  : ${LIBDIR}")
+message(STATUS "LUADIR (LUA_PATH)   : ${LUADIR}")
+
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}")
+INCLUDE_DIRECTORIES("${LUA_INCDIR}")
+LINK_DIRECTORIES("${LUA_LIBDIR}")
+
+SET(src 
+  "${CMAKE_CURRENT_SOURCE_DIR}/pb.c"
+  )
+
+SET(luasrc 
+  "${CMAKE_CURRENT_SOURCE_DIR}/protoc.lua"
+  )
+
+# When using MSVC
+IF(MSVC)
+  # we want to respect the standard, and we are bored of those **** .
+  ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE=1)
+ENDIF(MSVC)
+
+ADD_LIBRARY("pb" SHARED ${src})
+set_target_properties("pb" PROPERTIES PREFIX "")
+SET_TARGET_PROPERTIES("pb" PROPERTIES
+  IMPORT_PREFIX "lib")
+
+IF(APPLE)
+  SET_TARGET_PROPERTIES("pb" PROPERTIES
+    LINK_FLAGS "-undefined dynamic_lookup")
+ENDIF()
+
+INSTALL(FILES ${luasrc} DESTINATION ${LUADIR})
+INSTALL(TARGETS pb
+  LIBRARY DESTINATION ${LIBDIR}
+  RUNTIME DESTINATION ${LUA_BINDIR})
+
+IF(LUALIB)
+  TARGET_LINK_LIBRARIES(pb ${LUALIB})
+ENDIF()

cmake/FindLua.cmake

@@ -0,0 +1,92 @@
+if (USE_LUA53)
+
+  find_path(LUA_INCLUDE_DIR lua.h
+    PATHS
+    c:/Software/lua53/include
+    ~/lua53/include
+    NO_DEFAULT_PATH
+  )
+
+  find_library(LUA_LIBRARIES
+    NAMES lua53 liblua53
+    PATHS
+    c:/Software/lua53/lib
+    ~/lua53/lib
+  )
+
+  find_program(LUA_EXE
+    NAMES lua
+    PATHS
+    c:/Software/lua53/bin
+    ~/lua53/bin
+  )
+
+else()
+
+  find_path(LUA_INCLUDE_DIR lua.h
+    PATHS
+    c:/Software/ravi/include/ravi
+    ~/ravi/include/ravi
+    NO_DEFAULT_PATH
+  )
+
+  find_library(LUA_LIBRARIES
+    NAMES ravi libravi ravinojit libravinojit ravillvm libravillvm
+    PATHS
+    c:/Software/ravi/lib
+    ~/ravi/lib
+  )
+
+  find_program(LUA_EXE
+    NAMES ravi
+    PATHS
+    c:/Software/ravi/bin
+    ~/ravi/bin
+  )
+
+endif()
+
+# LUA_INCDIR - place where lua headers exist
+set(LUA_INCDIR ${LUA_INCLUDE_DIR})
+
+# LIBDIR - LUA_CPATH
+if (WIN32)
+
+  get_filename_component(LIBDIR
+    ${LUA_EXE}
+    DIRECTORY)
+
+else()
+
+  get_filename_component(LIBDIR
+    ${LUA_LIBRARIES}
+    DIRECTORY)
+
+endif()
+
+get_filename_component(LUA_BINDIR
+  ${LUA_EXE}
+  DIRECTORY)
+
+# LUA_LIBDIR - place where lua native libraries exist
+get_filename_component(LUA_LIBDIR
+  ${LUA_LIBRARIES}
+  DIRECTORY
+)
+
+if (NOT WIN32) 
+  set(LUA_LIBRARIES "${LUA_LIBRARIES};m")
+endif()
+
+# LUALIB - the lua library to link against
+set(LUALIB ${LUA_LIBRARIES})
+
+# LUADIR - LUA_PATH
+if (USE_LUA53)
+  set(LUADIR "${LUA_LIBDIR}/../share/lua/5.3")
+else()
+  set(LUADIR "${LUA_LIBDIR}/../share/lua/5.3")
+endif()
+
+set(LUA "${LUA_EXE}")
+

test.lua

@@ -801,7 +801,7 @@ function _G.test_buffer()
    eq(#b, 6)
 
    fail("integer format error: 'foo'", function() pb.pack("v", "foo") end)
-   if _VERSION == "Lua 5.3" then
+   if _VERSION == "Lua 5.3" or _VERSION == 'Ravi 5.3' then
       fail("integer format error", function() pb.pack("v", 1e308) end)
    else
       fail("number has no integer representation", function() pb.pack("v", 1e308) end)