zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

appeasing the great vengeful flake8 gods

Browse Source
This commit is contained in:
Tom Scogland
2016-05-14 17:49:06 -07:00
parent df30182a10
commit f50439b990
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
var/spack/repos/builtin/packages/lua/package.py
View File

@@ -50,7 +50,8 @@ class Lua(Package):
resource( resource(
name="luarocks", name="luarocks",
url="https://keplerproject.github.io/luarocks/releases/luarocks-2.3.0.tar.gz", url="https://keplerproject.github.io/luarocks/releases/"
"luarocks-2.3.0.tar.gz",
md5="a38126684cf42b7d0e7a3c7cf485defb", md5="a38126684cf42b7d0e7a3c7cf485defb",
destination="luarocks", destination="luarocks",
placement='luarocks') placement='luarocks')
@@ -97,7 +98,8 @@ def setup_dependent_environment(self, spack_env, run_env, extension_spec):
spack_env.set('LUA_PATH', ';'.join(lua_patterns), separator=';') spack_env.set('LUA_PATH', ';'.join(lua_patterns), separator=';')
spack_env.set('LUA_CPATH', ';'.join(lua_cpatterns), separator=';') spack_env.set('LUA_CPATH', ';'.join(lua_cpatterns), separator=';')
# For run time environment set only the path for extension_spec and prepend it to LUAPATH # For run time environment set only the path for extension_spec and
# prepend it to LUAPATH
if extension_spec.package.extends(self.spec): if extension_spec.package.extends(self.spec):
run_env.prepend_path('LUA_PATH', ';'.join(lua_patterns), run_env.prepend_path('LUA_PATH', ';'.join(lua_patterns),
separator=';') separator=';')
@@ -105,21 +107,26 @@ def setup_dependent_environment(self, spack_env, run_env, extension_spec):
separator=';') separator=';')
def setup_environment(self, spack_env, run_env): def setup_environment(self, spack_env, run_env):
run_env.prepend_path('LUA_PATH', os.path.join( run_env.prepend_path(
self.spec.prefix, self.lua_share_dir, '?.lua'), 'LUA_PATH',
separator=';') os.path.join(self.spec.prefix, self.lua_share_dir, '?.lua'),
run_env.prepend_path('LUA_PATH', os.path.join( separator=';')
self.spec.prefix, self.lua_share_dir, '?', 'init.lua'), run_env.prepend_path(
separator=';') 'LUA_PATH', os.path.join(self.spec.prefix, self.lua_share_dir, '?',
run_env.prepend_path('LUA_PATH', os.path.join( 'init.lua'),
self.spec.prefix, self.lua_lib_dir, '?.lua'), separator=';')
separator=';') run_env.prepend_path(
run_env.prepend_path('LUA_PATH', os.path.join( 'LUA_PATH',
self.spec.prefix, self.lua_lib_dir, '?', 'init.lua'), os.path.join(self.spec.prefix, self.lua_lib_dir, '?.lua'),
separator=';') separator=';')
run_env.prepend_path('LUA_CPATH', os.path.join( run_env.prepend_path(
self.spec.prefix, self.lua_lib_dir, '?.so'), 'LUA_PATH',
separator=';') os.path.join(self.spec.prefix, self.lua_lib_dir, '?', 'init.lua'),
separator=';')
run_env.prepend_path(
'LUA_CPATH',
os.path.join(self.spec.prefix, self.lua_lib_dir, '?.so'),
separator=';')
@property @property
def lua_lib_dir(self): def lua_lib_dir(self):