Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Support "luajit" as a provided dependency in rockspec format 3.0 | Hisham Muhammad | 2015-10-19 | 3 | -11/+22 |
| | |||||
* | Merge branch 'master' into luarocks-3 | Hisham Muhammad | 2015-10-03 | 1 | -2/+2 |
|\ | |||||
| * | Revert accidental commit. | Hisham Muhammad | 2015-09-30 | 2 | -4/+2 |
| | | |||||
| * | Use env for setting MACOSX_DEPLOYMENT_TARGET. | Hisham Muhammad | 2015-09-30 | 3 | -4/+6 |
| | | | | | | | | See #422. | ||||
* | | Merge branch 'master' into luarocks-3 | Hisham Muhammad | 2015-09-22 | 2 | -0/+6 |
|\| | |||||
| * | add set_time function for tar module without lfs | Hisham Muhammad | 2015-09-22 | 2 | -0/+6 |
| | | |||||
| * | Merge pull request #426 from usstwxy/patch-1 | Hisham Muhammad | 2015-09-22 | 1 | -3/+4 |
| |\ | | | | | | | Update tar.lua | ||||
| | * | Update tar.lua | WXY | 2015-09-21 | 1 | -3/+4 |
| | | | | | | | | | fix a bug occured when unrar some .tar files using this module | ||||
| * | | missing to close file descriptor | TsT | 2015-09-21 | 1 | -0/+1 |
| | | | |||||
* | | | Fix merge conflict. | Hisham Muhammad | 2015-09-22 | 1 | -5/+9 |
| | | | |||||
* | | | Support SCM repos with names ending with ".lua". | Hisham Muhammad | 2015-09-22 | 1 | -1/+4 |
| | | | | | | | | | | | | Fixes #425. | ||||
* | | | Merge branch 'master' into luarocks-3 | Hisham Muhammad | 2015-09-21 | 4 | -100/+141 |
|\| | | |||||
| * | | We use lzlib, not lua-zlib | Hisham Muhammad | 2015-09-21 | 1 | -1/+1 |
| |/ | |||||
| * | Fix git cloning command when using git+http protocol | mpeterv | 2015-07-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | git+http and git+https pass '--' instead of '--depth=1' option. As '--branch' option was passed after depth, it caused the former to be interpreted as an extra argument by git. Pass '--branch' first instead. | ||||
| * | Merge branch 'master' of github.com:keplerproject/luarocks into pref_versioned | Thijs Schreijer | 2015-07-01 | 1 | -1/+6 |
| |\ | | | | | | | | | | | | | Conflicts: src/luarocks/cfg.lua | ||||
| | * | Merge pull request #404 from ignacio/url_to_base_dir | Hisham Muhammad | 2015-07-01 | 1 | -1/+6 |
| | |\ | | | | | | | | | Strip only known extensions | ||||
| | | * | Strip known extensions | Ignacio Burgueño | 2015-06-30 | 1 | -1/+6 |
| | | | | |||||
| | * | | Merge pull request #398 from Tieske/refactor_cfg | Hisham Muhammad | 2015-07-01 | 1 | -97/+133 |
| | |\ \ | | | |/ | | |/| | Refactor cfg config file loading | ||||
| | | * | added error message in case of a bad platform value | Thijs Schreijer | 2015-06-26 | 1 | -0/+6 |
| | | | | |||||
| | | * | added correct order for platform overrides | Thijs Schreijer | 2015-06-26 | 1 | -1/+27 |
| | | | | |||||
| | | * | integrated cfg.platform and cfg.platforms | Thijs Schreijer | 2015-06-25 | 1 | -47/+47 |
| | | | | |||||
| | | * | refactored the loading of the config files in a more structural manner, ↵ | Thijs Schreijer | 2015-06-25 | 1 | -39/+45 |
| | | | | | | | | | | | | | | | | removing duplicate code and error handling. | ||||
| | | * | `detected` was only retained in `cfg` through multiple copies, removed by ↵ | Thijs Schreijer | 2015-06-25 | 1 | -47/+45 |
| | | | | | | | | | | | | | | | | directly operating on `cfg.platform` | ||||
| * | | | prefer versioned config files and directories over non-versioned ones | Thijs Schreijer | 2015-06-30 | 1 | -97/+133 |
| |/ / | |||||
* | | | Merge branch 'master' into luarocks-3 | Hisham Muhammad | 2015-06-29 | 4 | -4/+19 |
|\| | | |||||
| * | | Make wording of help summaries consistent. | Hisham Muhammad | 2015-06-29 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | As noted by @mpeterv in https://github.com/keplerproject/luarocks/pull/400#issuecomment-116307146 Changed them so they all use imperative verb form. | ||||
| * | | Merge pull request #400 from ignacio/400-config-help | Hisham Muhammad | 2015-06-29 | 1 | -1/+16 |
| |\ \ | | | | | | | | | 'config' command does not have a help message | ||||
| | * | | Changes wording as suggested | Ignacio Burgueño | 2015-06-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | Adds help to 'luarocks config' command | Ignacio Burgueño | 2015-06-26 | 1 | -1/+16 |
| | | | | |||||
* | | | | Merge branch 'master' into luarocks-3 | Hisham Muhammad | 2015-06-29 | 4 | -41/+60 |
|\| | | | |||||
| * | | | Add '--rockspec-format' option for write_rockspec command | mpeterv | 2015-06-26 | 2 | -12/+15 |
| |/ / | | | | | | | | | | | | | '--rockspec-format' option allows selecting rockspec format version when writing a rockspec. | ||||
| * | | Don't restrict the generator override to mingw | Ignacio Burgueño | 2015-06-25 | 1 | -1/+1 |
| | | | |||||
| * | | Use new key target_cpu | Ignacio Burgueño | 2015-06-25 | 1 | -1/+1 |
| | | | |||||
| * | | CMake needs a hint to use 64 bit target with msvc. | Ignacio Burgue o | 2015-06-25 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | Only when using Windows 64 bits and the msvc compiler. CMake uses the x86 generator by default. We need to tell it explicitly that we wan't to use the x64 generator. refs #382 | ||||
| * | | cmake backend: Generate 64 bits build when appropiate | Ignacio Burgueño | 2015-06-25 | 1 | -1/+5 |
| |/ | | | | | | | | | | | | | Adds -DCMAKE_GENERATOR_PLATFORM=x64 when needed. It seems that CMake does not do that by default (although I might be wrong on that). fixes #382 | ||||
| * | do not reuse environments | Thijs Schreijer | 2015-06-25 | 1 | -26/+31 |
| | | |||||
| * | fix travis-ci error | Thijs Schreijer | 2015-06-25 | 1 | -1/+3 |
| | | |||||
| * | removed accidental reintroduced line | Thijs Schreijer | 2015-06-25 | 1 | -1/+0 |
| | | |||||
| * | config.lua is not being integrated, bug introduced in #385 | Thijs Schreijer | 2015-06-25 | 1 | -7/+13 |
| | | |||||
* | | Bump format to 3.0 in the luarocks-3 branch. | Hisham Muhammad | 2015-06-29 | 1 | -1/+1 |
| | | |||||
* | | Check that rockspec format is at least 3.0 before fetching submodules | mpeterv | 2015-06-26 | 2 | -7/+19 |
| | | | | | | | | For utility, add deps.format_is_at_least(rockspec, version) function. | ||||
* | | Add support for git submodules | mpeterv | 2015-06-25 | 1 | -8/+46 |
|/ | | | | | | | | When fetching rock sources using git, run `git submodule update --init --recursive` after cloning. When using git >= 1.8.4, also pass `--depth=1` to fetch only the last commit of each submodule. | ||||
* | Don't shadow filename variable: fixes error message. | Hisham Muhammad | 2015-06-24 | 1 | -2/+2 |
| | |||||
* | Merge pull request #393 from Tieske/target_stuff | Hisham Muhammad | 2015-06-24 | 1 | -11/+11 |
|\ | | | | | add target cpu info to configuration | ||||
| * | oops... remove debug stuff | Thijs Schreijer | 2015-06-24 | 1 | -9/+0 |
| | | |||||
| * | - site_config remains local, not exposed | Thijs Schreijer | 2015-06-24 | 1 | -11/+20 |
| | | | | | | | | - added field 'target_cpu' to `cfg` and config file environments | ||||
* | | Merge pull request #394 from ignacio/build_mandatory | Hisham Muhammad | 2015-06-24 | 1 | -1/+2 |
|\ \ | | | | | | | Make 'build' field in rockspecs mandatory. | ||||
| * | | Make 'build' field in rockspecs mandatory. | Ignacio Burgueño | 2015-06-24 | 1 | -1/+2 |
| |/ | | | | | | | | | | | | | | | | | Rockspecs must have a 'build' field. If by any chance, it is not needed (see #379), add this: ````lua build = { type = "none" } ```` | ||||
* | | Merge branch 'master' of https://github.com/keplerproject/luarocks | Hisham Muhammad | 2015-06-24 | 7 | -14/+65 |
|\| | |||||
| * | Merge pull request #385 from Tieske/master | Thijs Schreijer | 2015-06-20 | 1 | -9/+17 |
| |\ | | | | | | | Read os variables from config files |