aboutsummaryrefslogtreecommitdiff
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'luarocks-3' into new-cmd-dirHisham2016-10-294-86/+167
|\
| * Adjust changes by @mpeterv in #638 to new locations.Hisham2016-10-292-67/+126
| |
| * Merge branch 'master' into luarocks-3Hisham2016-10-292-19/+41
| |\
| | * Merge pull request #638 from mpeterv/remove-without-manifest-rebuildHisham Muhammad2016-10-292-64/+122
| | |\ | | | | | | | | Remove packages without manifest rebuild
| | | * Update manifest after removal without rebuildingPeter Melnichenko2016-10-282-9/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `manif.update_manifest` to `manif.add_to_manifest`. Add `manif.remove_from_manifest` that performs reverse action. Use it in `repos.delete_version` to avoid rebuilding manifest everytime a package is removed.
| | | * manif.update_manifest: do not update manifest if rebuiltPeter Melnichenko2016-10-281-8/+4
| | | |
| | | * manif.update_manifest: load manifest as localPeter Melnichenko2016-10-281-1/+1
| | | |
| | | * Rename a variable in manif.update_manifestPeter Melnichenko2016-10-281-6/+6
| | | | | | | | | | | | | | | | | | | | `repo` sometimes means root dir and sometimes means rock dir. At least do not reuse the same variable for both.
| | | * Refactor store_results in luarocks.manif (2)Peter Melnichenko2016-10-281-21/+8
| | | | | | | | | | | | | | | | | | | | Do not accept a hook function to call after storing results. Simply call it on the outside after calling store_results.
| | | * Refactor store_results in luarocks.manifPeter Melnichenko2016-10-281-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | Instead of passing a function and its arguments to a helper function for it to call it, make a copy of result, and return it, call the function on the outer level and pass the result to helper.
| | * | Improve performance of manif_core.get_versionsPeter Melnichenko2016-10-291-11/+10
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | To get all installed versions of a package using deps_mode, instead of deeply merging all manifests of corresponding trees, shallowly merge only tables related to that package. This affects speed of manifest manipulation and dependency resolution. Minimal performance testing suggests 3x-4x speed-up on reinstallation of a package using `luarocks make`.
| | * Fix absolute path detection on WindowsPeter Melnichenko2016-10-281-8/+31
| | | | | | | | | | | | | | | | | | Do not use "^[%.a-zA-Z]?:?[\\/]" as a pattern when checking if a path is absolute on Windows. Check if there is a directory separator after an optional drive letter instead.
* | | Move admin commands to luarocks.admin.cmd.*; fix references to modules.Hisham2016-10-2910-35/+36
| | |
* | | 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-283-32/+18
|\|
| * 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
| |
* | Fix merge.Hisham2016-10-281-1/+0
| |
* | Merge branch 'master' into luarocks-3Hisham2016-10-2714-43/+72
|\|
| * 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.
| * Merge branch 'master' of https://github.com/keplerproject/luarocksHisham2016-10-2613-15/+11
| |\
| | * 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-202-14/+22
|\|
| * Show traceback for errors in scheduled functionsPeter Melnichenko2016-10-201-9/+15
| |
| * Slightly improve error messages in deploy/removePeter Melnichenko2016-10-201-5/+7
| |
* | Make sure brand-new rockspec table has the utility function.Hisham2016-10-201-0/+3
| |
* | Merge branch 'master' into luarocks-3Hisham2016-10-203-100/+164
|\|
| * 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.
| * 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").
| * Remove some useless code in luarocks.buildPeter Melnichenko2016-10-191-4/+1
| | | | | | | | Same as 6639022.
* | Add format-check function in rockspec table.Hisham2016-10-194-8/+8
| | | | | | | | This avoids sprinkling the luarocks.deps dependency everywhere.
* | Merge branch 'master' into luarocks-3Hisham2016-10-194-18/+29
|\|
| * 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
| |
* | Merge branch 'master' into luarocks-3Hisham2016-10-185-13/+24
|\|
| * 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.
* | Merge branch 'master' into luarocks-3Hisham2016-10-152-4/+9
|\|
| * Relax Lua version detection to support RaviPeter Melnichenko2016-10-141-1/+1
| | | | | | | | | | Ravi has "Ravi 5.3" as _VERSION. Don't use _VERSION:sub(5) to get Lua version, match " (5%.[123])$" instead.
| * 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.
* | Oops, my dev environment leaked in a commit, sorry.Hisham2016-10-152-4/+2
| |