aboutsummaryrefslogtreecommitdiff
path: root/.appveyor
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2015-11-07 17:48:36 -0800
committerHisham Muhammad <hisham@gobolinux.org>2015-11-07 17:48:36 -0800
commitce3ea550e02da88cb3236309655ef890f32a0ed8 (patch)
treeeff2bdbc1f187d8e420a913286125b3b06715763 /.appveyor
parent9c99043149e7578fbbfedbbdc7950a3c1f61ba6e (diff)
parentcb3e2aff5c1665db48bdd274bd696a0d465cbd3a (diff)
downloadluarocks-ce3ea550e02da88cb3236309655ef890f32a0ed8.tar.gz
luarocks-ce3ea550e02da88cb3236309655ef890f32a0ed8.tar.bz2
luarocks-ce3ea550e02da88cb3236309655ef890f32a0ed8.zip
Merge pull request #413 from Tieske/unversion_LR
Win installer: Unversion LR target path
Diffstat (limited to '.appveyor')
-rw-r--r--.appveyor/build.bat7
1 files changed, 3 insertions, 4 deletions
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
18set LUAROCKS_SHORTV=%LUAROCKS_VER:~0,3% 18set LUAROCKS_SHORTV=%LUAROCKS_VER:~0,3%
19 19
20if not defined LR_EXTERNAL set LR_EXTERNAL=c:\external 20if not defined LR_EXTERNAL set LR_EXTERNAL=c:\external
21if not defined LUAROCKS_INSTALL set LUAROCKS_INSTALL=%LUA_DIR%\LuaRocks 21if not defined LR_ROOT set LR_ROOT=%LUA_DIR%\LuaRocks
22if not defined LR_ROOT set LR_ROOT=%LUAROCKS_INSTALL%\%LUAROCKS_SHORTV% 22if not defined LR_SYSTREE set LR_SYSTREE=%LR_ROOT%\systree
23if not defined LR_SYSTREE set LR_SYSTREE=%LUAROCKS_INSTALL%\systree
24 23
25:: 24::
26:: ========================================================= 25:: =========================================================
@@ -35,7 +34,7 @@ if not exist %LUA_DIR%\bin\%LUA%.exe call :die "Missing Lua interpreter at %LUA_
35:: ========================================================= 34:: =========================================================
36 35
37cd %APPVEYOR_BUILD_FOLDER% 36cd %APPVEYOR_BUILD_FOLDER%
38call install.bat /LUA %LUA_DIR% /Q /LV %LUA_SHORTV% /P "%LUAROCKS_INSTALL%" /TREE "%LR_SYSTREE%" 37call install.bat /LUA %LUA_DIR% /Q /LV %LUA_SHORTV% /P "%LR_ROOT%" /TREE "%LR_SYSTREE%"
39 38
40if not exist "%LR_ROOT%" call :die "LuaRocks not found at %LR_ROOT%" 39if not exist "%LR_ROOT%" call :die "LuaRocks not found at %LR_ROOT%"
41 40