summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #1606 from ferd/recurive-profile-mergeFred Hebert2017-08-133-4/+63
|\ \ | | | | | | Fix recursive profile merging, particularly for umbrella apps
| * | Clarify function to normalise profile pairsFred Hebert2017-08-131-13/+25
| | |
| * | Fix recursive profile merging in umbrella appsFred Hebert2017-08-113-4/+51
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a config file exists at the root of a project, defines a given configuration value for a given profile, and that a sub-application (umbrella app) also has the same profile defined with the same key (but different values), the configuration values of the sub-application's profile would get silently dropped. The problem being that when the function to merge profiles is applied recursively, it is applied to each profile (so it will merge on the keys test, prod, etc.) rather than to each of the values of each profile. This patch reworks the profile merging so that the current behaviour is respected overall (a profile cannot be cancelled by a subdep's non-existant profile since its value should have been ignored), but ensures that sub-deps' profiles are otherwise applied recursively with the proper rules: - dependencies favor prior values - plugins favor new values - erl_first_files combine the lists - relx uses the tuple merge algorithm - erl_opts has its own custom merge as well - otherwise the new value takes precedence A test has also been added. There is a risk of breakage in some applications that may have relied on the buggy behaviour to work, though at this time we are aware of none of them.
* | Merge pull request #1470 from talentdeficit/appveyorFred Hebert2017-08-101-0/+20
|\ \ | |/ |/| appveyor configuration to build on 15.3.1, 17.5, 18.3 and 19.2
| * drop r15 from appveyor configalisdair sullivan2017-07-091-2/+1
| |
| * appveyor configuration to build on 15.3.1, 17.5, 18.3 and 19.2alisdair sullivan2017-02-051-0/+21
| | | | | | | | 16.x is not available on chocolatey
* | Merge pull request #1596 from ferd/local-apps-override-depsFred Hebert2017-08-093-8/+58
|\ \ | | | | | | Allow top-level apps to take precedence over deps
| * | Allow top-level apps to take precedence over depsFred Hebert2017-08-053-8/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use case has been described in issue #1478 where a local application can exist while being declared as a dependency as well. This allows, for example, to work on a release where all applications may require to be published independently, or to provide some form of 'vendoring' with a local app. The fix is done by decoupling the dependency source resolution form the dependency parsing. The reason for this being that the discovery phase needs to parse apps for their top-level deps, and dep installation needs to resolve the packages with accuracy. In the current implementation, both code paths call to the same function. This patch splits up the precise discovery and makes it happen *only* when installing dependencies, and only if a top-level app does not already define the application needing resolving. One weakness of this fix is that it necessarily breaks cycle detection in dependencies that involve a root application depending on itself since its own version as a dep will not be expanded. There appears to be no possible way to prevent this, but should be rare enough to be worth the tradeoff for the common case.
* | | Merge pull request #1578 from ferd/bump-cth-show-groupsFred Hebert2017-08-072-3/+3
|\ \ \ | | | | | | | | Bump cth_readable to 1.3.0: shows test groups
| * | | Bump cth_readable to 1.3.0: shows test groupsFred Hebert2017-06-272-3/+3
| | | |
* | | | Merge pull request #1598 from ferd/unicode-bonanzaFred Hebert2017-08-0751-423/+443
|\ \ \ \ | | | | | | | | | | Unicode support in all the places
| * | | | Unicode support in all the placesFred Hebert2017-08-0651-423/+443
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done through 3 main change groups: - replacing `~s` by `~ts` in format strings, so that strings that contain unicode are properly printed rather than crashing - adding the `unicode` argument to all function of the `re` module to ensure transformations on strings containing unicode data are valid instead of crashing (see issue #1302) - replacing `ec_cnv:to_binary/1` and `ec_cnv:to_list/1` with matching functions in `rebar_utils`. The last point has been done, rather than modifying and updating erlware commons, because binary and list conversions can be a contentious subject. For example, if what is being handled is actually bytes from a given binary stream, then forcing a byte-oriented interpretation of the data can corrupt it. As such, it does not appear safe to modify erlware commons' conversion functions since it may not be safe for all its users. Instead, rebar3 reimplements a subset of them (only converting atoms and chardata, ignoring numbers) with the explicit purpose of handling unicode string data. Tests were left as unchanged as possible. This may impact the ability to run rebar3's own suites in a unicode path, but respects a principle of least change for such a large patch.
* | | | | Merge pull request #1594 from ferd/upgrade-certifiFred Hebert2017-08-073-7/+7
|\ \ \ \ \ | | | | | | | | | | | | Upgrade certifi & ssl_verify_fun dependencies
| * | | | | Also upgrade ssl_verify_fun while we're at itFred Hebert2017-07-312-3/+3
| | | | | |
| * | | | | Upgrade certifi dependenciesFred Hebert2017-07-313-4/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get more up-to-date root certs. This was blocked for a while because certifi wouldn't build on windows, but this is now fixed, with minimal changes to the use case -- only a small change in the bootstrap script is required. The new certifi lib is also a few megabytes lighter than before, which is good for rebar3.
* | | | | Merge pull request #1580 from aha-oretama/patch-ignoreFred Hebert2017-08-061-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Ignore IntelliJ IDEA file
| * | | | Ignore IntelliJ fileaha-oretama2017-07-031-0/+1
| | | | |
* | | | | Merge pull request #1597 from ↵Fred Hebert2017-08-051-4/+13
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | g-andrade/fix/avoid_crashing_xref_upon_stripped_modules Avoid xref crash upon undefined functions in modules without debug_info
| * | | | Don't crash when determining the source of undefined functions in stripped ↵Guilherme Andrade2017-08-051-4/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modules This can be reproduced by running xref analysis against a rebar3 plugin project which doesn't list rebar3 as an explicit dependency -- calls to certain bundled modules ('rebar_state', 'rebar_api', 'ec_cnv', ...) will result in a failed pattern match as these modules appear to have had their abstract code stripped.
* | | | Merge pull request #1591 from MikhailKalashnikov/fix-xref-cleanup-code-pathFred Hebert2017-07-261-1/+2
|\ \ \ \ | | | | | | | | | | Fix cleanup_code_path for xref compile hook
| * | | | Fix cleanup_code_path for xref compile hookMikhail Kalashnikov2017-07-261-1/+2
|/ / / /
* | | | Merge pull request #1590 from VHTx/edoc_config_error_#149002995Fred Hebert2017-07-171-1/+1
|\ \ \ \ | | | | | | | | | | Edoc config error
| * | | | [#149002995] fix flipped variablesSam Sawan2017-07-171-5/+6
| | | | |
| * | | | [#149002995] stop eating edoc path configSam Sawan2017-07-171-6/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | be a little smarter when generating edocs; loof for some sort of doc path and then replace w/e was there with the updated doc paths
* | | | Back to git-based versioningFred Hebert2017-07-141-1/+1
| | | |
* | | | Bump to 3.4.2Fred Hebert2017-07-142-2/+2
| | | |
* | | | Merge pull request #1588 from tsloughter/relx-3.23.1Fred Hebert2017-07-142-3/+3
|\ \ \ \ | | | | | | | | | | upgrade relx
| * | | | upgrade relxTristan Sloughter2017-07-142-3/+3
|/ / / /
* | | | Merge pull request #1587 from tsloughter/ct-compile-onlyTristan Sloughter2017-07-142-4/+32
|\ \ \ \ | | | | | | | | | | add compile_only option to ct provider
| * | | | add ct compile_only test, checks for compiled appTristan Sloughter2017-07-141-2/+20
| | | | |
| * | | | add compile_only option to ct providerTristan Sloughter2017-07-131-2/+12
|/ / / /
* | | | Merge pull request #1584 from tsloughter/erl_opts_recompileFred Hebert2017-07-131-2/+17
|\ \ \ \ | | | | | | | | | | recompile only if new option effects code generation
| * | | | recompile only if new option effects code generationTristan Sloughter2017-07-131-2/+17
| | | | |
* | | | | Merge pull request #1585 from erlang/nowarn_export_allFred Hebert2017-07-131-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | drop warnings for `export_all` in test profile
| * | | | drop warnings for `export_all` in test profilealisdair sullivan2017-07-131-1/+1
|/ / / /
* | | | Merge pull request #1583 from erlang/update_meckFred Hebert2017-07-131-1/+1
|\ \ \ \ | |/ / / |/| | | update meck for otp20
| * | | update meck for otp20alisdair sullivan2017-07-121-1/+1
|/ / /
* | | Merge pull request #1575 from gleber/bare-paths-separatorFred Hebert2017-06-201-3/+5
|\ \ \ | | | | | | | | Bare compiler: support multiple paths wildcards.
| * | | Bare compile: support multiple paths wildcards.Gleb Peregud2017-06-201-3/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Similarly to PATH env variable, this allows to pass paths to bare compiler which do not fit nicely into a single wildcard structure. Colon (":") is used as separator. This provides more flexibility when rebar is run in offline/hermetic environment, e.g. #958 and #1281.
* | | Merge pull request #1574 from djnym/shell-fix-for-rel-type-noneFred Hebert2017-06-151-1/+4
|\ \ \ | | | | | | | | Rebar3 shell supports booting applications with type 'none'
| * | | Application type of none was not working.Anthony Molinaro2017-06-151-1/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I noticed this when trying to include entop in a release. Entop uses cecho which takes over the terminal, so you do not want it loaded or started. According to http://erlang.org/doc/man/rel.html, when you specify a Type of none it should not load or start, but the code for it's modules should be loaded. This patch ensures the code is not loaded or started, but doesn't do anything with the code paths. At the very least this allows me to start a shell in the case where I have an application of type none, and the application is neither loaded nor started.
* | | Merge pull request #1572 from ferd/fix-xref-undef-behaviourFred Hebert2017-06-133-4/+54
|\ \ \ | | | | | | | | Prevent xref crashes with undef behaviours
| * | | Prevent xref crashes with undef behavioursFred Hebert2017-06-133-4/+54
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | When a given behaviour module does not exist, rebar3 brutally crashes. This patch makes it so instead, there is a warning output menitoning the missing behaviour, and this one is omitted from the unused function calls check. This means that unused calls will instead be shown for the module implementing a non-existing behaviour, as if no behaviour were declared in the first place.
* | | Merge pull request #1571 from getong/add_path_should_be_headFred Hebert2017-06-131-1/+1
|\ \ \ | |/ / |/| | the new added PATH value should be in the first position, in case the…
| * | the new added PATH value should be in the first position, in case there be ↵getong2017-06-131-1/+1
|/ / | | | | | | other same name cmd
* | Merge pull request #1569 from ferd/fix-xref-circular-dep-crashFred Hebert2017-06-089-4/+187
|\ \ | | | | | | Fix xref compile hook on deps
| * | Fix xref compile hook on depsFred Hebert2017-06-079-4/+187
|/ / | | | | | | | | | | | | | | | | | | | | If xref analysis is being run by a dependency during its compilation phase, the xref provider will try to add that deps' parents to the check job while the ebin/ directories for them do not exist. This causes a crash. This patch makes it so directories are only added if they are existing, preventing failure on any compile hook for dependencies and allowing successful compilation as a best effort.
* | Merge pull request #1564 from tsloughter/reset_profile_hooksTristan Sloughter2017-06-022-11/+40
|\ \ | | | | | | reset hooks under profiles for application opts
| * | reset hooks under profiles for application optsTristan Sloughter2017-06-022-11/+40
| | |
* | | Merge pull request #1563 from djnym/relx-overlay-fixFred Hebert2017-06-012-1/+30
|\ \ \ | |/ / |/| | Avoid reversing relx overlays.