epicknex/hererocks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

For Lua 5.1 look for modules locally first

Browse Source 
Lua 5.1 and LuaJIT have "?.lua" as the first entry in package.path,
while Lua 5.2 and 5.3 have it as the last one. Respect this rule
when patching default paths in luaconf.h.
This commit is contained in:
mpeterv 2015-10-25 13:25:28 +03:00
parent 72bab48215
commit 0361ea374a
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hererocks.py
View File

@ -203,19 +203,25 @@ def patch_build_option(lua_path, old, new):
makefile.close()
def get_luarocks_paths(target_dir, nominal_version):
local_paths_first = nominal_version == "5.1"
module_path = os.path.join(target_dir, "share", "lua", nominal_version)
package_path = ";".join([
module_path_parts = [
os.path.join(module_path, "?.lua"),
os.path.join(module_path, "?", "init.lua"),
os.path.join(".", "?.lua")
])
os.path.join(module_path, "?", "init.lua")
]
module_path_parts.insert(0 if local_paths_first else 2, os.path.join(".", "?.lua"))
package_path = ";".join(module_path_parts)
cmodule_path = os.path.join(target_dir, "lib", "lua", nominal_version)
so_extension = ".dll" if os.name == "nt" else ".so"
package_cpath = ";".join([
cmodule_path_parts = [
os.path.join(cmodule_path, "?" + so_extension),
os.path.join(cmodule_path, "loadall" + so_extension),
os.path.join(".", "?" + so_extension)
])
os.path.join(cmodule_path, "loadall" + so_extension)
]
cmodule_path_parts.insert(0 if local_paths_first else 2, os.path.join(".", "?" + so_extension))
package_cpath = ";".join(cmodule_path_parts)
return package_path, package_cpath
def apply_compat(lua_path, nominal_version, is_luajit, compat):