summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2009-07-10 11:30:26 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2009-07-10 11:30:26 +0000
commit80b4e5d55da5b9075615556191dfd4599b129dd9 (patch)
treeadfb27ed4369927e95a65419f3fac3dca2f8732c
parent8866342b1f9095d1d38a8d7f9ac021472803454f (diff)
downloadrockbox-80b4e5d55da5b9075615556191dfd4599b129dd9.zip
rockbox-80b4e5d55da5b9075615556191dfd4599b129dd9.tar.gz
rockbox-80b4e5d55da5b9075615556191dfd4599b129dd9.tar.bz2
rockbox-80b4e5d55da5b9075615556191dfd4599b129dd9.tar.xz
Lua:
* add ./?/init.lua to the search path for require * put Lua libs in /.rockbox/rocks/viewers/lua/ git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21739 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/lua/rockconf.h2
-rwxr-xr-xtools/buildzip.pl3
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/plugins/lua/rockconf.h b/apps/plugins/lua/rockconf.h
index 67994bb..639f336 100644
--- a/apps/plugins/lua/rockconf.h
+++ b/apps/plugins/lua/rockconf.h
@@ -29,7 +29,7 @@
#undef luai_jmpbuf
#undef LUA_PATH_DEFAULT
-#define LUA_PATH_DEFAULT "$/?.lua;" VIEWERS_DIR"/?.lua;"
+#define LUA_PATH_DEFAULT "$/?.lua;" "$/?/init.lua;" VIEWERS_DIR"/lua/?.lua;" VIEWERS_DIR"/lua/?/init.lua;"
#ifndef SIMULATOR
#include "../../codecs/lib/setjmp.h"
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index d21fd8e..a3ac75f 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -429,7 +429,8 @@ STOP
glob_copy('apps/lang/*lng', "$rbdir/langs/");
# copy the .lua files
- glob_copy('apps/plugins/lua/*.lua', "$rbdir/rocks/viewers/");
+ mkdir "$rbdir/rocks/viewers/lua/", 0777;
+ glob_copy('apps/plugins/lua/*.lua', "$rbdir/rocks/viewers/lua/");
}
my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =