aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #410 from mpeterv/fix-git-http-branch-commandIgnacio Burgueño2015-07-101-1/+1
|\
| * Fix git cloning command when using git+http protocolmpeterv2015-07-101-1/+1
|/
* Merge pull request #407 from Tieske/pref_versionedThijs Schreijer2015-07-102-17/+28
|\
| * added extra include files search paths, see https://github.com/keplerproject/...Thijs Schreijer2015-07-091-6/+15
| * also version the `site_config` fileThijs Schreijer2015-07-021-7/+8
| * Merge branch 'master' of github.com:keplerproject/luarocks into pref_versionedThijs Schreijer2015-07-014-2/+35
| |\ | |/ |/|
* | Merge pull request #404 from ignacio/url_to_base_dirHisham Muhammad2015-07-013-1/+31
|\ \
| * | Strip known extensionsIgnacio Burgueño2015-06-303-1/+31
* | | Merge pull request #405 from ignacio/pe_parser_04Ignacio Burgueño2015-07-011-1/+4
|\ \ \
| * | | Updates pe-parser to v0.4Ignacio Burgueño2015-06-301-1/+4
| |/ /
* | | Merge pull request #398 from Tieske/refactor_cfgHisham Muhammad2015-07-011-97/+133
|\ \ \ | |/ / |/| |
| * | added error message in case of a bad platform valueThijs Schreijer2015-06-261-0/+6
| * | added correct order for platform overridesThijs Schreijer2015-06-261-1/+27
| * | integrated cfg.platform and cfg.platformsThijs Schreijer2015-06-251-47/+47
| * | Merge branch 'master' of https://github.com/keplerproject/luarocks into refac...Thijs Schreijer2015-06-250-0/+0
| |\ \
| * | | refactored the loading of the config files in a more structural manner, remov...Thijs Schreijer2015-06-251-39/+45
| * | | `detected` was only retained in `cfg` through multiple copies, removed by dir...Thijs Schreijer2015-06-251-47/+45
| | | * update displayed data to match versionThijs Schreijer2015-07-011-3/+4
| | | * prefer versioned config files and directories over non-versioned onesThijs Schreijer2015-06-302-101/+137
| |_|/ |/| |
* | | Make wording of help summaries consistent.Hisham Muhammad2015-06-293-3/+3
* | | Merge pull request #400 from ignacio/400-config-helpHisham Muhammad2015-06-293-2/+49
|\ \ \
| * | | Changes wording as suggestedIgnacio Burgueño2015-06-291-1/+1
| * | | Adds missing testsIgnacio Burgueño2015-06-262-1/+33
| * | | Adds help to 'luarocks config' commandIgnacio Burgueño2015-06-261-1/+16
* | | | Merge pull request #399 from mpeterv/write-rockspec-formatHisham Muhammad2015-06-294-12/+17
|\ \ \ \ | |/ / / |/| | |
| * | | Add a test for '--rockspec-format' optionmpeterv2015-06-262-0/+2
| * | | Add '--rockspec-format' option for write_rockspec commandmpeterv2015-06-262-12/+15
|/ / /
* | | Update appveyor test matrix to use Lua 5.3.1Ignacio Burgueño2015-06-251-1/+1
* | | Merge pull request #383 from ignacio/cmake_64Ignacio Burgueño2015-06-251-2/+6
|\ \ \ | |_|/ |/| |
| * | Don't restrict the generator override to mingwIgnacio Burgueño2015-06-251-1/+1
| * | Use new key target_cpuIgnacio Burgueño2015-06-251-1/+1
| * | CMake needs a hint to use 64 bit target with msvc.Ignacio Burgue o2015-06-251-7/+7
| * | cmake backend: Generate 64 bits build when appropiateIgnacio Burgueño2015-06-251-1/+5
|/ /
* | Merge pull request #397 from Tieske/fix_configThijs Schreijer2015-06-251-27/+39
|\|
| * do not reuse environmentsThijs Schreijer2015-06-251-26/+31
| * fix travis-ci errorThijs Schreijer2015-06-251-1/+3
| * removed accidental reintroduced lineThijs Schreijer2015-06-251-1/+0
| * config.lua is not being integrated, bug introduced in #385Thijs Schreijer2015-06-251-7/+13
|/
* Don't shadow filename variable: fixes error message.Hisham Muhammad2015-06-241-2/+2
* Merge pull request #393 from Tieske/target_stuffHisham Muhammad2015-06-241-11/+11
|\
| * oops... remove debug stuffThijs Schreijer2015-06-241-9/+0
| * - site_config remains local, not exposedThijs Schreijer2015-06-241-11/+20
* | Merge pull request #394 from ignacio/build_mandatoryHisham Muhammad2015-06-244-1/+16
|\ \
| * | Make 'build' field in rockspecs mandatory.Ignacio Burgueño2015-06-244-1/+16
| |/
* | Update build matrix to use latest versionsIgnacio Burgueño2015-06-241-2/+2
* | Merge branch 'master' of https://github.com/keplerproject/luarocksHisham Muhammad2015-06-2410-30/+81
|\|
| * Merge pull request #392 from Alloyed/patch-1Thijs Schreijer2015-06-201-9/+9
| |\
| | * fix typoKyle McLamb2015-06-201-9/+9
| |/
| * Merge pull request #385 from Tieske/masterThijs Schreijer2015-06-201-9/+17
| |\
| | * fix: use same environment table for the system config file as well.Thijs Schreijer2015-06-181-23/+16