Hello community, here is the log from the commit of package erlang-rebar for openSUSE:Factory checked in at 2016-01-20 09:55:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/erlang-rebar (Old) and /work/SRC/openSUSE:Factory/.erlang-rebar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "erlang-rebar" Changes: -------- --- /work/SRC/openSUSE:Factory/erlang-rebar/erlang-rebar-obs.changes 2015-10-30 13:42:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.erlang-rebar.new/erlang-rebar-obs.changes 2016-01-20 09:55:18.000000000 +0100 @@ -1,0 +2,14 @@ +Sun Jan 17 17:25:39 UTC 2016 - [email protected] + +- Update to version 2.6.1+git20160115.c534f8a: + + fprof: document Cachegrind support + + fprof: further document Cachegrind support + + Add qualified name tests docs (see pr #119) + + Fix windows eunit tests + + Lock retest dependency + + Allow windows release to use etc conf dir + + xref: fix dialyzer warning introduced in 69802f63120 + + Provide additional debug logging on relup generation + + Add the latest OTP 18 version to the Travis build + +------------------------------------------------------------------- erlang-rebar.changes: same change Old: ---- rebar-2.6.1+git20151013.5d73a8d.tar.bz2 New: ---- rebar-2.6.1+git20160115.c534f8a.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ erlang-rebar-obs.spec ++++++ --- /var/tmp/diff_new_pack.Eqnsiz/_old 2016-01-20 09:55:19.000000000 +0100 +++ /var/tmp/diff_new_pack.Eqnsiz/_new 2016-01-20 09:55:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package erlang-rebar-obs # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define obs 1 Name: erlang-rebar-obs -Version: 2.6.1+git20151013.5d73a8d +Version: 2.6.1+git20160115.c534f8a Release: 0 %define mod_ver %(echo "%{version}" | cut -d "+" -f1) Summary: A sophisticated build-tool for Erlang projects that follows OTP principles ++++++ erlang-rebar.spec ++++++ --- /var/tmp/diff_new_pack.Eqnsiz/_old 2016-01-20 09:55:19.000000000 +0100 +++ /var/tmp/diff_new_pack.Eqnsiz/_new 2016-01-20 09:55:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package erlang-rebar # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define obs 0 Name: erlang-rebar -Version: 2.6.1+git20151013.5d73a8d +Version: 2.6.1+git20160115.c534f8a Release: 0 %define mod_ver %(echo "%{version}" | cut -d "+" -f1) Summary: A sophisticated build-tool for Erlang projects that follows OTP principles ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Eqnsiz/_old 2016-01-20 09:55:19.000000000 +0100 +++ /var/tmp/diff_new_pack.Eqnsiz/_new 2016-01-20 09:55:19.000000000 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/rebar/rebar.git</param> - <param name="changesrevision">5d73a8d8e7c9d56231970ab775231a7a87bcd14a</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">c534f8a903c10bf330c0b819fd75e1495a7e1d39</param></service></servicedata> \ No newline at end of file ++++++ no-rebar-deps.patch ++++++ --- /var/tmp/diff_new_pack.Eqnsiz/_old 2016-01-20 09:55:19.000000000 +0100 +++ /var/tmp/diff_new_pack.Eqnsiz/_new 2016-01-20 09:55:19.000000000 +0100 @@ -1,7 +1,7 @@ -Index: rebar-2.6.1+git20150928.365ac64/Makefile +Index: rebar-2.6.1+git20160115.c534f8a/Makefile =================================================================== ---- rebar-2.6.1+git20150928.365ac64.orig/Makefile -+++ rebar-2.6.1+git20150928.365ac64/Makefile +--- rebar-2.6.1+git20160115.c534f8a.orig/Makefile ++++ rebar-2.6.1+git20160115.c534f8a/Makefile @@ -1,7 +1,7 @@ .PHONY: clean xref_warnings deps test test_eunit test_inttest @@ -19,15 +19,15 @@ test: test_eunit test_inttest -Index: rebar-2.6.1+git20150928.365ac64/rebar.config.script +Index: rebar-2.6.1+git20160115.c534f8a/rebar.config.script =================================================================== ---- rebar-2.6.1+git20150928.365ac64.orig/rebar.config.script -+++ rebar-2.6.1+git20150928.365ac64/rebar.config.script +--- rebar-2.6.1+git20160115.c534f8a.orig/rebar.config.script ++++ rebar-2.6.1+git20160115.c534f8a/rebar.config.script @@ -1,7 +1,7 @@ %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- %% ex: ts=4 sw=4 ft=erlang et --ExtraDeps = [{retest, ".*", {git, "git://github.com/dizzyd/retest.git"}}], +-ExtraDeps = [{retest, ".*", {git, "git://github.com/dizzyd/retest.git", {tag, "4590941a"}}}], +ExtraDeps = [], case os:getenv("REBAR_EXTRA_DEPS") of ++++++ rebar-2.6.1+git20151013.5d73a8d.tar.bz2 -> rebar-2.6.1+git20160115.c534f8a.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebar-2.6.1+git20151013.5d73a8d/.travis.yml new/rebar-2.6.1+git20160115.c534f8a/.travis.yml --- old/rebar-2.6.1+git20151013.5d73a8d/.travis.yml 2015-10-15 10:29:57.000000000 +0200 +++ new/rebar-2.6.1+git20160115.c534f8a/.travis.yml 2016-01-17 18:25:38.000000000 +0100 @@ -9,6 +9,7 @@ - R14B04 - R14B03 - 17.0 + - 18.0 before_script: - hostname -f - cc -v diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebar-2.6.1+git20151013.5d73a8d/THANKS new/rebar-2.6.1+git20160115.c534f8a/THANKS --- old/rebar-2.6.1+git20151013.5d73a8d/THANKS 2015-10-15 10:29:57.000000000 +0200 +++ new/rebar-2.6.1+git20160115.c534f8a/THANKS 2016-01-17 18:25:38.000000000 +0100 @@ -145,3 +145,4 @@ Tony Rogvall Andrey Teplyashin Duncan McGreggor +Sebastien Serre diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebar-2.6.1+git20151013.5d73a8d/priv/templates/simplenode.windows.runner.cmd new/rebar-2.6.1+git20160115.c534f8a/priv/templates/simplenode.windows.runner.cmd --- old/rebar-2.6.1+git20151013.5d73a8d/priv/templates/simplenode.windows.runner.cmd 2015-10-15 10:29:57.000000000 +0200 +++ new/rebar-2.6.1+git20160115.c534f8a/priv/templates/simplenode.windows.runner.cmd 2016-01-17 18:25:38.000000000 +0100 @@ -17,8 +17,18 @@ @call :set_trim release_version %%J ) -@set vm_args=%releases_dir%\%release_version%\vm.args -@set sys_config=%releases_dir%\%release_version%\sys.config +@if exist "%releases_dir%\%release_version%\vm.args" ( + @set vm_args="%releases_dir%\%release_version%\vm.args" +) else ( + @set vm_args="%node_root%\etc\vm.args" +) + +@if exist "%releases_dir%\%release_version%\sys.config" ( + @set sys_config="%releases_dir%\%release_version%\sys.config" +) else ( + @set sys_config="%node_root%\etc\app.config" +) + @set node_boot_script=%releases_dir%\%release_version%\%node_name% @set clean_boot_script=%releases_dir%\%release_version%\start_clean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebar-2.6.1+git20151013.5d73a8d/rebar.config.script new/rebar-2.6.1+git20160115.c534f8a/rebar.config.script --- old/rebar-2.6.1+git20151013.5d73a8d/rebar.config.script 2015-10-15 10:29:57.000000000 +0200 +++ new/rebar-2.6.1+git20160115.c534f8a/rebar.config.script 2016-01-17 18:25:38.000000000 +0100 @@ -1,7 +1,7 @@ %% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- %% ex: ts=4 sw=4 ft=erlang et -ExtraDeps = [{retest, ".*", {git, "git://github.com/dizzyd/retest.git"}}], +ExtraDeps = [{retest, ".*", {git, "git://github.com/dizzyd/retest.git", {tag, "4590941a"}}}], case os:getenv("REBAR_EXTRA_DEPS") of false -> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebar-2.6.1+git20151013.5d73a8d/src/rebar.erl new/rebar-2.6.1+git20160115.c534f8a/src/rebar.erl --- old/rebar-2.6.1+git20151013.5d73a8d/src/rebar.erl 2015-10-15 10:29:57.000000000 +0200 +++ new/rebar-2.6.1+git20160115.c534f8a/src/rebar.erl 2016-01-17 18:25:38.000000000 +0100 @@ -501,7 +501,9 @@ {profile, $p, "profile", undefined, "Profile this run of rebar. Via profiler= you can optionally select " "either fprof (default) or eflame. The result can be found in " - "fprof.analysis or eflame.svg."}, + "fprof.analysis or eflame.svg. Additionally, in fprof mode, if " + "erlgrind can be found in $PATH, a Cachegrind file (fprof.cgrind) " + "will be generated as well."}, {keep_going, $k, "keep-going", undefined, "Keep running after a command fails"}, {recursive, $r, "recursive", boolean, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebar-2.6.1+git20151013.5d73a8d/src/rebar_eunit.erl new/rebar-2.6.1+git20160115.c534f8a/src/rebar_eunit.erl --- old/rebar-2.6.1+git20151013.5d73a8d/src/rebar_eunit.erl 2015-10-15 10:29:57.000000000 +0200 +++ new/rebar-2.6.1+git20160115.c534f8a/src/rebar_eunit.erl 2016-01-17 18:25:38.000000000 +0100 @@ -128,6 +128,7 @@ " name starts with bar and, if no such test exists,~n" " run the test whose name starts with bar in the~n" " suite's _tests module)~n" + " test[s]=\"foo:bar_test\" (Run bar_test located in module foo)~n" " random_suite_order=true (Run tests in random order)~n" " random_suite_order=Seed (Run tests in random order,~n" " with the PRNG seeded with Seed)~n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebar-2.6.1+git20151013.5d73a8d/src/rebar_file_utils.erl new/rebar-2.6.1+git20160115.c534f8a/src/rebar_file_utils.erl --- old/rebar-2.6.1+git20151013.5d73a8d/src/rebar_file_utils.erl 2015-10-15 10:29:57.000000000 +0200 +++ new/rebar-2.6.1+git20160115.c534f8a/src/rebar_file_utils.erl 2016-01-17 18:25:38.000000000 +0100 @@ -88,7 +88,7 @@ ?FMT("move /y \"~s\" \"~s\" 1> nul", [filename:nativename(Source), filename:nativename(Dest)]), - [{use_stdout, false}, return_on_error]), + [{use_stdout, false}, abort_on_error]), case R of [] -> ok; @@ -131,14 +131,14 @@ delete_each_dir_win32([Dir | Rest]) -> {ok, []} = rebar_utils:sh(?FMT("rd /q /s \"~s\"", [filename:nativename(Dir)]), - [{use_stdout, false}, return_on_error]), + [{use_stdout, false}, abort_on_error]), delete_each_dir_win32(Rest). xcopy_win32(Source,Dest)-> {ok, R} = rebar_utils:sh( ?FMT("xcopy \"~s\" \"~s\" /q /y /e 2> nul", [filename:nativename(Source), filename:nativename(Dest)]), - [{use_stdout, false}, return_on_error]), + [{use_stdout, false}, abort_on_error]), case length(R) > 0 of %% when xcopy fails, stdout is empty and and error message is printed %% to stderr (which is redirected to nul) @@ -162,8 +162,10 @@ cp_r_win32(S, {false, filename:join(DestDir, filename:basename(Source))}); cp_r_win32({false, Source},{false, Dest}) -> %% from file to file - {ok,_} = file:copy(Source, Dest), - ok; + case file:copy(Source, Dest) of + {ok,_} -> ok; + _ -> throw(rebar_abort) + end; cp_r_win32({true, SourceDir}, {false, DestDir}) -> case filelib:is_regular(DestDir) of true -> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebar-2.6.1+git20151013.5d73a8d/src/rebar_upgrade.erl new/rebar-2.6.1+git20160115.c534f8a/src/rebar_upgrade.erl --- old/rebar-2.6.1+git20151013.5d73a8d/src/rebar_upgrade.erl 2015-10-15 10:29:57.000000000 +0200 +++ new/rebar-2.6.1+git20160115.c534f8a/src/rebar_upgrade.erl 2016-01-17 18:25:38.000000000 +0100 @@ -44,18 +44,24 @@ 'generate-upgrade'(Config0, ReltoolFile) -> %% Get the old release path {Config, ReltoolConfig} = rebar_rel_utils:load_config(Config0, ReltoolFile), + ?DEBUG("reltool.config: ~p~n", [ReltoolConfig]), TargetParentDir = rebar_rel_utils:get_target_parent_dir(Config, ReltoolConfig), TargetDir = rebar_rel_utils:get_target_dir(Config, ReltoolConfig), + ?DEBUG("target dir: ~p~n", [TargetDir]), PrevRelPath = rebar_rel_utils:get_previous_release_path(Config), OldVerPath = filename:join([TargetParentDir, PrevRelPath]), + ?DEBUG("old version path: ~p~n", [OldVerPath]), %% Run checks to make sure that building a package is possible {NewVerPath, NewName, NewVer, OldVer} = run_checks(Config, OldVerPath, ReltoolConfig), + ?DEBUG("old version: ~p~n", [OldVer]), NameVer = NewName ++ "_" ++ NewVer, OldRelName = get_old_rel_name(OldVerPath, OldVer, NewName), + ?DEBUG("new version path: ~p~n", [NewVerPath]), + ?DEBUG("old version: ~p~n", [NewVer]), %% Save the code path prior to doing anything OrigPath = code:get_path(), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebar-2.6.1+git20151013.5d73a8d/src/rebar_xref.erl new/rebar-2.6.1+git20160115.c534f8a/src/rebar_xref.erl --- old/rebar-2.6.1+git20151013.5d73a8d/src/rebar_xref.erl 2015-10-15 10:29:57.000000000 +0200 +++ new/rebar-2.6.1+git20160115.c534f8a/src/rebar_xref.erl 2016-01-17 18:25:38.000000000 +0100 @@ -60,9 +60,9 @@ true = code:add_path(rebar_utils:ebin_dir()), %% Add extra paths to code path to, for example, be used - %% when behaviour modules are defined - [code:add_path(Path) - || Path <- rebar_config:get(Config, xref_extra_paths, [])], + %% when behaviour modules are defined. + lists:foreach(fun(P) -> true = code:add_path(P) end, + rebar_config:get(Config, xref_extra_paths, [])), %% Get list of xref checks we want to run ConfXrefChecks = rebar_config:get(Config, xref_checks, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebar-2.6.1+git20151013.5d73a8d/test/rebar_compiler_tests.erl new/rebar-2.6.1+git20160115.c534f8a/test/rebar_compiler_tests.erl --- old/rebar-2.6.1+git20151013.5d73a8d/test/rebar_compiler_tests.erl 2015-10-15 10:29:57.000000000 +0200 +++ new/rebar-2.6.1+git20160115.c534f8a/test/rebar_compiler_tests.erl 2016-01-17 18:25:38.000000000 +0100 @@ -84,11 +84,11 @@ setup, fun() -> setup_basic_project(), - setup_rebar_config(), - rebar("compile") + setup_rebar_config() end, fun teardown/1, - fun(RebarOut)-> + fun()-> + RebarOut = rebar("compile"), [ {"Exit after error", ?_assert(string:str(RebarOut, "ERROR: compile failed") =/= 0)} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebar-2.6.1+git20151013.5d73a8d/test/rebar_eunit_tests.erl new/rebar-2.6.1+git20160115.c534f8a/test/rebar_eunit_tests.erl --- old/rebar-2.6.1+git20151013.5d73a8d/test/rebar_eunit_tests.erl 2015-10-15 10:29:57.000000000 +0200 +++ new/rebar-2.6.1+git20160115.c534f8a/test/rebar_eunit_tests.erl 2016-01-17 18:25:38.000000000 +0100 @@ -56,7 +56,7 @@ ?_assert(string:str(RebarOut, "myapp_mymod:") =/= 0)}, {"Tests are only run once", - ?_assert(string:str(RebarOut, "All 2 tests passed") =/= 0)}] + ?_assert(string:str(RebarOut, "2 tests passed") =/= 0)}] end}. eunit_with_suites_and_tests_test_() -> @@ -80,7 +80,7 @@ ?_assert(string:str(RebarOut, "myapp_mymod:") =:= 0)}, {"Selected suite tests are only run once", - ?_assert(string:str(RebarOut, "All 4 tests passed") =/= 0)}] + ?_assert(string:str(RebarOut, "4 tests passed") =/= 0)}] end}, {"Ensure EUnit runs selected _tests suites", setup, fun() -> @@ -102,7 +102,7 @@ ?_assert(string:str(RebarOut, "myapp_mymod:") =:= 0)}, {"Selected suite tests are only run once", - ?_assert(string:str(RebarOut, "All 2 tests passed") =/= 0)}] + ?_assert(string:str(RebarOut, "2 tests passed") =/= 0)}] end}, {"Ensure EUnit runs a specific test defined in a selected suite", setup, fun() -> @@ -154,7 +154,7 @@ "myapp_mymod2_tests:myfunc2_test/0") =/= 0)]}, {"Selected suite tests are run once", - ?_assert(string:str(RebarOut, "All 3 tests passed") =/= 0)}] + ?_assert(string:str(RebarOut, "3 tests passed") =/= 0)}] end}, {"Ensure EUnit runs specific test in a _tests suite", setup, @@ -190,7 +190,7 @@ =/= 0)]}, {"Selected suite tests is run once", - ?_assert(string:str(RebarOut, "All 2 tests passed") =/= 0)}] + ?_assert(string:str(RebarOut, "2 tests passed") =/= 0)}] end}, {"Ensure EUnit runs a specific test by qualified function name", setup, @@ -325,7 +325,11 @@ assert_rebar_runs() -> prepare_rebar_script(), - ?assert(string:str(os:cmd(filename:nativename("./" ++ ?TMP_DIR ++ "rebar")), + {ok, Cwd} = file:get_cwd(), + ok = file:set_cwd(?TMP_DIR), + RebarOut = os:cmd(filename:nativename("./rebar")), + ok = file:set_cwd(Cwd), + ?assert(string:str(RebarOut, "No command to run specified!") =/= 0). basic_setup_test_() -> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebar-2.6.1+git20151013.5d73a8d/test/rebar_file_utils_tests.erl new/rebar-2.6.1+git20160115.c534f8a/test/rebar_file_utils_tests.erl --- old/rebar-2.6.1+git20151013.5d73a8d/test/rebar_file_utils_tests.erl 2015-10-15 10:29:57.000000000 +0200 +++ new/rebar-2.6.1+git20160115.c534f8a/test/rebar_file_utils_tests.erl 2016-01-17 18:25:38.000000000 +0100 @@ -36,7 +36,7 @@ -define(TMP_DIR, "tmp_file_utils"). --define(SRC, "source dir?"). +-define(SRC, "source dir"). -define(DST, "dest (dir)"). -define(FILE1, "file 1"). -define(FILE2, "file(2)"). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebar-2.6.1+git20151013.5d73a8d/test/rebar_xref_eunit.erl new/rebar-2.6.1+git20160115.c534f8a/test/rebar_xref_eunit.erl --- old/rebar-2.6.1+git20151013.5d73a8d/test/rebar_xref_eunit.erl 2015-10-15 10:29:57.000000000 +0200 +++ new/rebar-2.6.1+git20160115.c534f8a/test/rebar_xref_eunit.erl 2016-01-17 18:25:38.000000000 +0100 @@ -192,8 +192,8 @@ {unix, _} -> [] = os:cmd("chmod u+x " ++ Rebar); {win32, _} -> - {ok, _} = file:copy(?REBAR_SCRIPT ++ ".bat", - ?TMP_DIR ++ "rebar.bat") + {ok, _} = file:copy(?REBAR_SCRIPT ++ ".cmd", + ?TMP_DIR ++ "rebar.cmd") end. rebar() -> ++++++ spec.in ++++++ --- /var/tmp/diff_new_pack.Eqnsiz/_old 2016-01-20 09:55:20.000000000 +0100 +++ /var/tmp/diff_new_pack.Eqnsiz/_new 2016-01-20 09:55:20.000000000 +0100 @@ -19,7 +19,7 @@ %define obs OBS Name: PKGNAME -Version: 2.6.1+git20151013.5d73a8d +Version: 2.6.1+git20160115.c534f8a Release: 0 %define mod_ver %(echo "%{version}" | cut -d "+" -f1) Summary: A sophisticated build-tool for Erlang projects that follows OTP principles
