From 57bd8fe99a3374f7890b7dfe1e2ffd726ea5f8cf Mon Sep 17 00:00:00 2001
From: hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c>
Date: Sun, 4 Oct 2009 16:11:07 +0000
Subject: Use deploy_*_dir entries
git-svn-id: http://luarocks.org/svn/luarocks/trunk@61 9ca3f7c1-7366-0410-b1a3-b5c78f85698c
---
src/luarocks/cfg.lua | 10 +++++-----
src/luarocks/command_line.lua | 21 ++++++++++-----------
src/luarocks/path.lua | 12 ++++++++----
src/luarocks/validate.lua | 14 +++++++++-----
4 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index bd3bdbc3..3ce4249f 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -108,11 +108,11 @@ local root = LUAROCKS_ROCKS_TREE or home_tree
local defaults = {
root_dir = root,
rocks_dir = root.."/lib/luarocks/rocks",
- scripts_dir = root.."/bin/",
lua_modules_path = "/share/lua/5.1/",
- bin_modules_path = "/lib/lua/5.1/",
- lua_modules_dir = root.."/share/lua/5.1/",
- bin_modules_dir = root.."/lib/lua/5.1/",
+ lib_modules_path = "/lib/lua/5.1/",
+ deploy_bin_dir = root.."/bin/",
+ deploy_lua_dir = root.."/share/lua/5.1/",
+ deploy_lib_dir = root.."/lib/lua/5.1/",
arch = "unknown",
lib_extension = "unknown",
@@ -275,6 +275,6 @@ setmetatable(_M, cfg_mt)
for _,tree in ipairs(rocks_trees) do
package.path = tree..lua_modules_path.."/?.lua;"..tree..lua_modules_path.."/?/init.lua;"..package.path
- package.cpath = tree..bin_modules_path.."/?."..lib_extension..";"..package.cpath
+ package.cpath = tree..lib_modules_path.."/?."..lib_extension..";"..package.cpath
end
diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index 58c54354..f2afc16a 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -53,9 +53,9 @@ function run_command(...)
local root_dir = fs.absolute_name(flags["to"])
cfg.root_dir = root_dir
cfg.rocks_dir = path.rocks_dir(root_dir)
- cfg.scripts_dir = path.scripts_dir(root_dir)
- cfg.lua_modules_dir = path.lua_modules_dir(root_dir)
- cfg.bin_modules_dir = path.bin_modules_dir(root_dir)
+ cfg.deploy_bin_dir = path.deploy_bin_dir(root_dir)
+ cfg.deploy_lua_dir = path.deploy_lua_dir(root_dir)
+ cfg.deploy_lib_dir = path.deploy_lib_dir(root_dir)
else
local trees = cfg.rocks_trees
for i = #trees, 1, -1 do
@@ -63,9 +63,9 @@ function run_command(...)
if fs.make_dir(tree) and fs.is_writable(tree) then
cfg.root_dir = tree
cfg.rocks_dir = path.rocks_dir(tree)
- cfg.scripts_dir = rawget(cfg, "scripts_dir") or path.scripts_dir(tree)
- cfg.lua_modules_dir = rawget(cfg, "lua_modules_dir") or path.lua_modules_dir(tree)
- cfg.bin_modules_dir = rawget(cfg, "bin_modules_dir") or path.bin_modules_dir(tree)
+ cfg.deploy_bin_dir = rawget(cfg, "deploy_bin_dir") or path.deploy_bin_dir(tree)
+ cfg.deploy_lua_dir = rawget(cfg, "deploy_lua_dir") or path.deploy_lua_dir(tree)
+ cfg.deploy_lib_dir = rawget(cfg, "deploy_lib_dir") or path.deploy_lib_dir(tree)
break
end
end
@@ -73,12 +73,12 @@ function run_command(...)
cfg.root_dir = cfg.root_dir:gsub("/+$", "")
cfg.rocks_dir = cfg.rocks_dir:gsub("/+$", "")
- cfg.scripts_dir = cfg.scripts_dir:gsub("/+$", "")
- cfg.lua_modules_dir = cfg.lua_modules_dir:gsub("/+$", "")
- cfg.bin_modules_dir = cfg.bin_modules_dir:gsub("/+$", "")
+ cfg.deploy_bin_dir = cfg.deploy_bin_dir:gsub("/+$", "")
+ cfg.deploy_lua_dir = cfg.deploy_lua_dir:gsub("/+$", "")
+ cfg.deploy_lib_dir = cfg.deploy_lib_dir:gsub("/+$", "")
cfg.variables.ROCKS_TREE = cfg.root_dir
- cfg.variables.SCRIPTS_DIR = cfg.scripts_dir
+ cfg.variables.SCRIPTS_DIR = cfg.deploy_bin_dir
if flags["from"] then
if flags["from"] == true then
@@ -134,6 +134,5 @@ function run_command(...)
else
die("Unknown command: "..command)
end
-
util.run_scheduled_functions()
end
diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua
index fccabc99..f62ff230 100644
--- a/src/luarocks/path.lua
+++ b/src/luarocks/path.lua
@@ -17,22 +17,27 @@ function rockspec_name_from_rock(rock_name)
end
function rocks_dir(repo)
+ assert(type(repo) == "string")
return dir.path(repo, "lib", "luarocks", "rocks")
end
-function scripts_dir(repo)
+function deploy_bin_dir(repo)
+ assert(type(repo) == "string")
return dir.path(repo, "bin")
end
-function lua_modules_dir(repo)
+function deploy_lua_dir(repo)
+ assert(type(repo) == "string")
return dir.path(repo, "share", "lua", "5.1")
end
-function bin_modules_dir(repo)
+function deploy_lib_dir(repo)
+ assert(type(repo) == "string")
return dir.path(repo, "lib", "lua", "5.1")
end
function manifest_file(repo)
+ assert(type(repo) == "string")
return dir.path(repo, "lib", "luarocks", "rocks", "manifest")
end
@@ -242,4 +247,3 @@ function configure_paths(rockspec)
vars.DOCDIR = doc_dir(name, version)
rockspec.variables = vars
end
-
diff --git a/src/luarocks/validate.lua b/src/luarocks/validate.lua
index fdcfd7c8..b8b4edfd 100644
--- a/src/luarocks/validate.lua
+++ b/src/luarocks/validate.lua
@@ -21,16 +21,20 @@ local function save_settings(repo)
return {
root_dir = cfg.root_dir,
rocks_dir = cfg.rocks_dir,
- scripts_dir = cfg.scripts_dir,
+ deploy_bin_dir = cfg.deploy_bin_dir,
+ deploy_lua_dir = cfg.deploy_lua_dir,
+ deploy_lib_dir = cfg.deploy_lib_dir,
}
end
local function restore_settings(settings)
cfg.root_dir = settings.root_dir
cfg.rocks_dir = settings.rocks_dir
- cfg.scripts_dir = settings.scripts_dir
+ cfg.deploy_bin_dir = settings.deploy_bin_dir
+ cfg.deploy_lua_dir = settings.deploy_lua_dir
+ cfg.deploy_lib_dir = settings.deploy_lib_dir
cfg.variables.ROCKS_TREE = settings.root_dir
- cfg.variables.SCRIPTS_DIR = settings.scripts_dir
+ cfg.variables.SCRIPTS_DIR = settings.deploy_bin_dir
table.remove(cfg.rocks_servers, 1)
end
@@ -38,9 +42,9 @@ local function prepare_sandbox(file)
local root_dir = fs.make_temp_dir(file):gsub("/+$", "")
cfg.root_dir = root_dir
cfg.rocks_dir = path.rocks_dir(root_dir)
- cfg.scripts_dir = root_dir.."/bin"
+ cfg.deploy_bin_dir = path.deploy_bin_dir(root_dir)
cfg.variables.ROCKS_TREE = cfg.root_dir
- cfg.variables.SCRIPTS_DIR = cfg.scripts_dir
+ cfg.variables.SCRIPTS_DIR = cfg.deploy_bin_dir
return root_dir
end
--
cgit v1.2.3-55-g6feb