From efda70e73aa80399377613b05d93ac208ca687fd Mon Sep 17 00:00:00 2001 From: Christophe Romain Date: Tue, 5 Jan 2016 16:00:47 +0100 Subject: [PATCH] Update dependencies --- rebar.config | 47 ++++++++++----------- tools/set-dep-versions | 92 ------------------------------------------ 2 files changed, 24 insertions(+), 115 deletions(-) delete mode 100755 tools/set-dep-versions diff --git a/rebar.config b/rebar.config index 62b44d13a..4036dc221 100644 --- a/rebar.config +++ b/rebar.config @@ -7,30 +7,31 @@ %%% Created : 1 May 2013 by Evgeniy Khramtsov %%%------------------------------------------------------------------- -{deps, [{if_var_true, lager, {lager, ".*", {git, "git://github.com/basho/lager"}}}, - {if_var_false, lager, {p1_logger, ".*", {git, "git://github.com/processone/p1_logger"}}}, - {cache_tab, ".*", {git, "git://github.com/processone/cache_tab", {tag, "1.0.1"}}}, - {p1_tls, ".*", {git, "https://github.com/processone/tls"}}, - {p1_stringprep, ".*", {git, "git://github.com/processone/stringprep"}}, - {p1_xml, ".*", {git, "https://github.com/processone/xml"}}, - {esip, ".*", {git, "git://github.com/processone/p1_sip"}}, - {p1_stun, ".*", {git, "git://github.com/processone/stun"}}, - {p1_yaml, ".*", {git, "git://github.com/processone/p1_yaml"}}, - {p1_utils, ".*", {git, "git://github.com/processone/p1_utils"}}, - {jiffy, ".*", {git, "git://github.com/davisp/jiffy"}}, - {oauth2, ".*", {git, "https://github.com/prefiks/oauth2.git"}}, - {xmlrpc, ".*", {git, "git://github.com/rds13/xmlrpc"}}, - {if_var_true, mysql, {p1_mysql, ".*", {git, "git://github.com/processone/mysql"}}}, - {if_var_true, pgsql, {p1_pgsql, ".*", {git, "git://github.com/processone/pgsql"}}}, - {if_var_true, sqlite, {sqlite3, ".*", {git, "git://github.com/alexeyr/erlang-sqlite3"}}}, - {if_var_true, pam, {p1_pam, ".*", {git, "git://github.com/processone/epam"}}}, - {if_var_true, zlib, {p1_zlib, ".*", {git, "git://github.com/processone/zlib"}}}, - {if_var_true, riak, {riakc, ".*", {git, "git://github.com/basho/riak-erlang-client"}}}, - {if_var_true, elixir, {rebar_elixir_plugin, ".*", {git, "git@github.com:processone/rebar_elixir_plugin.git"}}}, - {if_var_true, elixir, {elixir, ".*", {git, "git://github.com/elixir-lang/elixir", {branch, "v1.0"}}}}, - {if_var_true, iconv, {p1_iconv, ".*", {git, "git://github.com/processone/eiconv"}}}, +{deps, [{if_var_true, lager, {lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.0.2"}}}}, + {if_var_false, lager, {p1_logger, ".*", {git, "https://github.com/processone/p1_logger", {tag, "1.0.0"}}}}, + {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.2"}}}, + {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.1"}}}, + {p1_tls, ".*", {git, "https://github.com/processone/tls", {tag, "1.0.0"}}}, + {p1_stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.0"}}}, + {p1_xml, ".*", {git, "https://github.com/processone/xml", {tag, "1.1.1"}}}, + {p1_stun, ".*", {git, "https://github.com/processone/stun", "0.9.0"}}, + {esip, ".*", {git, "https://github.com/processone/p1_sip", "1.0.0"}}, + {p1_yaml, ".*", {git, "https://github.com/processone/p1_yaml", {tag, "1.0.0"}}}, + {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.5"}}}, + {oauth2, ".*", {git, "https://github.com/kivra/oauth2", "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8"}}, + {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc", {tag, "1.15"}}}, + {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/mysql", {tag, "1.0.0"}}}}, + {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/pgsql", {tag, "1.0.0"}}}}, + {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/alexeyr/erlang-sqlite3", "cbc3505f7a131254265d3ef56191b2581b8cc172"}}}, + {if_var_true, pam, {p1_pam, ".*", {git, "https://github.com/processone/epam", {tag, "1.0.0"}}}}, + {if_var_true, zlib, {p1_zlib, ".*", {git, "https://github.com/processone/zlib", {tag, "1.0.0"}}}}, + {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang", "908a24fda4a46776a5135db60ca071e3d783f9f6"}}}, % for riak_pb-2.1.0.7 + {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", "527722d12d0433b837cdb92a60900c2cb5df8942"}}}, + {if_var_true, elixir, {rebar_elixir_plugin, ".*", {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}, + {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", {tag, "v1.1.0"}}}}, + {if_var_true, iconv, {p1_iconv, ".*", {git, "https://github.com/processone/eiconv", {tag, "0.9.0"}}}}, {if_var_true, tools, {meck, "0.8.2", {git, "https://github.com/eproxus/meck", {tag, "0.8.2"}}}}, - {if_var_true, redis, {eredis, ".*", {git, "git://github.com/wooga/eredis"}}}]}. + {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis", {tag, "v1.0.8"}}}}]}. {if_var_true, latest_deps, {floating_deps, [p1_logger, diff --git a/tools/set-dep-versions b/tools/set-dep-versions deleted file mode 100755 index 3681def22..000000000 --- a/tools/set-dep-versions +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh - -set -e -set -u - -export PATH="/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:$PATH" - -deps_dir='deps' -rebar_script='rebar.config' -temp_file=$(mktemp "$rebar_script.XXXXXX") - -trap 'rm -f $temp_file' EXIT INT TERM - -die() -{ - echo >&2 "FATAL: $@." - exit 1 -} - -get_dep_list() -{ - sed -n ' - /.*{ *\([^,]*\),[^,]*, *{ *git, *"\([^"]*\)" *} *}.*/ { - s//\1,\2,master/ - p - } - /.*{ *\([^,]*\),[^,]*, *{ *git, *"\([^"]*\)" *, *{ *branch, *"\([^"]*\)".*/ { - s//\1,\2,\3/ - p - }' "$rebar_script" -} - -get_dep_name() -{ - printf '%s' "${1%%,*}" -} - -get_dep_url() -{ - dep_url=${1#*,} - dep_url=${dep_url%,*} - - printf '%s' "$dep_url" -} - -get_dep_branch() -{ - printf '%s' "${1##*,}" -} - -get_dep_rev() -{ - dep_name=$(get_dep_name "$1") - dep_dir="$deps_dir/$dep_name" - - test -d "$dep_dir" || clone_repo "$dep" - cd "$dep_dir" - printf '%s' "$(git rev-parse --verify HEAD)" - cd "$OLDPWD" -} - -clone_repo() -{ - dep_name=$(get_dep_name "$1") - dep_url=$(get_dep_url "$1") - dep_branch=$(get_dep_branch "$1") - - cd "$deps_dir" - git clone -q -b "$dep_branch" "$dep_url" "$dep_name" - cd "$OLDPWD" -} - -edit_rebar_script() -{ - dep_name=$(get_dep_name "$1") - dep_url=$(get_dep_url "$1") - dep_rev=$(get_dep_rev "$1") - - echo "Using revision $dep_rev of $dep_name" - sed -e "s|\"$dep_url\".*{ *branch[^}]*} *}|\"$dep_url\", \"$dep_rev\"}|" \ - -e "s|\"$dep_url\"[^}]*}|\"$dep_url\", \"$dep_rev\"}|" \ - "$rebar_script" >"$temp_file" - mv "$temp_file" "$rebar_script" -} - -test -e "$rebar_script" || die 'Please change to ejabberd source directory' -test -d "$deps_dir" || mkdir -p "$deps_dir" - -for dep in $(get_dep_list) -do - edit_rebar_script "$dep" -done -- 2.49.0