summaryrefslogtreecommitdiff
path: root/lua_scripts
diff options
context:
space:
mode:
authorLauri Aarnio <Lauri.Aarnio@iki.fi>2008-10-15 16:47:31 +0300
committerLauri Leukkunen <lle@rahina.org>2008-10-18 15:18:15 +0300
commit37c01e3724bf32d6734b73c62b98148f701d0bbd (patch)
tree11d5a47253ea60e49125e50d26da9bf90e7774f6 /lua_scripts
parentda0cebd882e24524f720148ab7c585721ba3ea91 (diff)
Moved host-* wrappers from /usr/bin to /sb2/wrappers (a new virtual directory) - /usr/bin was a completely wrong place for those! - The development modes ("simple" and "devel") now map /sb2/wrappers to $SBOX_DIR/share/scratchbox2/wrappers (and /sb2/scripts is mapped respectively) - utils/sb2 sets $PATH so that /sb2/wrappers and /sb2/scripts are in the beginning - A nice side effect of this is that running "which host-gcc" inside sb2'ed environment gives a quite self-explanatory result.
Diffstat (limited to 'lua_scripts')
-rw-r--r--lua_scripts/pathmaps/devel/00_default.lua11
-rw-r--r--lua_scripts/pathmaps/simple/00_default.lua17
2 files changed, 28 insertions, 0 deletions
diff --git a/lua_scripts/pathmaps/devel/00_default.lua b/lua_scripts/pathmaps/devel/00_default.lua
index 1ff7828..b38a451 100644
--- a/lua_scripts/pathmaps/devel/00_default.lua
+++ b/lua_scripts/pathmaps/devel/00_default.lua
@@ -113,6 +113,17 @@ simple_chain = {
use_orig_path = true, readonly = true},
-- -----------------------------------------------
+ -- 2. Development environment special destinations:
+
+ {prefix = "/sb2/wrappers",
+ replace_by = sbox_dir.."/share/scratchbox2/wrappers",
+ readonly = true},
+
+ {prefix = "/sb2/scripts",
+ replace_by = sbox_dir.."/share/scratchbox2/scripts",
+ readonly = true},
+
+ -- -----------------------------------------------
-- 5. Maemo SDK+
{prefix = "/opt/maemo",
diff --git a/lua_scripts/pathmaps/simple/00_default.lua b/lua_scripts/pathmaps/simple/00_default.lua
index ab43632..44311c0 100644
--- a/lua_scripts/pathmaps/simple/00_default.lua
+++ b/lua_scripts/pathmaps/simple/00_default.lua
@@ -1,5 +1,9 @@
-- Copyright (C) 2007 Lauri Leukkunen <lle@rahina.org>
-- Licensed under MIT license.
+--
+-- "simple" mode, to be used for software development & building
+-- (as the name says, this is the simple solution; See/use the "devel"
+-- mode when a more full-featured environment is needed)
-- Rule file interface version, mandatory.
--
@@ -15,6 +19,19 @@ simple_chain = {
next_chain = nil,
binary = nil,
rules = {
+ -- -----------------------------------------------
+ -- 2. Development environment special destinations:
+
+ {prefix = "/sb2/wrappers",
+ replace_by = sbox_dir.."/share/scratchbox2/wrappers",
+ readonly = true},
+
+ {prefix = "/sb2/scripts",
+ replace_by = sbox_dir.."/share/scratchbox2/scripts",
+ readonly = true},
+
+ -- -----------------------------------------------
+ -- 99. Other rules.
{prefix = "/lib", map_to = target_root},
{prefix = "/usr/share/osso", map_to = target_root},
{prefix = "/usr/lib/perl", map_to = tools},