aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove outdated file from list, and automate check for the futureHisham2016-11-142-1/+16
|
* Move get_versions from luarocks.core.manif to luarocks.manif.Hisham2016-11-146-77/+76
| | | | | All functions that were in core only for get_versions are moved out as well. Made possible by PR #654.
* Minor luacheck cleanupsHisham2016-11-141-3/+3
|
* Merge pull request #654 from mpeterv/split-depsHisham Muhammad2016-11-1417-195/+199
|\ | | | | Split out luarocks.vers from luarocks.deps
| * Do not require core modules from outside corePeter Melnichenko2016-11-131-1/+1
| |
| * Split pure version/deps operations into luarocks.vers modulePeter Melnichenko2016-11-1317-194/+198
|/ | | | | | | luarocks.deps module used to contain version and dependency parsing functions as well as some high-level dependency handling: matching and resolving them. A lot of modules only need the parsing half. Split it into its own module, luarocks.vers.
* Merge pull request #652 from mpeterv/fix-whichHisham Muhammad2016-11-133-27/+42
|\ | | | | `luarocks show `improvements: fix module paths, add command listing
| * List commands in `luarocks show`Peter Melnichenko2016-11-121-4/+16
| |
| * Fix module paths `luarocks show` displays for "asset" filesPeter Melnichenko2016-11-123-25/+28
|/ | | | | | | | Remove path.which that produced incorrect results for files with no .lua/.so/.dll extension, reimplement similar functionality in luarocks.repos (with support for commands as well) and use that instead. Ref #424.
* luarocks.repos: refactor repos.package_{modules,commands}Peter Melnichenko2016-11-051-25/+29
|
* luarocks.repos: refactor recurse_rock_manifest_treePeter Melnichenko2016-11-051-18/+16
|
* Merge branch 'master' into luarocks-3Peter Melnichenko2016-11-0411-191/+385
|\
| * Merge pull request #644 from mpeterv/fix-conflict-resolveHisham Muhammad2016-11-039-189/+328
| |\ | | | | | | Fix conflict resolution on deploy/remove w.r.t. C/Lua modules with same name
| | * Fix and refactor conflict resolution on deploy/deletePeter Melnichenko2016-11-012-183/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor repos.deploy_files and repos.delete_version to make relationships between properties of deployed files clearer and to avoid converting back and forth between related properties. Location of each deployable file in its rock manifest is pair deploy_type - the first subtree name ("bin", "lib", or "lua") and file_path - remaining path from the subtree to the file. These components determine where each file is physically located. Conflicts are considered based on two other properties: type and name of an item a file provides. Type can be "command" or "module". For items deployed using non-versioned names pairs (type, name) should be unique. Conversion from (deploy_type, file_path) to (item_type, item_name) is obvious, using path.path_to_module() for modules. Reversing this conversion is necessary for moving files between versioned and non-versioned locations on conflicts, and also for path.which function used in luarocks.show. However, rock tree manifest only allows to get file_path, which is not enough for modules - deploy_type can be both "lua" and "lib". Currently path.which infers deploy_type based on extension, falling back to "lib" if it's unknown, causing luarocks.show to display wrong paths (#424). This commit does not address that but adds relevant funcionality. Currently conflict resolution assumes that both files in conflict have same deploy_type and errors on conflict between a C module and a Lua module. This commit fixes that, inferring deploy_type for files with unknown extension using rock manifest.
| | * Add a test for conflict resolution with mixed deploy typesPeter Melnichenko2016-11-017-6/+123
| | |
| * | Use ("%q"):format() for quoting in persistPeter Melnichenko2016-11-021-1/+1
| | |
| * | Fix persist for multiline strings ending with closing bracket prefixPeter Melnichenko2016-11-021-1/+2
| | |
| * | Add a few tests for luarocks.persistPeter Melnichenko2016-11-021-0/+55
| |/ | | | | | | One fails.
| * Correct comment to match filename.Hisham2016-11-011-1/+1
| |
| * Use optional lpeg feature when available.Hisham2016-11-011-0/+1
| |
| * Remove dead codeHisham2016-11-011-3/+0
| |
* | Correct comment to match filename.Hisham2016-11-011-1/+1
| |
* | Use optional lpeg feature when available.Hisham2016-11-011-0/+1
| |
* | Remove dead codeHisham2016-11-011-3/+0
| |
* | Deploy new filesHisham2016-10-311-13/+17
| |
* | Fix merge of rocks_provided [2].Hisham2016-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | This is now a parameter, because depending on the rockspec version the set of default rocks_provided for a rockspec may change. This is to maintain compatibility with rocks provided by LuaRocks versions in rockspec format 1.0. When checking dependencies for a rockspec, we ensure we respect that to keep backward compatibility. When we check dependencies for the manifest as a whole, we can use the larger set of rocks_provided known by the current LuaRocks version.
* | Fix merge of rocks_provided.Hisham2016-10-311-5/+7
| | | | | | | | | | | | | | | | | | | | This is now a parameter, because depending on the rockspec version the set of default rocks_provided for a rockspec may change. This is to maintain compatibility with rocks provided by LuaRocks versions in rockspec format 1.0. When checking dependencies for a rockspec, we ensure we respect that to keep backward compatibility. When we check dependencies for the manifest as a whole, we can use the larger set of rocks_provided known by the current LuaRocks version.
* | Merge branch 'new-cmd-dir' into luarocks-3Hisham2016-10-3033-346/+389
|\ \
| * \ Merge branch 'new-cmd-dir'Hisham2016-10-3078-2084/+2279
| |\ \ | | |/ | |/|
| | * Fix references to writer.make_manifestHisham2016-10-291-4/+4
| | |
| | * Fix names of modules that no longer require _cmdHisham2016-10-292-0/+0
| | |
| | * Merge branch 'luarocks-3' into new-cmd-dirHisham2016-10-295-86/+180
| | |\
| | * | Move admin commands to luarocks.admin.cmd.*; fix references to modules.Hisham2016-10-2910-35/+36
| | | |
| | * | This doesn't produce an error, only a warning.Hisham2016-10-291-1/+2
| | | |
| | * | 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-306-51/+86
|\| | |
| * | | Merge pull request #641 from mpeterv/missing-deps-check-changes-slurpHisham Muhammad2016-10-306-52/+87
| |\ \ \ | | | | | | | | | | Get rid of repeated missing deps checks
| | * | | Get rid of repeated missing deps checksPeter Melnichenko2016-10-306-52/+87
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not report missing dependencies on manifest update, which is now done more often. Instead do it at the end of commands that may alter manifest (install, build, make, remove - excluding purge). For reporting reuse format used when showing missing deps to be installed. Do not report missing indirect dependencies, only direct ones.
* | | | "soft-revert" support for building static libs.Hisham2016-10-292-0/+8
| | | | | | | | | | | | | | | | | | | | This is causing a conflict in the manifest file. Looks like we'll need to extend the manifest format anyway.
* | | | Fix references to writer.make_manifestHisham2016-10-291-4/+4
| |_|/ |/| |
* | | Adjust changes by @mpeterv in #638 to new locations.Hisham2016-10-292-67/+126
| | |
* | | Merge branch 'master' into luarocks-3Hisham2016-10-293-19/+54
|\| | | |/ |/|
| * 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.
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-29 03:26:45 +0000