diff options
| author | Loïc Hoguin <[email protected]> | 2014-08-27 13:57:17 +0300 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2014-08-27 13:57:17 +0300 |
| commit | 31621cba0265ed8e5cf9f48c698eaae3d8292b4f (patch) | |
| tree | ec57a1ccdf63138037fa2ff9eda8338200a49464 | |
| parent | 39670a51834e74d5eb8b91c5e9cc0e28810e5831 (diff) | |
| parent | 496080e4e8d2431e7c3984c693beeda32ae44af9 (diff) | |
| download | erlang.mk-31621cba0265ed8e5cf9f48c698eaae3d8292b4f.tar.gz erlang.mk-31621cba0265ed8e5cf9f48c698eaae3d8292b4f.tar.bz2 erlang.mk-31621cba0265ed8e5cf9f48c698eaae3d8292b4f.zip | |
Merge branch 'master' of git://github.com/a12n/erlang.mk
| -rw-r--r-- | core/deps.mk | 3 | ||||
| -rw-r--r-- | erlang.mk | 3 | ||||
| -rw-r--r-- | packages.v1.tsv | 1 | ||||
| -rw-r--r-- | packages.v1.txt | 1 | ||||
| -rw-r--r-- | packages.v2.tsv | 1 |
5 files changed, 9 insertions, 0 deletions
diff --git a/core/deps.mk b/core/deps.mk index cfb432d..c36083c 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -46,6 +46,9 @@ define dep_fetch if [ "$$$$VS" = "git" ]; then \ git clone -n -- $$$$REPO $(DEPS_DIR)/$(1); \ cd $(DEPS_DIR)/$(1) && git checkout -q $$$$COMMIT; \ + elif [ "$$$$VS" = "hg" ]; then \ + hg clone -U $$$$REPO $(DEPS_DIR)/$(1); \ + cd $(DEPS_DIR)/$(1) && hg update -q $$$$COMMIT; \ else \ echo "Unknown or invalid dependency: $(1). Please consult the erlang.mk README for instructions." >&2; \ exit 78; \ @@ -114,6 +114,9 @@ define dep_fetch if [ "$$$$VS" = "git" ]; then \ git clone -n -- $$$$REPO $(DEPS_DIR)/$(1); \ cd $(DEPS_DIR)/$(1) && git checkout -q $$$$COMMIT; \ + elif [ "$$$$VS" = "hg" ]; then \ + hg clone -U $$$$REPO $(DEPS_DIR)/$(1); \ + cd $(DEPS_DIR)/$(1) && hg update -q $$$$COMMIT; \ else \ echo "Unknown or invalid dependency: $(1). Please consult the erlang.mk README for instructions." >&2; \ exit 78; \ diff --git a/packages.v1.tsv b/packages.v1.tsv index 56c00bc..1902df9 100644 --- a/packages.v1.tsv +++ b/packages.v1.tsv @@ -7,6 +7,7 @@ cowlib https://github.com/ninenines/cowlib http://ninenines.eu Support library f ebitly https://github.com/inaka/ebitly.git http://inaka.github.com/ebitly Bit.ly API wrapper for Erlang edis https://github.com/inaka/edis.git http://inaka.github.com/edis/ An Erlang implementation of Redis KV Store eganglia https://github.com/inaka/eganglia.git https://github.com/inaka/eganglia.git Erlang library to interact with Ganglia +ehsa https://bitbucket.org/a12n/ehsa https://bitbucket.org/a12n/ehsa Erlang HTTP server basic and digest authentication modules elvis https://github.com/inaka/elvis.git https://github.com/inaka/elvis.git Erlang Style Reviewer eper https://github.com/massemanet/eper https://github.com/massemanet/eper Erlang performance and debugging tools. epgsql https://github.com/epgsql/epgsql https://github.com/epgsql/epgsql Erlang PostgreSQL client library. diff --git a/packages.v1.txt b/packages.v1.txt index 56c00bc..1902df9 100644 --- a/packages.v1.txt +++ b/packages.v1.txt @@ -7,6 +7,7 @@ cowlib https://github.com/ninenines/cowlib http://ninenines.eu Support library f ebitly https://github.com/inaka/ebitly.git http://inaka.github.com/ebitly Bit.ly API wrapper for Erlang edis https://github.com/inaka/edis.git http://inaka.github.com/edis/ An Erlang implementation of Redis KV Store eganglia https://github.com/inaka/eganglia.git https://github.com/inaka/eganglia.git Erlang library to interact with Ganglia +ehsa https://bitbucket.org/a12n/ehsa https://bitbucket.org/a12n/ehsa Erlang HTTP server basic and digest authentication modules elvis https://github.com/inaka/elvis.git https://github.com/inaka/elvis.git Erlang Style Reviewer eper https://github.com/massemanet/eper https://github.com/massemanet/eper Erlang performance and debugging tools. epgsql https://github.com/epgsql/epgsql https://github.com/epgsql/epgsql Erlang PostgreSQL client library. diff --git a/packages.v2.tsv b/packages.v2.tsv index 6aca3fe..5c335d0 100644 --- a/packages.v2.tsv +++ b/packages.v2.tsv @@ -7,6 +7,7 @@ cowlib git https://github.com/ninenines/cowlib 1.0.0 http://ninenines.eu Support ebitly git https://github.com/inaka/ebitly.git 0.0.1 http://inaka.github.com/ebitly Bit.ly API wrapper for Erlang edis git https://github.com/inaka/edis.git 0.2.0 http://inaka.github.com/edis/ An Erlang implementation of Redis KV Store eganglia git https://github.com/inaka/eganglia.git 0.9.1 https://github.com/inaka/eganglia.git Erlang library to interact with Ganglia +ehsa hg https://bitbucket.org/a12n/ehsa 2.0.4 https://bitbucket.org/a12n/ehsa Erlang HTTP server basic and digest authentication modules elvis git https://github.com/inaka/elvis.git 0.1.0-alpha https://github.com/inaka/elvis.git Erlang Style Reviewer eper git https://github.com/massemanet/eper master https://github.com/massemanet/eper Erlang performance and debugging tools. epgsql git https://github.com/epgsql/epgsql master https://github.com/epgsql/epgsql Erlang PostgreSQL client library. |