# HG changeset patch # User HackBot # Date 1355524962 0 # Node ID 4683d0f7c27705a87afb251722f6e14fe4f93430 # Parent f8c8ba5db32820053299a0c907ba1413618dfe82 (cd luabuild/luarocks-2.0.12; make clean all > make.out 2> make.err) diff -r f8c8ba5db328 -r 4683d0f7c277 luabuild/luarocks-2.0.12/make.out --- a/luabuild/luarocks-2.0.12/make.out Fri Dec 14 22:41:02 2012 +0000 +++ b/luabuild/luarocks-2.0.12/make.out Fri Dec 14 22:42:42 2012 +0000 @@ -5,6 +5,50 @@ chmod +x src/bin/$f ;\ rm -f src/bin/$f.bak ;\ done +rm -f src/luarocks/site_config.lua +rm -f built +rm -f src/luarocks/site_config.lua +echo 'module("luarocks.site_config")' >> src/luarocks/site_config.lua +if [ -n "/hackenv" ] ;\ + then \ + echo "LUAROCKS_PREFIX=[[/hackenv]]" >> src/luarocks/site_config.lua ;\ + fi +if [ -n "/hackenv/include" ] ;\ + then \ + echo "LUA_INCDIR=[[/hackenv/include]]" >> src/luarocks/site_config.lua ;\ + fi +if [ -n "/hackenv/lib" ] ;\ + then \ + echo "LUA_LIBDIR=[[/hackenv/lib]]" >> src/luarocks/site_config.lua ;\ + fi +if [ -n "/hackenv/bin" ] ;\ + then \ + echo "LUA_BINDIR=[[/hackenv/bin]]" >> src/luarocks/site_config.lua ;\ + fi +if [ -n "" ] ;\ + then \ + echo "LUA_INTERPRETER=[[lua]]" >> src/luarocks/site_config.lua ;\ + fi +if [ -n "/hackenv/etc/luarocks" ] ;\ + then \ + echo "LUAROCKS_SYSCONFIG=[[/hackenv/etc/luarocks/config.lua]]" >> src/luarocks/site_config.lua ;\ + fi +if [ -n "/hackenv" ] ;\ + then \ + echo "LUAROCKS_ROCKS_TREE=[[/hackenv]]" >> src/luarocks/site_config.lua ;\ + fi +if [ -n "" ] ;\ + then \ + echo "LUAROCKS_FORCE_CONFIG=true" >> src/luarocks/site_config.lua ;\ + fi +if [ "" = "yes" ] ;\ + then \ + echo "LUA_DIR_SET=true" >> src/luarocks/site_config.lua ;\ + fi +echo "LUAROCKS_UNAME_S=[[Linux]]" >> src/luarocks/site_config.lua +echo "LUAROCKS_UNAME_M=[[x86_64]]" >> src/luarocks/site_config.lua +echo "LUAROCKS_DOWNLOADER=[[curl]]" >> src/luarocks/site_config.lua +echo "LUAROCKS_MD5CHECKER=[[md5sum]]" >> src/luarocks/site_config.lua for f in luarocks luarocks-admin ;\ do \ sed "1d" src/bin/$f > src/bin/$f.bak ;\ @@ -18,26 +62,3 @@ Done. Type 'make install' to install into /hackenv. -mkdir -p "/hackenv/bin" -cd src/bin && cp luarocks luarocks-admin "/hackenv/bin" -mkdir -p "/hackenv/share/lua/5.2//luarocks" -cd src/luarocks && for f in fs/unix/tools.lua fs/unix.lua fs/win32/tools.lua fs/win32.lua fs/lua.lua persist.lua list.lua require.lua repos.lua dir.lua make_manifest.lua command_line.lua install.lua build/command.lua build/cmake.lua build/make.lua build/builtin.lua fetch/cvs.lua fetch/git.lua fetch/sscm.lua tools/patch.lua fetch/svn.lua tools/zip.lua tools/tar.lua pack.lua type_check.lua make.lua path.lua remove.lua fs.lua manif.lua add.lua deps.lua build.lua search.lua show.lua manif_core.lua fetch.lua unpack.lua validate.lua cfg.lua download.lua help.lua util.lua index.lua cache.lua refresh_cache.lua loader.lua admin_remove.lua fetch/hg.lua fetch/git_file.lua new_version.lua lint.lua purge.lua; \ - do \ - d="/hackenv/share/lua/5.2//luarocks"/`dirname "$f"` && \ - mkdir -p "$d" && \ - cp "$f" "$d" || exit 1; \ - done -mkdir -p "/hackenv/share/lua/5.2//luarocks" -cd src/luarocks && cp site_config.lua "/hackenv/share/lua/5.2//luarocks" -mkdir -p "/hackenv" -if [ ! -f "/hackenv/etc/luarocks/config.lua" ] ;\ - then \ - mkdir -p `dirname "/hackenv/etc/luarocks/config.lua"` ;\ - echo 'rocks_trees = {' >> "/hackenv/etc/luarocks/config.lua" ;\ - if [ ! -n "" ] ;\ - then \ - echo ' home..[[/.luarocks]],' >> "/hackenv/etc/luarocks/config.lua" ;\ - fi ;\ - echo ' [[/hackenv]]' >> "/hackenv/etc/luarocks/config.lua" ;\ - echo '}' >> "/hackenv/etc/luarocks/config.lua" ;\ - fi diff -r f8c8ba5db328 -r 4683d0f7c277 luabuild/luarocks-2.0.12/src/luarocks/site_config.lua --- a/luabuild/luarocks-2.0.12/src/luarocks/site_config.lua Fri Dec 14 22:41:02 2012 +0000 +++ b/luabuild/luarocks-2.0.12/src/luarocks/site_config.lua Fri Dec 14 22:42:42 2012 +0000 @@ -5,3 +5,7 @@ LUA_BINDIR=[[/hackenv/bin]] LUAROCKS_SYSCONFIG=[[/hackenv/etc/luarocks/config.lua]] LUAROCKS_ROCKS_TREE=[[/hackenv]] +LUAROCKS_UNAME_S=[[Linux]] +LUAROCKS_UNAME_M=[[x86_64]] +LUAROCKS_DOWNLOADER=[[curl]] +LUAROCKS_MD5CHECKER=[[md5sum]]