diff options
| author | Daniel Klein <bildzeitung@gmail.com> | 2012-02-20 16:29:01 -0500 |
|---|---|---|
| committer | Daniel Klein <bildzeitung@gmail.com> | 2012-02-20 16:29:01 -0500 |
| commit | 797a7742000961fdb33649477c7dd79f6c0d9d61 (patch) | |
| tree | e82167c5df6304741f7bfa691fdf18f5b13510cc /install.bat | |
| parent | caa486a74909e2e0066a5531e2a3fd6af46ca9af (diff) | |
| download | luarocks-797a7742000961fdb33649477c7dd79f6c0d9d61.tar.gz luarocks-797a7742000961fdb33649477c7dd79f6c0d9d61.tar.bz2 luarocks-797a7742000961fdb33649477c7dd79f6c0d9d61.zip | |
Dropped prefix assignments to LUA_INTERPRETER and added luajit.
Also, combed source to see if interpreter var was used elsewhere, and it
appears that it's only used in conjunction with the path, which is enough.
Diffstat (limited to '')
| -rw-r--r-- | install.bat | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/install.bat b/install.bat index 25037193..86766eb1 100644 --- a/install.bat +++ b/install.bat | |||
| @@ -146,25 +146,34 @@ FOR %%L IN (%LUA_PREFIX% c:\lua\5.1.2 c:\lua c:\kepler\1.1) DO ( | |||
| 146 | IF EXIST "%%L" ( | 146 | IF EXIST "%%L" ( |
| 147 | IF NOT [%LUA_BINDIR%]==[] ( | 147 | IF NOT [%LUA_BINDIR%]==[] ( |
| 148 | IF EXIST %LUA_BINDIR%\lua5.1.exe ( | 148 | IF EXIST %LUA_BINDIR%\lua5.1.exe ( |
| 149 | SET LUA_INTERPRETER=%LUA_BINDIR%\lua5.1.exe | 149 | SET LUA_INTERPRETER=lua5.1.exe |
| 150 | GOTO INTERPRETER_IS_SET | 150 | GOTO INTERPRETER_IS_SET |
| 151 | ) | 151 | ) |
| 152 | IF EXIST %LUA_BINDIR%\lua.exe ( | 152 | IF EXIST %LUA_BINDIR%\lua.exe ( |
| 153 | SET LUA_INTERPRETER=%LUA_BINDIR%\lua.exe | 153 | SET LUA_INTERPRETER=lua.exe |
| 154 | GOTO INTERPRETER_IS_SET | 154 | GOTO INTERPRETER_IS_SET |
| 155 | ) | 155 | ) |
| 156 | IF EXIST %LUA_BINDIR%\luajit.exe ( | ||
| 157 | SET LUA_INTERPRETER=luajit.exe | ||
| 158 | GOTO INTERPRETER_IS_SET | ||
| 159 | ) | ||
| 156 | ECHO Lua executable lua.exe or lua5.1.exe not found in %LUA_BINDIR% | 160 | ECHO Lua executable lua.exe or lua5.1.exe not found in %LUA_BINDIR% |
| 157 | GOTO ERROR | 161 | GOTO ERROR |
| 158 | ) | 162 | ) |
| 159 | SET CURR=%%L | 163 | SET CURR=%%L |
| 160 | FOR %%E IN (\ \bin\) DO ( | 164 | FOR %%E IN (\ \bin\) DO ( |
| 161 | IF EXIST "%%L%%E\lua5.1.exe" ( | 165 | IF EXIST "%%L%%E\lua5.1.exe" ( |
| 162 | SET LUA_INTERPRETER=%%L%%E\lua5.1.exe | 166 | SET LUA_INTERPRETER=lua5.1.exe |
| 163 | SET LUA_BINDIR=%%L%%E | 167 | SET LUA_BINDIR=%%L%%E |
| 164 | GOTO INTERPRETER_IS_SET | 168 | GOTO INTERPRETER_IS_SET |
| 165 | ) | 169 | ) |
| 166 | IF EXIST "%%L%%E\lua.exe" ( | 170 | IF EXIST "%%L%%E\lua.exe" ( |
| 167 | SET LUA_INTERPRETER=%%L%%E\lua.exe | 171 | SET LUA_INTERPRETER=lua.exe |
| 172 | SET LUA_BINDIR=%%L%%E | ||
| 173 | GOTO INTERPRETER_IS_SET | ||
| 174 | ) | ||
| 175 | IF EXIST "%%L%%E\luajit.exe" ( | ||
| 176 | SET LUA_INTERPRETER=luajit.exe | ||
| 168 | SET LUA_BINDIR=%%L%%E | 177 | SET LUA_BINDIR=%%L%%E |
| 169 | GOTO INTERPRETER_IS_SET | 178 | GOTO INTERPRETER_IS_SET |
| 170 | ) | 179 | ) |
| @@ -197,7 +206,7 @@ FOR %%L IN (%LUA_PREFIX% c:\lua\5.1.2 c:\lua c:\kepler\1.1) DO ( | |||
| 197 | ) | 206 | ) |
| 198 | GOTO TRY_NEXT_LUA_DIR | 207 | GOTO TRY_NEXT_LUA_DIR |
| 199 | :INCDIR_IS_SET | 208 | :INCDIR_IS_SET |
| 200 | %LUA_INTERPRETER% -v 2>NUL | 209 | %LUA_BINDIR%\%LUA_INTERPRETER% -v 2>NUL |
| 201 | IF NOT ERRORLEVEL 1 ( | 210 | IF NOT ERRORLEVEL 1 ( |
| 202 | GOTO LUA_IS_SET | 211 | GOTO LUA_IS_SET |
| 203 | ) | 212 | ) |