From cc621bf31aadd314d72ea6d49cffdca51b280add Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Sun, 19 Jul 2015 09:05:13 +0200 Subject: Fixes appveyor build script for changed paths --- .appveyor/build.bat | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to '.appveyor') diff --git a/.appveyor/build.bat b/.appveyor/build.bat index 48e72514..a4ff6378 100644 --- a/.appveyor/build.bat +++ b/.appveyor/build.bat @@ -18,9 +18,8 @@ if not defined LUAROCKS_VER set LUAROCKS_VER=2.2.1 set LUAROCKS_SHORTV=%LUAROCKS_VER:~0,3% if not defined LR_EXTERNAL set LR_EXTERNAL=c:\external -if not defined LUAROCKS_INSTALL set LUAROCKS_INSTALL=%LUA_DIR%\LuaRocks -if not defined LR_ROOT set LR_ROOT=%LUAROCKS_INSTALL%\%LUAROCKS_SHORTV% -if not defined LR_SYSTREE set LR_SYSTREE=%LUAROCKS_INSTALL%\systree +if not defined LR_ROOT set LR_ROOT=%LUA_DIR%\LuaRocks +if not defined LR_SYSTREE set LR_SYSTREE=%LR_ROOT%\systree :: :: ========================================================= @@ -35,7 +34,7 @@ if not exist %LUA_DIR%\bin\%LUA%.exe call :die "Missing Lua interpreter at %LUA_ :: ========================================================= cd %APPVEYOR_BUILD_FOLDER% -call install.bat /LUA %LUA_DIR% /Q /LV %LUA_SHORTV% /P "%LUAROCKS_INSTALL%" /TREE "%LR_SYSTREE%" +call install.bat /LUA %LUA_DIR% /Q /LV %LUA_SHORTV% /P "%LR_ROOT%" /TREE "%LR_SYSTREE%" if not exist "%LR_ROOT%" call :die "LuaRocks not found at %LR_ROOT%" -- cgit v1.2.3-55-g6feb From 838f1f9057e0066695b4f0fc762253b696025f92 Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Sun, 19 Jul 2015 09:40:45 +0200 Subject: added debug line --- .appveyor/build.bat | 1 + 1 file changed, 1 insertion(+) (limited to '.appveyor') diff --git a/.appveyor/build.bat b/.appveyor/build.bat index a4ff6378..9bec8c54 100644 --- a/.appveyor/build.bat +++ b/.appveyor/build.bat @@ -47,6 +47,7 @@ set LUA_PATH=%LUA_PATH%;%LR_SYSTREE%\share\lua\%LUA_SHORTV%\?\init.lua set LUA_CPATH=%LR_SYSTREE%\lib\lua\%LUA_SHORTV%\?.dll call luarocks --version || call :die "Error with LuaRocks installation" +cd && dir call luarocks list -- cgit v1.2.3-55-g6feb From a625fe26e46fa0c61c1fbab82013589813ebf4c4 Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Mon, 20 Jul 2015 15:41:34 +0200 Subject: fixed bad reference to main LuaRocks install path, should fix AppVeyor failures --- .appveyor/build.bat | 1 - src/luarocks/cfg.lua | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to '.appveyor') diff --git a/.appveyor/build.bat b/.appveyor/build.bat index 9bec8c54..a4ff6378 100644 --- a/.appveyor/build.bat +++ b/.appveyor/build.bat @@ -47,7 +47,6 @@ set LUA_PATH=%LUA_PATH%;%LR_SYSTREE%\share\lua\%LUA_SHORTV%\?\init.lua set LUA_CPATH=%LR_SYSTREE%\lib\lua\%LUA_SHORTV%\?.dll call luarocks --version || call :die "Error with LuaRocks installation" -cd && dir call luarocks list diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 31b3211a..70c1bd04 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua @@ -374,7 +374,7 @@ local defaults = { } if cfg.platforms.windows then - local full_prefix = (site_config.LUAROCKS_PREFIX or (os.getenv("PROGRAMFILES")..[[\LuaRocks]])).."\\"..cfg.major_version + local full_prefix = (site_config.LUAROCKS_PREFIX or (os.getenv("PROGRAMFILES")..[[\LuaRocks]])) extra_luarocks_module_dir = full_prefix.."\\lua\\?.lua" home_config_file = home_config_file and home_config_file:gsub("\\","/") -- cgit v1.2.3-55-g6feb