From 9434c99c9532009e80f3c58dd566bbedb4a0db84 Mon Sep 17 00:00:00 2001 From: Alexey Melnichuk Date: Fri, 29 Aug 2014 12:29:23 +0500 Subject: [PATCH] Add. Install `lcurl.cURL` module in rockspec --- examples/Lua-cURL/file.lua | 2 +- examples/Lua-cURL/multi.lua | 2 +- examples/Lua-cURL/rss.lua | 2 +- lakefile | 5 +++-- rockspecs/lcurl-scm-0.rockspec | 3 ++- {examples/Lua-cURL => src/lua}/cURL.lua | 0 6 files changed, 8 insertions(+), 6 deletions(-) rename {examples/Lua-cURL => src/lua}/cURL.lua (100%) diff --git a/examples/Lua-cURL/file.lua b/examples/Lua-cURL/file.lua index d46239e..8193b69 100644 --- a/examples/Lua-cURL/file.lua +++ b/examples/Lua-cURL/file.lua @@ -1,4 +1,4 @@ -local cURL = require("cURL") +local cURL = require("lcurl.cURL") -- open output file f = io.open("example_homepage", "w") diff --git a/examples/Lua-cURL/multi.lua b/examples/Lua-cURL/multi.lua index c094cea..663635f 100644 --- a/examples/Lua-cURL/multi.lua +++ b/examples/Lua-cURL/multi.lua @@ -1,4 +1,4 @@ -local cURL = require("cURL") +local cURL = require("lcurl.cURL") -- setup easy c = cURL.easy_init() diff --git a/examples/Lua-cURL/rss.lua b/examples/Lua-cURL/rss.lua index 7c2ff9d..c25c0c5 100644 --- a/examples/Lua-cURL/rss.lua +++ b/examples/Lua-cURL/rss.lua @@ -1,6 +1,6 @@ -- use LuaExpat and Lua-CuRL together for On-The-Fly XML parsing local lxp = require("lxp") -local cURL = require("cURL") +local cURL = require("lcurl.cURL") tags = {} items = {} diff --git a/lakefile b/lakefile index 2754282..a351450 100644 --- a/lakefile +++ b/lakefile @@ -18,9 +18,10 @@ cURL = c.shared{PROJECT, target('build', cURL) install = target('install', { - file.group{odir=LIBDIR; src = cURL }; + file.group{odir=LIBDIR; src = cURL }; + file.group{odir=J(LIBDIR, PROJECT); src = J("src", "lua") }; file.group{odir=J(ROOT, 'examples'); src = 'examples'; recurse = true }; - file.group{odir=TESTDIR; src = 'test'; recurse = true }; + file.group{odir=TESTDIR; src = 'test'; recurse = true }; }) target('test', install, function() diff --git a/rockspecs/lcurl-scm-0.rockspec b/rockspecs/lcurl-scm-0.rockspec index 6d16d44..171d4cb 100644 --- a/rockspecs/lcurl-scm-0.rockspec +++ b/rockspecs/lcurl-scm-0.rockspec @@ -65,6 +65,7 @@ build = { }, incdirs = { "$(CURL_INCDIR)" }, libdirs = { "$(CURL_LIBDIR)" } - } + }, + ["lcurl.cURL"] = "src/lua/cURL.lua", } } \ No newline at end of file diff --git a/examples/Lua-cURL/cURL.lua b/src/lua/cURL.lua similarity index 100% rename from examples/Lua-cURL/cURL.lua rename to src/lua/cURL.lua