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

Do not fetch simple Lua versions if the build is cached

Browse Source
This commit is contained in:
mpeterv 2015-11-23 19:20:20 +03:00
parent b35a54a26c
commit cbca13efc6
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hererocks.py
View File

@ -145,11 +145,12 @@ def url_to_name(s):
def copy_dir(src, dst): def copy_dir(src, dst):
shutil.copytree(src, dst, ignore=lambda _, __: {".git"}) shutil.copytree(src, dst, ignore=lambda _, __: {".git"})
def fetch(versions, version, temp_dir, targz=True): def translate(versions, version):
raw_versions, translations, downloads, name, repo = versions return versions[1].get(version, version)
if version in translations: def fetch(versions, version, temp_dir, targz=True):
version = translations[version] raw_versions, _, downloads, name, repo = versions
version = translate(versions, version)
if version in raw_versions: if version in raw_versions:
if not os.path.exists(opts.downloads): if not os.path.exists(opts.downloads):
@ -298,25 +299,39 @@ def check_subdir(path, subdir):
return path return path
def build_lua(target_dir, lua_version, temp_dir): def try_build_cache(target_dir, parts):
lua_path, parts = fetch(luajit_versions if opts.luajit else lua_versions, lua_version, temp_dir)
if not os.path.exists(target_dir):
os.makedirs(target_dir)
message = "Building " + ("LuaJIT" if opts.luajit else "Lua")
cached_build_path = None
if opts.builds and parts is not None: if opts.builds and parts is not None:
parts.extend(map(url_to_name, [opts.target, opts.compat, target_dir])) parts.extend(map(url_to_name, [opts.target, opts.compat, target_dir]))
cached_build_path = os.path.join(opts.builds, "-".join(parts)) cached_build_path = os.path.join(opts.builds, "-".join(parts))
if os.path.exists(cached_build_path): if os.path.exists(cached_build_path):
print(message + " (cached)") print("Building " + capitalize(parts[0]) + " (cached)")
os.chdir(cached_build_path) os.chdir(cached_build_path)
return cached_build_path, True
else:
return cached_build_path, False
else:
return None, False
def build_lua(target_dir, lua_version, temp_dir):
versions = luajit_versions if opts.luajit else lua_versions
lua_version = translate(versions, lua_version)
name = versions[3]
if lua_version in versions[0]:
# Simple Lua version. Check build cache before fetching sources.
cached_build_path, cached = try_build_cache(target_dir, [name, lua_version])
if cached:
return return
print(message) lua_path, parts = fetch(versions, lua_version, temp_dir)
cached_build_path, cached = try_build_cache(target_dir, parts)
if cached:
return
print("Building " + capitalize(name))
nominal_version = detect_lua_version(".") nominal_version = detect_lua_version(".")
package_path, package_cpath = get_luarocks_paths(target_dir, nominal_version) package_path, package_cpath = get_luarocks_paths(target_dir, nominal_version)
patch_default_paths(".", package_path, package_cpath) patch_default_paths(".", package_path, package_cpath)
@ -333,6 +348,9 @@ def build_lua(target_dir, lua_version, temp_dir):
def install_lua(target_dir, lua_version, temp_dir): def install_lua(target_dir, lua_version, temp_dir):
build_lua(target_dir, lua_version, temp_dir) build_lua(target_dir, lua_version, temp_dir)
if not os.path.exists(target_dir):
os.makedirs(target_dir)
if opts.luajit: if opts.luajit:
print("Installing LuaJIT") print("Installing LuaJIT")
run_command("make install", "PREFIX=" + quote(target_dir), run_command("make install", "PREFIX=" + quote(target_dir),