From 37e38841ba7445d724787b1b7c8145dbe1136f43 Mon Sep 17 00:00:00 2001 From: mpeterv Date: Thu, 20 Mar 2014 23:49:40 +0400 Subject: Removed module calls from installation scripts --- Makefile | 35 ++++++++++++++++++----------------- install.bat | 29 +++++++++++++++-------------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index a1b87b20..244563b7 100644 --- a/Makefile +++ b/Makefile @@ -44,56 +44,57 @@ build: src/luarocks/site_config.lua build_bins src/luarocks/site_config.lua: config.unix rm -f src/luarocks/site_config.lua - echo 'module("luarocks.site_config")' >> src/luarocks/site_config.lua + echo 'local site_config = {}' >> src/luarocks/site_config.lua if [ -n "$(PREFIX)" ] ;\ then \ - echo "LUAROCKS_PREFIX=[[$(PREFIX)]]" >> src/luarocks/site_config.lua ;\ + echo "site_config.LUAROCKS_PREFIX=[[$(PREFIX)]]" >> src/luarocks/site_config.lua ;\ fi if [ -n "$(LUA_INCDIR)" ] ;\ then \ - echo "LUA_INCDIR=[[$(LUA_INCDIR)]]" >> src/luarocks/site_config.lua ;\ + echo "site_config.LUA_INCDIR=[[$(LUA_INCDIR)]]" >> src/luarocks/site_config.lua ;\ fi if [ -n "$(LUA_LIBDIR)" ] ;\ then \ - echo "LUA_LIBDIR=[[$(LUA_LIBDIR)]]" >> src/luarocks/site_config.lua ;\ + echo "site_config.LUA_LIBDIR=[[$(LUA_LIBDIR)]]" >> src/luarocks/site_config.lua ;\ fi if [ -n "$(LUA_BINDIR)" ] ;\ then \ - echo "LUA_BINDIR=[[$(LUA_BINDIR)]]" >> src/luarocks/site_config.lua ;\ + echo "site_config.LUA_BINDIR=[[$(LUA_BINDIR)]]" >> src/luarocks/site_config.lua ;\ fi if [ -n "$(LUA_SUFFIX)" ] ;\ then \ - echo "LUA_INTERPRETER=[[lua$(LUA_SUFFIX)]]" >> src/luarocks/site_config.lua ;\ + echo "site_config.LUA_INTERPRETER=[[lua$(LUA_SUFFIX)]]" >> src/luarocks/site_config.lua ;\ fi if [ -n "$(SYSCONFDIR)" ] ;\ then \ - echo "LUAROCKS_SYSCONFDIR=[[$(SYSCONFDIR)]]" >> src/luarocks/site_config.lua ;\ + echo "site_config.LUAROCKS_SYSCONFDIR=[[$(SYSCONFDIR)]]" >> src/luarocks/site_config.lua ;\ fi if [ -n "$(ROCKS_TREE)" ] ;\ then \ - echo "LUAROCKS_ROCKS_TREE=[[$(ROCKS_TREE)]]" >> src/luarocks/site_config.lua ;\ + echo "site_config.LUAROCKS_ROCKS_TREE=[[$(ROCKS_TREE)]]" >> src/luarocks/site_config.lua ;\ fi if [ -n "$(FORCE_CONFIG)" ] ;\ then \ - echo "LUAROCKS_FORCE_CONFIG=true" >> src/luarocks/site_config.lua ;\ + echo "site_config.LUAROCKS_FORCE_CONFIG=true" >> src/luarocks/site_config.lua ;\ fi if [ -n "$(LUAROCKS_ROCKS_SUBDIR)" ] ;\ then \ - echo "LUAROCKS_ROCKS_SUBDIR=[[$(LUAROCKS_ROCKS_SUBDIR)]]" >> src/luarocks/site_config.lua ;\ + echo "site_config.LUAROCKS_ROCKS_SUBDIR=[[$(LUAROCKS_ROCKS_SUBDIR)]]" >> src/luarocks/site_config.lua ;\ fi if [ "$(LUA_DIR_SET)" = "yes" ] ;\ then \ - echo "LUA_DIR_SET=true" >> src/luarocks/site_config.lua ;\ + echo "site_config.LUA_DIR_SET=true" >> src/luarocks/site_config.lua ;\ fi - echo "LUAROCKS_UNAME_S=[[$(LUAROCKS_UNAME_S)]]" >> src/luarocks/site_config.lua - echo "LUAROCKS_UNAME_M=[[$(LUAROCKS_UNAME_M)]]" >> src/luarocks/site_config.lua - echo "LUAROCKS_DOWNLOADER=[[$(LUAROCKS_DOWNLOADER)]]" >> src/luarocks/site_config.lua - echo "LUAROCKS_MD5CHECKER=[[$(LUAROCKS_MD5CHECKER)]]" >> src/luarocks/site_config.lua + echo "site_config.LUAROCKS_UNAME_S=[[$(LUAROCKS_UNAME_S)]]" >> src/luarocks/site_config.lua + echo "site_config.LUAROCKS_UNAME_M=[[$(LUAROCKS_UNAME_M)]]" >> src/luarocks/site_config.lua + echo "site_config.LUAROCKS_DOWNLOADER=[[$(LUAROCKS_DOWNLOADER)]]" >> src/luarocks/site_config.lua + echo "site_config.LUAROCKS_MD5CHECKER=[[$(LUAROCKS_MD5CHECKER)]]" >> src/luarocks/site_config.lua if [ -n "$(MULTIARCH_SUBDIR)" ] ;\ then \ - echo 'LUAROCKS_EXTERNAL_DEPS_SUBDIRS={ bin="bin", lib={ "lib", [[$(MULTIARCH_SUBDIR)]] }, include="include" }' >> src/luarocks/site_config.lua ;\ - echo 'LUAROCKS_RUNTIME_EXTERNAL_DEPS_SUBDIRS={ bin="bin", lib={ "lib", [[$(MULTIARCH_SUBDIR)]] }, include="include" }' >> src/luarocks/site_config.lua ;\ + echo 'site_config.LUAROCKS_EXTERNAL_DEPS_SUBDIRS={ bin="bin", lib={ "lib", [[$(MULTIARCH_SUBDIR)]] }, include="include" }' >> src/luarocks/site_config.lua ;\ + echo 'site_config.LUAROCKS_RUNTIME_EXTERNAL_DEPS_SUBDIRS={ bin="bin", lib={ "lib", [[$(MULTIARCH_SUBDIR)]] }, include="include" }' >> src/luarocks/site_config.lua ;\ fi + echo "return site_config" >> src/luarocks/site_config.lua dev: $(MAKE) build_bins LUADIR=$(PWD)/src diff --git a/install.bat b/install.bat index 934154d0..287bad5b 100644 --- a/install.bat +++ b/install.bat @@ -771,27 +771,27 @@ if exists(S[[$LUADIR\luarocks\site_config.lua]]) then end local f = io.open(vars.LUADIR.."\\luarocks\\site_config.lua", "w") f:write(S[=[ -module("luarocks.site_config") -LUA_INCDIR=[[$LUA_INCDIR]] -LUA_LIBDIR=[[$LUA_LIBDIR]] -LUA_BINDIR=[[$LUA_BINDIR]] -LUA_INTERPRETER=[[$LUA_INTERPRETER]] +local site_config = {} +site_config.LUA_INCDIR=[[$LUA_INCDIR]] +site_config.LUA_LIBDIR=[[$LUA_LIBDIR]] +site_config.LUA_BINDIR=[[$LUA_BINDIR]] +site_config.LUA_INTERPRETER=[[$LUA_INTERPRETER]] ]=]) if USE_MINGW then - f:write("LUAROCKS_UNAME_S=[[MINGW]]\n") + f:write("site_config.LUAROCKS_UNAME_S=[[MINGW]]\n") else - f:write("LUAROCKS_UNAME_S=[[WindowsNT]]\n") + f:write("site_config.LUAROCKS_UNAME_S=[[WindowsNT]]\n") end f:write(S[=[ -LUAROCKS_UNAME_M=[[$UNAME_M]] -LUAROCKS_SYSCONFIG=[[$SYSCONFDIR\config.lua]] -LUAROCKS_ROCKS_TREE=[[$ROCKS_TREE]] -LUAROCKS_PREFIX=[[$PREFIX]] -LUAROCKS_DOWNLOADER=[[wget]] -LUAROCKS_MD5CHECKER=[[md5sum]] +site_config.LUAROCKS_UNAME_M=[[$UNAME_M]] +site_config.LUAROCKS_SYSCONFIG=[[$SYSCONFDIR\config.lua]] +site_config.LUAROCKS_ROCKS_TREE=[[$ROCKS_TREE]] +site_config.LUAROCKS_PREFIX=[[$PREFIX]] +site_config.LUAROCKS_DOWNLOADER=[[wget]] +site_config.LUAROCKS_MD5CHECKER=[[md5sum]] ]=]) if FORCE_CONFIG then - f:write("local LUAROCKS_FORCE_CONFIG=true\n") + f:write("site_config.LUAROCKS_FORCE_CONFIG=true\n") end if exists(vars.LUADIR.."\\luarocks\\site_config.lua.bak") then for line in io.lines(vars.LUADIR.."\\luarocks\\site_config.lua.bak", "r") do @@ -800,6 +800,7 @@ if exists(vars.LUADIR.."\\luarocks\\site_config.lua.bak") then end exec(S[[DEL /F /Q "$LUADIR\luarocks\site_config.lua.bak"]]) end +f:write("return site_config\n") f:close() print(S[[Created LuaRocks site-config file: $LUADIR\luarocks\site_config.lua]]) -- cgit v1.2.3-55-g6feb