aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Keep only command driver functions in luarocks.cmdHisham2016-10-285-1086/+36
|
* Keep only functions shared among commandsHisham2016-10-285-312/+9
|
* Move files that will live in base dir back.Hisham2016-10-2819-1896/+0
|
* Duplicate files to preserve git-blameHisham2016-10-2838-0/+3286
|
* Merge branch 'master' into luarocks-3Hisham2016-10-285-33/+40
|\
| * Merge branch 'master' of https://github.com/keplerproject/luarocksHisham2016-10-284-32/+39
| |\
| | * Refactor windows argument quoting functionsPeter Melnichenko2016-10-281-21/+9
| | | | | | | | | | | | Use string replacements instead of functions in calls to gsub.
| | * Move Unix-specific fs.Q implementation into luarocks.fs.unixPeter Melnichenko2016-10-282-11/+9
| | |
| | * Add a few tests for fs.QPeter Melnichenko2016-10-281-0/+21
| | |
| * | 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)
* | Fix merge.Hisham2016-10-281-1/+0
| |
* | Merge branch 'master' into luarocks-3Hisham2016-10-2717-82/+136
|\|
| * 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
| |/
* | Check rockspec_version before running type check.Hisham2016-10-251-5/+6
| |
* | Merge branch 'master' into luarocks-3Hisham2016-10-203-14/+34
|\|
| * 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
| |
* | Make sure brand-new rockspec table has the utility function.Hisham2016-10-201-0/+3
| |
* | Merge branch 'master' into luarocks-3Hisham2016-10-205-100/+189
|\|
| * 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.
* | Oops, messed with the module location.Hisham2016-10-191-2/+2
| |
* | Merge in Windows-compatible quoting.Hisham2016-10-191-2/+2
| |
* | Add format-check function in rockspec table.Hisham2016-10-194-8/+8
| | | | | | | | This avoids sprinkling the luarocks.deps dependency everywhere.
* | Add some useful rules to .gitignoreHisham2016-10-191-0/+10
| |
* | Merge branch 'master' into luarocks-3Hisham2016-10-195-22/+33
|\|
| * 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.
* | Refactor error message and add extra checks.Hisham2016-10-194-17/+16
| |
* | Avoid circular dependency.Hisham2016-10-191-1/+1
| |
* | Use luarocks-3 branch on AppveyorHisham2016-10-191-1/+1
| |
* | Merge branch 'master' into luarocks-3Hisham2016-10-187-14/+39
|\|
| * 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
| |