Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Merge branch 'fix_windows_bootstrap' of https://github.com/ingwinlu/rebar3 ↵ | Tristan Sloughter | 2015-05-07 | 10 | -59/+247 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | into ingwinlu-fix_windows_bootstrap | |||||
| | * | | | | fix rebar_git_resource | derwinlu | 2015-05-07 | 2 | -15/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix shell commands relying on non windows shell commands * fix shell commands using wrong quotes * implement native wc -l | |||||
| | * | | | | fix bootstrap on windows, fallback to copy if symlinking fails | derwinlu | 2015-05-07 | 1 | -1/+95 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #380 from waisbrot/shell-config | Tristan Sloughter | 2015-05-07 | 1 | -1/+61 | |
|\ \ \ \ \ | | | | | | | | | | | | | try to read sys.config when running `rebar shell` | |||||
| * | | | | | try to read a config file when running `rebar shell` | Nathaniel Waisbrot | 2015-05-07 | 1 | -1/+61 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a `--config` flag to the shell command to specify a config file. If the flag is not specified, attempts to read the sys_config defined for relx. | |||||
* | | | | | | Merge pull request #394 from umbec/master | Fred Hebert | 2015-05-06 | 2 | -4/+17 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Manage syntax error in app.src files. | |||||
| * | | | | | Manage syntax error in app.src files. | Umberto Corponi | 2015-05-06 | 2 | -4/+17 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | - Solve "Uncaught error" failure in case of syntax error in app.src file. - Print helpful information on the location of the syntax error. | |||||
* | | | | | Merge pull request #392 from tsloughter/mustache2 | Fred Hebert | 2015-05-05 | 2 | -225/+287 | |
|\ \ \ \ \ | | | | | | | | | | | | | switch mustache imlementation to https://github.com/soranoba/mustache | |||||
* \ \ \ \ \ | Merge pull request #390 from tsloughter/mustache_bug | Fred Hebert | 2015-05-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix }}} bug in mustache | |||||
* | | | | | | | Bump to alpha-5 | Fred Hebert | 2015-05-05 | 2 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changelog since alpha-4: - rebar3 now bootstraps itself - app compile fixes on app info contents and config inheritance - dropping ErlyDTL and going to Mustache for smaller executable sizes and faster load time on small CPUs - dropping `erlydtl compile` command, ErlyDTL task moved to a plugin - default dependencies are always fetched in the right place and don't need to be copied across profile runs - escriptize fixes - `unlock` command added - resolving/avoiding clashes when a rebar3 dep and an application dependency conflict together - profile deduplication (`rebar3 as test,test,prod,test eunit` returns the profile/directories for `prod+test`) - `upgrade` command bugfixes to recognize promotion of transient deps to top-level deps - support template when rebar3 is run as an embedded library - some optimizations - parse transform support is better in erl_opts - fixes to package handling - fixes to `rebar3 deps` | |||||
* | | | | | | | Merge pull request #388 from ferd/fix-semver-stuff | Tristan Sloughter | 2015-05-04 | 5 | -51/+73 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use resource handlers to deal with deps/semver | |||||
| * | | | | | | | Use resource handlers to deal with deps/semver | Fred Hebert | 2015-05-05 | 3 | -36/+48 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #387 from tsloughter/missing_pkg | Fred Hebert | 2015-05-04 | 4 | -14/+18 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | handle missing package in registry by skipping | |||||
| | | | | | * | | | update mustache for r15 support | Tristan Sloughter | 2015-05-06 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | | | | | * | | | use mustache as a dep | Tristan Sloughter | 2015-05-06 | 4 | -298/+10 | |
| | | | | |/ / / | | | | |/| | | | ||||||
| | | | * | | | | fix integer to binary conversion for pre17 releases | Tristan Sloughter | 2015-05-05 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | | | * | | | | fix types for pre-17 releases | Tristan Sloughter | 2015-05-05 | 1 | -0/+4 | |
| | | | | | | | | ||||||
| | | | * | | | | add license | Tristan Sloughter | 2015-05-05 | 1 | -2/+14 | |
| | | | | | | | | ||||||
| | | | * | | | | switch mustache imlementation to https://github.com/soranoba/mustache | Tristan Sloughter | 2015-05-05 | 2 | -231/+277 | |
| | | |/ / / / | ||||||
| | | * | | | | fix }}} bug in mustache | Tristan Sloughter | 2015-05-05 | 1 | -1/+1 | |
| | |/ / / / | ||||||
| | * | | | | set resources to empty list if non in app env | Tristan Sloughter | 2015-05-04 | 1 | -1/+6 | |
| | | | | | | ||||||
| | * | | | | set resources of state in state initialize functions | Tristan Sloughter | 2015-05-04 | 2 | -15/+20 | |
| |/ / / / | ||||||
| * | | | | handle missing package in registry by skipping | Tristan Sloughter | 2015-05-04 | 4 | -14/+18 | |
|/ / / / | ||||||
* | | | | Merge pull request #384 from ferd/rework-deps-provider | Tristan Sloughter | 2015-05-04 | 1 | -48/+45 | |
|\ \ \ \ | | | | | | | | | | | Fix dupes in deps provider, support atom pkgs | |||||
| * | | | | Fix dupes in deps provider, support atom pkgs | Fred Hebert | 2015-05-04 | 1 | -48/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever files were being locked *and* provided in rebar.config duplicates could be printed. This is taken care of. Also whenever atom packages were being used, they would cause the merge step to fail. The new format does proper name-based deduplication of resources, giving priority to locks to work. ModificatioN/needs-update support is still in. This may also act as a fix for #341, if automation isn't required too much. | |||||
* | | | | | Merge pull request #383 from ferd/kovyl2404-app-discover-profile-duplication | Fred Hebert | 2015-05-04 | 3 | -9/+171 | |
|\ \ \ \ \ | | | | | | | | | | | | | Kovyl2404 app discover profile duplication | |||||
| * | | | | | Adding directory path test for deduplication | Fred Hebert | 2015-05-04 | 1 | -0/+18 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'app-discover-profile-duplication' of ↵ | Fred Hebert | 2015-05-04 | 3 | -9/+153 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | https://github.com/kovyl2404/rebar3 into kovyl2404-app-discover-profile-duplication | |||||
| | * | | | | Merge branch 'master' into app-discover-profile-duplication | Viacheslav V. Kovalev | 2015-05-01 | 49 | -370/+1022 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/rebar_profiles_SUITE.erl | |||||
| | * | | | | | Revert accidentially changed formatting | Viacheslav V. Kovalev | 2015-04-22 | 3 | -4/+4 | |
| | | | | | | | ||||||
| | * | | | | | Merge remote-tracking branch 'my/app-discover-profile-duplication' into ↵ | Viacheslav V. Kovalev | 2015-04-22 | 3 | -30/+8 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | app-discover-profile-duplication | |||||
| | | * | | | | | Get rid of rebar_utils:tup_umerge/2 patching | Viacheslav Kovalev | 2015-04-22 | 3 | -30/+8 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge branch 'app-discover-profile-duplication' of ↵ | Viacheslav V. Kovalev | 2015-04-22 | 4 | -5/+96 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/kovyl2404/rebar3 into app-discover-profile-duplication Conflicts: test/rebar_profiles_SUITE.erl | |||||
| | | * | | | | | Implement opts umerge deduplication | Viacheslav Kovalev | 2015-04-22 | 4 | -24/+69 | |
| | | | | | | | | ||||||
| | | * | | | | | Implement some test on profiles deduplication | Viacheslav V. Kovalev | 2015-04-22 | 2 | -2/+113 | |
| | | | | | | | | ||||||
| | * | | | | | | Implement some test on profiles deduplication | Viacheslav V. Kovalev | 2015-04-21 | 1 | -0/+65 | |
| | |/ / / / / | ||||||
| | * | | | | | Correctly deduplicate profiles when applying | Viacheslav V. Kovalev | 2015-04-21 | 2 | -12/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/rebar_state.erl | |||||
| | * | | | | | Do not duplicate profile when applying. | Viacheslav V. Kovalev | 2015-04-19 | 1 | -1/+5 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #386 from tsloughter/relx_templates | Fred Hebert | 2015-05-04 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | include relx templates in escript | |||||
| * | | | | | | include relx templates in escript | Tristan Sloughter | 2015-05-04 | 1 | -1/+3 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #381 from tsloughter/upgrade_branch | Fred Hebert | 2015-05-03 | 4 | -11/+9 | |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | on upgrade of git branch check against remote | |||||
| * | | | | | | only fetch branch needed, remove rebar_vsn_plugins from erlware_commons | Tristan Sloughter | 2015-05-03 | 3 | -7/+3 | |
| | | | | | | | ||||||
| * | | | | | | on upgrade of git branch check against remote | Tristan Sloughter | 2015-05-03 | 2 | -5/+7 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #382 from tsloughter/upgrade_relx | Fred Hebert | 2015-05-03 | 1 | -2/+2 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | upgrade relx dep to latest mustache branch commit | |||||
| * | | | | | | upgrade relx dep to latest mustache branch commit | Tristan Sloughter | 2015-05-03 | 1 | -2/+2 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #379 from tsloughter/rm_erlydtl | Fred Hebert | 2015-05-01 | 28 | -475/+295 | |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | Remove erlydtl and replace with mustache | |||||
| * | | | | | remove use of erlydtl in rebar | Tristan Sloughter | 2015-04-29 | 28 | -475/+295 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #375 from tsloughter/kejv-support-parse-transforms | Fred Hebert | 2015-04-30 | 2 | -8/+52 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | enable parse transformations in rebar config | |||||
| * | | | | enable parse transformations in rebar config | Tristan Sloughter | 2015-04-26 | 4 | -11/+55 | |
| |/ / / | ||||||
* | | | | Merge pull request #378 from tsloughter/loading_registry | Fred Hebert | 2015-04-29 | 3 | -16/+25 | |
|\ \ \ \ | |/ / / |/| | | | don't load package registry unless there are pkg deps to solve |