summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kellymclaughlin-dev-mode-release-tests' into ↵Fred Hebert2015-03-232-4/+53
|\ | | | | | | fancy-profile-merge-fun
| * Test cases to exercise the dev_mode release optionKelly McLaughlin2015-03-232-4/+53
| | | | | | | | | | | | | | | | | | | | Add one test case to verify the dev_mode option for a release and another to verify overriding the dev_mode option in a profile for a release. Verification of proper dev_mode functioning is done in the rebar_test_utils:check_results/2 function by checking if all the directories in the release lib dir are symlinks or not and comparing that result to the dev_mode expectation passed as input to the check_results function.
* | Reverse relx args order for configFred Hebert2015-03-221-1/+1
| | | | | | | | | | | | With the new priority order, and knowing Relx processes things in reverse already (possibly building a dict internally), we should flip our options around to keep them correct.
* | Preserve profile order on mergeable tuple/optsFred Hebert2015-03-222-3/+66
|/ | | | | | | | | | | Rather than using the stdlib lists:umerge, we expand it to allow fuzzy matching on tuples vs. vals (`key` vs. `{key,val}`) with an overriden sort order so that two tuples or values comparing equal get a priority on the newest profile. This is a partial fix for #287 -- this current patch should be followed by a relx update to take options in order (as if they were a proplist) to complete it.
* Merge pull request #284 from tsloughter/masterFred Hebert2015-03-172-3/+25
|\ | | | | update hg username and email match in templates
| * update hg username and email match in templatesTristan Sloughter2015-03-172-3/+25
| |
* | Merge pull request #280 from tsloughter/pkgdepsFred Hebert2015-03-171-7/+2
|\ \ | |/ | | include all pkg deps in list of deps returned from update
| * include all pkg deps in list of deps returned from updateTristan Sloughter2015-03-171-7/+2
| |
* | Merge pull request #276 from tsloughter/flatten_commandFred Hebert2015-03-161-3/+3
|\ \ | |/ | | flatten command to open_port so <17 Erlangs are happy
| * flatten command to open_port so <17 Erlangs are happyTristan Sloughter2015-03-161-3/+3
| |
* | Merge pull request #275 from tsloughter/pkg_vsn_errorFred Hebert2015-03-162-2/+4
|\ \ | |/ | | handle bad package version with error message
| * add back throw on package index writeTristan Sloughter2015-03-161-1/+1
| |
| * handle bad package version with error messageTristan Sloughter2015-03-161-1/+3
|/
* Merge pull request #273 from ypaq/ypaq-doc-fix-versionTristan Sloughter2015-03-161-1/+1
|\ | | | | Decapitalize short option for 'version' flag
| * Decapitalize short option for 'version'Tilman Holschuh2015-03-161-1/+1
| |
* | Merge pull request #269 from ferd/dep-conflict-as-errorTristan Sloughter2015-03-164-23/+77
|\ \ | | | | | | Dep conflict as error
| * | Implement deps conflicts as errorsFred Hebert2015-03-153-22/+69
| | | | | | | | | | | | | | | | | | | | | | | | The option {deps_error_on_conflict, true} will make it so conflicts in deps being fetched interrupts the operation rather than just display a warning. Defaults to `false'.
| * | Avoid duplicating deps in discover phaseFred Hebert2015-03-151-1/+8
| |/ | | | | | | | | | | | | | | | | The deps are sorted and merged, but the merge function merges lists, not elements. This yields deps that are duplicated and ran for multiple times. We first add proper sorts so the keymerge is guaranteed to be fine, and then do a dedup run to get rid of duplicates if they happen to be.
* | Merge pull request #270 from ferd/cleanup-errorsTristan Sloughter2015-03-168-10/+18
|\ \ | |/ |/| use PRV_ERROR for formattable errors
| * use PRV_ERROR for formattable errorsFred Hebert2015-03-168-10/+18
|/ | | | Also expose it in rebar_api
* Merge pull request #268 from ferd/refactor-as-namespace-conflictsFred Hebert2015-03-133-53/+50
|\ | | | | Fix #267, refactor as/do/namespace interactions
| * Fix #267, refactor as/do/namespace interactionsFred Hebert2015-03-133-53/+50
| | | | | | | | | | | | | | | | | | | | Breaking up initial call to parse from the ones deep inside the provider parsing to do smarter namespace detection, added 'as' the ability to look into these also, and cleaned up the code a whole lot that would depend on implicit assumptions. A side-effect is that 'do' is now valid for all namespaces, although it can be overriden.
* | Merge pull request #266 from tsloughter/always_haltFred Hebert2015-03-121-1/+1
|\ \ | | | | | | halt with 0 on successful run
| * | halt with 0 on successful runTristan Sloughter2015-03-121-1/+1
| | |
* | | Merge pull request #265 from tsloughter/compile_jobsFred Hebert2015-03-122-113/+16
|\ \ \ | |/ / |/| | get rid of compile workers
| * | get rid of compile workersTristan Sloughter2015-03-122-113/+16
| | |
* | | Merge pull request #264 from fishcakez/cache_pltTristan Sloughter2015-03-121-2/+2
|\ \ \ | | | | | | | | Store base PLT in ~/.cache/rebar3/
| * | | Store base PLT in ~/.cache/rebar3/James Fish2015-03-121-2/+2
|/ / /
* | | Merge pull request #262 from tsloughter/compile_jobsFred Hebert2015-03-121-9/+12
|\ \ \ | |/ / | | | set jobs for all compile jobs
| * | set jobs for all compile jobsTristan Sloughter2015-03-121-9/+12
|/ /
* | Merge pull request #257 from tsloughter/config_mergeTristan Sloughter2015-03-111-20/+29
|\ \ | | | | | | merge rebar config opts for parent like done for profiles
| * | merge rebar config opts for parent like done for profilesTristan Sloughter2015-03-111-20/+29
| |/
* | Merge pull request #259 from kovyl2404/patch-1Fred Hebert2015-03-101-1/+1
|\ \ | | | | | | Fix typo in error message
| * | Fix typo in error messageViacheslav V. Kovalev2015-03-101-1/+1
| |/
* | Merge pull request #258 from marianoguerra/fix-debug-format-paramsFred Hebert2015-03-101-1/+1
|\ \ | |/ |/| fix debug format to avoid crash with custom template
| * fix debug format to avoid crash with custom templateMariano Guerra2015-03-101-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | error before: ===> Uncaught error: {'EXIT', {badarg, [{io,format, [<0.23.0>, "\e[0;36m===> Skipping template ~p, due to presence of a custom template at ~s~n~n\e[0m", ["/home/mariano/.config/rebar3/templates/fn_app/fn_app.template"]], []}, {rebar_templater,prioritize_templates,2, [{file,"src/rebar_templater.erl"},{line,330}]}, {rebar_templater,find_templates,1, [{file,"src/rebar_templater.erl"},{line,274}]}, {rebar_templater,new,4, [{file,"src/rebar_templater.erl"},{line,47}]}, {rebar_prv_new,do,1, [{file,"src/rebar_prv_new.erl"},{line,44}]}, {rebar_core,do,2, [{file,"src/rebar_core.erl"},{line,129}]}, {rebar3,main,1, [{file,"src/rebar3.erl"},{line,46}]}, {escript,run,2, [{file,"escript.erl"},{line,752}]}]}}
* Merge pull request #255 from rebar/revert-254-smpFred Hebert2015-03-091-1/+1
|\ | | | | Revert "disable smp in escript"
| * Revert "disable smp in escript"Fred Hebert2015-03-091-1/+1
|/
* Merge pull request #254 from tsloughter/smpFred Hebert2015-03-091-1/+1
|\ | | | | disable smp in escript
| * disable smp in escriptTristan Sloughter2015-03-091-1/+1
| |
* | Merge pull request #253 from tsloughter/masterFred Hebert2015-03-081-3/+3
|\ \ | |/ | | templater: return error, don't throw, if git or hg fail
| * templater: return error, don't throw, if git or hg failTristan Sloughter2015-03-081-3/+3
|/
* Merge pull request #251 from talentdeficit/compile_from_buildTristan Sloughter2015-03-083-20/+36
|\ | | | | symlink extra test dirs and compile from there instead of from root project
| * symlink extra test dirs and compile from there instead of fromalisdair sullivan2015-03-083-20/+36
| | | | | | | | root project
* | Merge pull request #249 from talentdeficit/compile_from_buildTristan Sloughter2015-03-085-12/+43
|\ \ | |/ | | compile source from the symlinked directories under `_build`
| * compile source from the symlinked directories under `_build` toalisdair sullivan2015-03-085-12/+43
|/ | | | get correct compile paths included in module info
* Merge pull request #246 from tsloughter/masterFred Hebert2015-03-082-193/+2
|\ | | | | update sample config to remove unsupported rebar2 options
| * update sample config to remove unsupported rebar2 optionsTristan Sloughter2015-03-082-193/+2
| |
* | Merge pull request #244 from tsloughter/masterFred Hebert2015-03-071-2/+1
|\ \ | |/ | | don't traverse into subdirectories looking for beams
| * don't traverse into subdirectories looking for beamsTristan Sloughter2015-03-071-2/+1
|/
generated by cgit v1.1 at 2024-12-26 05:56:56 +0000