aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Prefer versioned Lua interpreter if it exists.Hisham2016-10-281-1/+1
| | | | | | | | | | This avoids in practice a problem that occurs in this scenario: 1. user installs Lua 5.1, gets lua and lua5.1 binaries 2. user installs LuaRocks, it detects and uses lua 3. user installs Lua 5.2, gets lua and lua5.2 binaries (lua is replaced) 4. user installs LuaRocks with --lua-version=5.2, it detects and uses lua 5. luarocks-5.1 now uses lua, which is Lua 5.2, rockspecs get passed the wrong value of $(LUA)
* Support user-defined platforms array.Hisham2016-10-261-30/+57
| | | | | Let the user set their own custom platform entries, but also provide fallbacks to make sure things work.
* Check if header matches interpreter.Hisham2016-10-261-0/+12
|
* Improve check of Lua interpreterHisham2016-10-261-38/+39
| | | | | (e.g. allow it to find `lua5.1` when lua is 5.3 and only `--lua-version=5.1` is given).
* Merge branch 'master' of https://github.com/keplerproject/luarocksHisham2016-10-2615-16/+24
|\
| * Merge pull request #635 from mpeterv/rock-name-caseHisham Muhammad2016-10-2610-7/+22
| |\ | | | | | | Make rock name arguments case insensitive
| | * Add two tests for uppercase rock name argumentsPeter Melnichenko2016-10-262-1/+13
| | |
| | * Treat rock name arguments in case insensitive wayPeter Melnichenko2016-10-268-6/+9
| |/ | | | | | | | | | | | | | | | | | | Internally package names are lowercased, however, rockspec may contain a name with uppercase letters, which will be displayed by `luarocks show`. Some commands, like `luarocks search`, `luarocks install` and `luarocks build`, support this and convert input name to lowercase before passing it to interanl functions. Do the same thing in other commands accepting rock names.
| * Remove some unused locals and importsPeter Melnichenko2016-10-206-9/+2
| |
* | Add link_lua_explicitly option.Hisham2016-10-252-1/+3
| | | | | | | | | | Remove explicit reference to cygwin, and make option available for custom environments.
* | Check rockspec_version before running type check.Hisham2016-10-251-6/+6
|/
* Show traceback for errors in scheduled functionsPeter Melnichenko2016-10-201-9/+15
|
* Slightly improve error messages in deploy/removePeter Melnichenko2016-10-201-5/+7
|
* Add a test for sailor/sailorproject#138Peter Melnichenko2016-10-201-0/+12
|
* Merge pull request #631 from mpeterv/fix-conflict-resolutionHisham Muhammad2016-10-204-96/+188
|\ | | | | Fix conflict resolution
| * Fix backup of wrapped scripts on deployPeter Melnichenko2016-10-201-26/+25
| | | | | | | | | | When deploying script to bin/script.bat, check and back up bin/script.bat, not bin/script.
| * Add a test for wrapped script backupPeter Melnichenko2016-10-201-0/+2
| |
| * Fix conflict resolution on deploy/deletePeter Melnichenko2016-10-192-78/+146
| | | | | | | | | | | | | | | | When deploying or deleting files, resolve conflicts purely based on module names and command names, not file names. Also, don't assume that in case of a conflict both packages have the same file providing the module or command; it can be false due to binary wrappers and `path_to_module("mod/init.lua")` == `path_to_module("mod.lua").
| * Add a test for #302Peter Melnichenko2016-10-192-0/+23
|/
* Remove some useless code in luarocks.buildPeter Melnichenko2016-10-191-4/+1
| | | | Same as 6639022.
* Fix tests on Windows with Lua 5.3Peter Melnichenko2016-10-191-4/+4
| | | | | Don't install luafilesystem 1.6.1 on Windows with Lua 5.3, it fails.
* Fix installation of modules from files ending with "init.lua"Peter Melnichenko2016-10-191-1/+1
| | | | | | | | | | In builtin backend, when figuring out where to install a module and checking for special "init.lua" logic, trigger it only when the whole basename is "init.lua", not when it merely ends with it. Fixes incorrect installation when build.modules contains pairs like `["kainit"] = "kainit.lua"` - the module used to go to `kainit/kainit.lua` instead of just `kainit.lua`.
* Remove some useless code in build.builtinPeter Melnichenko2016-10-191-4/+1
| | | | | | | If `basename` is equal to `baseinfo` then, as `filename` is `baseinfo` plus ".lua", assignment `filename = basename..".lua"` has no effect and the if statement can be removed. Then `baseinfo` can be removed as unused.
* Run manif.update_manifest in repos.deploy_filesPeter Melnichenko2016-10-193-13/+26
| | | | | | | | Similarly to repos.delete_version, it's a good idea to update manifest immediately after altering what's deployed, even though in this case manifest was always updated by the caller. Also added more doc comments for repos functions.
* Regenerate manifest every time we delete a version.Hisham2016-10-186-14/+24
| | | | | | | This is a naive implementation of the solution suggested by @mpeterv for #268. I'm merging this since it does produce more correct behavior, at the cost of a performance regression. We need a function akin to update_manifest for removing packages from a manifest.
* Test case for issue #268Hisham2016-10-182-1/+15
|
* Merge branch 'master' of https://github.com/keplerproject/luarocksHisham2016-10-156-8/+16
|\
| * Merge pull request #629 from mpeterv/change-lua-detectionHisham Muhammad2016-10-143-4/+4
| |\ | | | | | | Relax Lua version detection to support Ravi
| | * Relax Lua version detection to support RaviPeter Melnichenko2016-10-143-4/+4
| |/ | | | | | | | | Ravi has "Ravi 5.3" as _VERSION. Don't use _VERSION:sub(5) to get Lua version, match " (5%.[123])$" instead.
| * Merge pull request #628 from mpeterv/fix-find-providersHisham Muhammad2016-10-121-3/+8
| |\ | | | | | | Fix manif.find_{current,next}_provider returning "untracked" incorrectly
| | * Fix manif.find_{current,next}_provider returning "untracked" incorrectlyPeter Melnichenko2016-10-121-3/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `find_providers` function used by `manif.find_current_provider` and `manif.find_next_provider` needs relative path from a directory an installed file is deployed in (bin dir, lua dir, or lib dir) to the file. It then uses that path as key in manifest, converting it to module name beforehand for lua files and lib files. It happened to leave a leading slash in this relative path for lua and lib files. `path.path_to_module` has a workaround stripping leading dots caused by leading slashes. However, if the file doesn't have `.lua` extension, slashes are not converted to dots and the workaround doesn't trigger. The issue results in files falsely considered "untracked" and backed-up when reinstalling a different version of a rock, see sailorproject/sailor#138. The fix is to use correct relative paths without leading slashes.
| * Merge pull request #626 from robooo/new-testsHisham Muhammad2016-10-112-1/+4
| |\ | | | | | | Fix of openssl location on TravisCI OSX build
| | * Fix of openssl location on TravisCI OSX buildroboo2016-10-102-2/+2
| | |
| | * Fix of openssl location on TravisCI OSX buildroboo2016-10-101-1/+1
| | |
| | * Fix of openssl location on TravisCI OSX buildroboo2016-10-101-0/+3
| |/
* / Add missing file in test repoHisham2016-10-151-1/+2
|/
* Fixup LUAROCKS_PREFIX when copying over site_config.lua.Hisham2016-10-061-1/+1
| | | | See #625.
* Install site_config.lua after Makefile calls luarocks.Hisham2016-10-061-3/+6
| | | | | | Otherwise, when luarocks removes a previous version it may end up deleting the site_config.lua file that was freshly installed. Closes #625.
* Merge branch 'master' of https://github.com/keplerproject/luarocksHisham2016-10-062-36/+99
|\
| * Merge pull request #624 from mpeterv/coroutineless-sortedpairsHisham Muhammad2016-10-062-36/+99
| |\ | | | | | | Don't use coroutines in util.sortedpairs
| | * Rewrite util.sortedpairs to avoid using coroutinesPeter Melnichenko2016-10-061-36/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sortedpairs is used in luarocks loader since @6dc745a. Openresty does not like coroutines being used from inside `require`, resulting in "attempt to yield across C-call boundary" error. New version of util.sortedpairs uses a prepared array of ordered keys instead of coroutines. Ref #620.
| | * Add tests for util.sortedpairsPeter Melnichenko2016-10-061-0/+56
| |/
* / Make the workaround for older LuaRocks versions more robust.Hisham2016-10-061-0/+24
|/
* Merge branch 'master' of https://github.com/keplerproject/luarocksHisham2016-10-051-1/+2
|\
| * Add Gitter badge, change Travis badge to svgHisham Muhammad2016-09-111-1/+2
| |
* | Simulate module() for older wrappers.Hisham2016-10-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older versions of LuaRocks (e.g. 2.1.0) install script wrappers that assume that `luarocks.loader` is available in the global namespace (this is from the module() era). This workaround detects this (because site_config.lua files written by these old versions use module(), and therefore create a `luarocks` global. To reproduce this issue, make a clean install of LuaRocks 2.1.0, then run `luarocks install luarocks`. Installation succeds, but running `luarocks` produces `attempt to index field 'loader' (a nil value)`. Bug reported by @tomasguisasola.
* | Remove old testing.batbranched-to-2.4.0Hisham2016-09-081-9/+0
|/
* Restore accidentally deleted line!Hisham2016-09-081-0/+1
|
* Fix test to match new behavior of `pack`.Hisham2016-09-081-2/+3
|
* Tests: luarocks_bool commands log their outputs on failure.Hisham2016-09-087-22/+38
|
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-28 23:55:43 +0000