Merge pull request #332 from squeek502/libuv-1.29.1

update libuv to v1.29.1

.travis.yml

@@ -35,7 +35,7 @@ script:
   - mkdir build/lib
   - cp build/deps/libuv/libuv_a.a build/lib/libuv.a
   - cp -a deps/libuv/include build
-  - luarocks make rockspecs/$(ls rockspecs) LIBUV_DIR=build
+  - luarocks make rockspecs/$(ls rockspecs) LIBUV_DIR=build LUA_COMPAT53_INCDIR=deps/lua-compat-5.3
   - test $PWD = `lua -e "print(require'luv'.cwd())"`
 
 jobs:

CMakeLists.txt

@@ -8,7 +8,7 @@ project (luv C ASM)
 
 set(LUV_VERSION_MAJOR 1)
 set(LUV_VERSION_MINOR 29)
-set(LUV_VERSION_PATCH 0)
+set(LUV_VERSION_PATCH 1)
 set(LUV_VERSION ${LUV_VERSION_MAJOR}.${LUV_VERSION_MINOR}.${LUV_VERSION_PATCH})
 
 option(BUILD_MODULE "Build as module" ON)
@@ -155,7 +155,9 @@ if(APPLE)
   # )
 endif()
 
-set(LUA_COMPAT53_DIR deps/lua-compat-5.3)
+if(NOT LUA_COMPAT53_DIR)
+  set(LUA_COMPAT53_DIR deps/lua-compat-5.3)
+endif()
 if(DEFINED ENV{LUA_COMPAT53_DIR})
   set(LUA_COMPAT53_DIR $ENV{LUA_COMPAT53_DIR})
 endif()

Makefile

@@ -9,7 +9,7 @@ BUILD_SHARED_LIBS ?= OFF
 WITH_SHARED_LIBUV ?= OFF
 WITH_LUA_ENGINE ?= LuaJIT
 LUA_BUILD_TYPE ?= Static
-
+LUA_COMPAT53_DIR ?= deps/lua-compat-5.3
 
 ifeq ($(WITH_LUA_ENGINE), LuaJIT)
   LUABIN=build/luajit
@@ -23,7 +23,7 @@ CMAKE_OPTIONS += \
 	-DWITH_SHARED_LIBUV=$(WITH_SHARED_LIBUV) \
 	-DWITH_LUA_ENGINE=$(WITH_LUA_ENGINE) \
 	-DLUA_BUILD_TYPE=$(LUA_BUILD_TYPE) \
-	-DLUA_COMPAT53_DIR=deps/lua-compat-5.3
+	-DLUA_COMPAT53_DIR=$(LUA_COMPAT53_DIR)
 
 all: luv
 
@@ -33,8 +33,11 @@ deps/libuv/include:
 deps/luajit/src:
 	git submodule update --init deps/luajit
 
-build/Makefile: deps/libuv/include deps/luajit/src
-	cmake -H. -Bbuild ${CMAKE_OPTIONS} 
+deps/lua-compat-5.3/c-api:
+	git submodule update --init deps/lua-compat-5.3
+
+build/Makefile: deps/libuv/include deps/luajit/src deps/lua-compat-5.3/c-api
+	cmake -H. -Bbuild ${CMAKE_OPTIONS}
 
 luv: build/Makefile
 	cmake --build build --config Debug

appveyor.yml

@@ -40,7 +40,7 @@ build_script:
   - mkdir build\lib
   - cp build\deps\libuv\Release\uv_a.lib build\lib\uv.lib
   - cp -a deps\libuv\include build
-  - ps: luarocks make rockspecs\$(ls rockspecs) LIBUV_DIR=build CFLAGS="/nologo /MT /O2"
+  - ps: luarocks make rockspecs\$(ls rockspecs) LIBUV_DIR=build LUA_COMPAT53_INCDIR=deps/lua-compat-5.3 CFLAGS="/nologo /MT /O2"
   - ps: if("$(Get-Location)" -eq $(lua -e "print(require'luv'.cwd())")) { "LuaRocks test OK" } else { "LuaRocks test failed"; exit 1 }
   - luarocks remove luv
 

rockspecs/luv-scm-0.rockspec

@@ -24,6 +24,9 @@ dependencies = {
 external_dependencies = {
   LIBUV = {
     header = 'uv.h'
+  },
+  LUA_COMPAT53 = {
+    header = "c-api/compat-5.3.h"
   }
 }
 
@@ -34,7 +37,7 @@ build = {
     ['luv'] = {
       sources = {'src/luv.c'},
       libraries = {'uv'},
-      incdirs = {"$(LIBUV_INCDIR)","deps/lua-compat-5.3"},
+      incdirs = {"$(LIBUV_INCDIR)","$(LUA_COMPAT53_INCDIR)"},
       libdirs = {"$(LIBUV_LIBDIR)"}
     }
   };