Update master with mainline rebar (v2) This PR uses the latest software provided by the upstream Rebar (v2) repo.
The most significant change allows this version of Rebar to work with compilers which do not support the -m64 flag, as reported in #892 amongst others. The latest code base also contains @davisp's Properly skip apps with a .app.src.script file patch which CouchDB has been carrying for a while now. Project: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/commit/0c435f3d Tree: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/tree/0c435f3d Diff: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/diff/0c435f3d Branch: refs/heads/master Commit: 0c435f3d6676d28dd0096c83c1036330230951d6 Parents: 5dea85d b6d3094 Author: Joan Touzet <[email protected]> Authored: Wed Nov 7 12:13:12 2018 -0500 Committer: Joan Touzet <[email protected]> Committed: Wed Nov 7 12:13:12 2018 -0500 ---------------------------------------------------------------------- .travis.yml | 23 +- Makefile | 12 +- README.md | 5 + RELEASE-NOTES.md | 61 ++ THANKS | 9 + appveyor.yml | 24 + bootstrap | 5 +- ebin/rebar.app | 8 +- inttest/app_src/app_src.erl | 2 +- inttest/app_src/app_src_rt.erl | 11 +- inttest/app_src_script/app_src_script.erl | 2 +- inttest/app_src_script/app_src_script_rt.erl | 11 +- inttest/app_src_script_2/app_src_script_2.erl | 2 +- .../app_src_script_2/app_src_script_2_rt.erl | 11 +- inttest/appup_src/appup_src_rt.erl | 11 +- inttest/appup_src/src/appup_src.erl | 2 +- inttest/appup_src_2/appup_src_2_rt.erl | 11 +- inttest/appup_src_2/appup_src_rt_2.erl | 10 +- inttest/appup_src_2/src/appup_src.erl | 2 +- .../appup_src_script/appup_src_script_rt.erl | 11 +- inttest/appup_src_script/src/appup_src.erl | 2 +- inttest/bug_5_rt.erl | 11 +- .../code_path_no_recurse_rt.erl | 7 +- inttest/cover/cover_rt.erl | 11 +- inttest/cross1/c_src/test1.c | 1 + inttest/cross1/c_src/test1.h | 0 inttest/cross1/cross1_rt.erl | 66 ++ inttest/ct1/ct1_rt.erl | 14 +- inttest/ct1/test_SUITE.erl | 2 +- inttest/ct2/ct2_rt.erl | 12 +- inttest/ct2/foo_SUITE.erl | 2 +- inttest/ct3/ct3_rt.erl | 14 +- inttest/ct3/test_SUITE.erl | 2 +- inttest/ct4/ct4_rt.erl | 44 ++ inttest/ct4/deps/bar.test.spec | 1 + inttest/ct4/foo.test.spec | 1 + inttest/ct4/foo_SUITE.erl | 11 + inttest/ct4/rebar.config | 2 + inttest/ct_cover/app.config | 2 + inttest/ct_cover/cover.spec | 3 + inttest/ct_cover/ct_cover_rt.erl | 35 ++ inttest/ct_cover/mock/dummy/app.config | 2 + inttest/ct_cover/mock/dummy/cover.spec | 3 + inttest/ct_cover/mock/dummy/ebin/dummy.app | 6 + .../ct_cover/mock/dummy/itest/test_SUITE.erl | 17 + inttest/ct_cover/mock/dummy/rebar.config | 4 + inttest/ct_cover/rebar.config | 7 + inttest/ct_cover/test_SUITE.erl | 17 + inttest/ct_make_fails/app.config | 2 + inttest/ct_make_fails/ct_make_fails_rt.erl | 31 + inttest/ct_make_fails/rebar.config | 2 + inttest/ct_make_fails/test_SUITE.erl | 17 + inttest/ct_test_fails/app.config | 2 + inttest/ct_test_fails/ct_test_fails.test.spec | 1 + inttest/ct_test_fails/ct_test_fails_rt.erl | 32 + inttest/ct_test_fails/rebar.config | 13 + inttest/ct_test_fails/test2_SUITE.erl | 9 + inttest/ct_test_fails/test_SUITE.erl | 10 + inttest/depplugins/depplugins_rt.erl | 9 +- inttest/erlc/erlc_rt.erl | 11 +- inttest/erlc/src/._do_not_compile.erl | 4 - inttest/erlc_dep_graph/erlc_dep_graph_rt.erl | 30 +- inttest/eunit/eunit_rt.erl | 11 +- inttest/eunit_surefire/eunit_src/bar.erl | 6 + inttest/eunit_surefire/eunit_surefire_rt.erl | 40 ++ inttest/eunit_surefire/rebar.config | 7 + inttest/eunit_surefire/src/foo.erl | 10 + inttest/inttest_utils.erl | 19 + inttest/logging/logging_rt.erl | 30 +- .../neotoma1/mock/neotoma/priv/peg_includes.hrl | 253 ++++++++ .../neotoma1/mock/neotoma/src/neotoma.app.src | 10 + inttest/neotoma1/mock/neotoma/src/neotoma.erl | 145 +++++ .../neotoma1/mock/neotoma/src/neotoma_parse.erl | 625 +++++++++++++++++++ inttest/neotoma1/neotoma_src_rt.erl | 81 +++ inttest/neotoma1/rebar.config | 15 + inttest/neotoma1/src/csv.peg | 31 + inttest/neotoma1/src/neotoma1.app.src | 6 + inttest/port/port_rt.erl | 88 ++- inttest/port/rebar.config | 3 +- inttest/port2/c_src/test1.c | 13 + inttest/port2/c_src/test1.h | 0 inttest/port2/port2_rt.erl | 75 +++ inttest/port2/rebar.config | 9 + inttest/profile/profile_rt.erl | 8 +- inttest/proto_gpb/proto_gpb_rt.erl | 14 +- .../proto_protobuffs/proto_protobuffs_rt.erl | 7 +- inttest/rebar3_deps1/a.erl | 8 + inttest/rebar3_deps1/a.rebar.config | 4 + inttest/rebar3_deps1/b.hrl | 1 + inttest/rebar3_deps1/c.txt | 1 + inttest/rebar3_deps1/rebar3_deps1_rt.erl | 63 ++ inttest/require_vsn/require_vsn_rt.erl | 7 +- inttest/rgen1/retest.config | 2 +- inttest/rgen1/rgen1_rt.erl | 11 +- inttest/t_custom_config/custom_config.erl | 2 +- inttest/t_custom_config/t_custom_config_rt.erl | 16 +- inttest/tdeps1/a.erl | 2 +- inttest/tdeps1/tdeps1_rt.erl | 12 +- inttest/tdeps2/tdeps2_rt.erl | 12 +- inttest/tdeps3/tdeps3_rt.erl | 12 +- inttest/tdeps_prefer/a.erl | 4 + inttest/tdeps_prefer/a.rebar.config | 4 + inttest/tdeps_prefer/b.hrl | 1 + inttest/tdeps_prefer/c.hrl | 1 + inttest/tdeps_prefer/root.rebar.config | 1 + inttest/tdeps_prefer/tdeps_prefer_rt.erl | 68 ++ inttest/tdeps_update/tdeps_update_rt.erl | 77 ++- inttest/thooks/fish.erl | 2 +- inttest/thooks/thooks_rt.erl | 17 +- inttest/tplugins/bad_plugin.erl | 3 +- inttest/tplugins/fish.erl | 2 +- inttest/tplugins/test_plugin.erl | 3 +- inttest/tplugins/tplugins_rt.erl | 11 +- inttest/vsn_cache/main.erl | 13 + inttest/vsn_cache/vsn_cache_rt.erl | 90 +++ inttest/xref_behavior/gen_xref_behavior.erl | 9 + inttest/xref_behavior/rebar.config | 6 + inttest/xref_behavior/xref_behavior.erl | 10 + inttest/xref_behavior/xref_behavior_rt.erl | 35 ++ pr2relnotes.py | 22 + priv/shell-completion/bash/rebar | 3 +- priv/shell-completion/zsh/_rebar | 3 +- priv/templates/ctsuite.erl | 29 +- priv/templates/simplenode.runner | 29 +- priv/templates/simplenode.windows.runner.cmd | 14 +- rebar.config | 5 +- rebar.config.sample | 4 + rebar.config.script | 3 +- src/rebar.erl | 21 +- src/rebar_core.erl | 6 +- src/rebar_cover_utils.erl | 2 + src/rebar_ct.erl | 57 +- src/rebar_deps.erl | 64 +- src/rebar_dia_compiler.erl | 2 + src/rebar_erlc_compiler.erl | 4 +- src/rebar_eunit.erl | 16 +- src/rebar_file_utils.erl | 12 +- src/rebar_lfe_compiler.erl | 4 +- src/rebar_log.erl | 39 +- src/rebar_neotoma_compiler.erl | 41 +- src/rebar_port_compiler.erl | 277 +++++--- src/rebar_qc.erl | 5 +- src/rebar_rand_compat.erl | 178 ++++++ src/rebar_require_vsn.erl | 20 +- src/rebar_upgrade.erl | 6 + src/rebar_utils.erl | 190 +++++- src/rebar_xref.erl | 7 + src/rmemo.erl | 14 +- test/rebar_compiler_tests.erl | 16 +- test/rebar_dia_tests.erl | 110 ++++ test/rebar_eunit_tests.erl | 64 +- test/rebar_file_utils_tests.erl | 4 +- test/rebar_require_vsn_tests.erl | 39 +- test/rebar_utils_tests.erl | 2 - test/rebar_xref_eunit.erl | 65 +- test/upgrade_project/rel/files/dummy | 5 +- 156 files changed, 3617 insertions(+), 486 deletions(-) ----------------------------------------------------------------------
