diff --git a/.gitignore b/.gitignore index e5fe69e..acd72e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ test/deps/libuv tools/gyp out/ +gypkg_deps/ +node_modules/ diff --git a/.travis.yml b/.travis.yml index e9daf2b..f55d29f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,7 @@ -language: c +language: node_js sudo: false -before_install: - - git clone https://chromium.googlesource.com/external/gyp.git tools/gyp - - git clone git://github.com/libuv/libuv.git test/deps/libuv +node_js: + - "6.1" branches: only: - master -script: make test diff --git a/Makefile b/Makefile index 2de7a20..41424bc 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,15 @@ test: - ./gyp_uv_link test -Duv_dir=./test/deps/libuv - make -C out/ -j8 - ./out/Release/uv_link_t-test + gypkg gen test/test.gyp + make -C test/out/ -j8 + ./test/out/Release/uv_link_t-test example: - ./gyp_uv_link example -Duv_dir=./test/deps/libuv - make -C out/ -j8 - ./out/Release/uv_link_t-example + gypkg gen example/example.gyp + make -C example/out/ -j8 + ./example/out/Release/uv_link_t-example dist: - ./gyp_uv_link -Duv_dir=./test/deps/libuv + gypkg gen uv_link_t.gyp make -C out/ -j8 .PHONY: test example dist diff --git a/example/example.gyp b/example/example.gyp index a3dc597..bb1bbd0 100644 --- a/example/example.gyp +++ b/example/example.gyp @@ -7,9 +7,15 @@ "src" ], + "variables": { + "gypkg_deps": [ + "git://github.com/libuv/libuv.git#v1.9.1:uv.gyp:libuv", + ], + }, + "dependencies": [ - "../test/deps/libuv/uv.gyp:libuv", - "../uv_link_t.gyp:uv_link_t" + "", + "license": "MIT", + "dependencies": { + "gypkg": "^1.0.1" + } +} diff --git a/test/options.gypi b/test/options.gypi new file mode 120000 index 0000000..9b18bce --- /dev/null +++ b/test/options.gypi @@ -0,0 +1 @@ +../options.gypi \ No newline at end of file diff --git a/test/test.gyp b/test/test.gyp index 131b93a..ffedd02 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -7,9 +7,15 @@ "src" ], + "variables": { + "gypkg_deps": [ + "git://github.com/libuv/libuv.git#v1.9.1:uv.gyp:libuv", + ], + }, + "dependencies": [ - "deps/libuv/uv.gyp:libuv", - "../uv_link_t.gyp:uv_link_t" + "