diff options
| author | Philipp Janda <siffiejoe@gmx.net> | 2014-03-26 18:25:16 +0100 |
|---|---|---|
| committer | Philipp Janda <siffiejoe@gmx.net> | 2014-03-26 18:25:16 +0100 |
| commit | eba0f64344ea14c25cbe7b1054739567cd77ec29 (patch) | |
| tree | bfb591cda588c51901a8c1ecb1cbf28a9a86f0b0 /install.bat | |
| parent | 00b5631f71fcb0db535aded042b51aa58223e6a4 (diff) | |
| download | luarocks-eba0f64344ea14c25cbe7b1054739567cd77ec29.tar.gz luarocks-eba0f64344ea14c25cbe7b1054739567cd77ec29.tar.bz2 luarocks-eba0f64344ea14c25cbe7b1054739567cd77ec29.zip | |
prepare luarocks for lua 5.3
Diffstat (limited to 'install.bat')
| -rw-r--r-- | install.bat | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/install.bat b/install.bat index 287bad5b..93b159a5 100644 --- a/install.bat +++ b/install.bat | |||
| @@ -138,7 +138,7 @@ Configuring the destinations: | |||
| 138 | if you create a self contained installation. | 138 | if you create a self contained installation. |
| 139 | 139 | ||
| 140 | Configuring the Lua interpreter: | 140 | Configuring the Lua interpreter: |
| 141 | /LV [version] Lua version to use; either 5.1 or 5.2. | 141 | /LV [version] Lua version to use; either 5.1, 5.2, or 5.3. |
| 142 | Default is 5.1 | 142 | Default is 5.1 |
| 143 | /LUA [dir] Location where Lua is installed - e.g. c:\lua\5.1\ | 143 | /LUA [dir] Location where Lua is installed - e.g. c:\lua\5.1\ |
| 144 | If not provided, the installer will search the system | 144 | If not provided, the installer will search the system |
| @@ -249,8 +249,10 @@ local function check_flags() | |||
| 249 | if vars.LUA_VERSION ~= "5.1" then | 249 | if vars.LUA_VERSION ~= "5.1" then |
| 250 | if vars.LUA_VERSION == "5.2" then | 250 | if vars.LUA_VERSION == "5.2" then |
| 251 | vars.LUA_LIB_NAMES = vars.LUA_LIB_NAMES:gsub("5([%.]?)1", "5%12") | 251 | vars.LUA_LIB_NAMES = vars.LUA_LIB_NAMES:gsub("5([%.]?)1", "5%12") |
| 252 | elseif vars.LUA_VERSION == "5.3" then | ||
| 253 | vars.LUA_LIB_NAMES = vars.LUA_LIB_NAMES:gsub("5([%.]?)1", "5%13") | ||
| 252 | else | 254 | else |
| 253 | die("Bad argument: /LV must either be 5.1 or 5.2") | 255 | die("Bad argument: /LV must either be 5.1, 5.2, or 5.3") |
| 254 | end | 256 | end |
| 255 | end | 257 | end |
| 256 | end | 258 | end |
| @@ -701,6 +703,9 @@ SET "LUA_PATH=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH%" | |||
| 701 | IF NOT "%LUA_PATH_5_2%"=="" ( | 703 | IF NOT "%LUA_PATH_5_2%"=="" ( |
| 702 | SET "LUA_PATH_5_2=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_2%" | 704 | SET "LUA_PATH_5_2=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_2%" |
| 703 | ) | 705 | ) |
| 706 | IF NOT "%LUA_PATH_5_3%"=="" ( | ||
| 707 | SET "LUA_PATH_5_3=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_3%" | ||
| 708 | ) | ||
| 704 | SET "PATH=$BINDIR;%PATH%" | 709 | SET "PATH=$BINDIR;%PATH%" |
| 705 | "$LUA_INTERPRETER" "$BINDIR\]]..c..[[.lua" %* | 710 | "$LUA_INTERPRETER" "$BINDIR\]]..c..[[.lua" %* |
| 706 | IF NOT "%ERRORLEVEL%"=="2" GOTO EXITLR | 711 | IF NOT "%ERRORLEVEL%"=="2" GOTO EXITLR |