aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2015-01-04 20:34:38 +0100
committerLoïc Hoguin <[email protected]>2015-01-04 20:34:38 +0100
commitd36a769e7c8639d8f3431fbc1848830c1aaf9650 (patch)
tree2658b675554c779c270f16d2a450784c1997cfed
parent7ed33d7427a0a33bc80bd588dd9f64e5f312a1b2 (diff)
parent4197e19f189ef2c6982987423fd3f55fb615736e (diff)
downloaderlang.mk-d36a769e7c8639d8f3431fbc1848830c1aaf9650.tar.gz
erlang.mk-d36a769e7c8639d8f3431fbc1848830c1aaf9650.tar.bz2
erlang.mk-d36a769e7c8639d8f3431fbc1848830c1aaf9650.zip
Merge branch 'subversion' of https://github.com/cjsv/erlang.mk
-rw-r--r--README.md11
-rw-r--r--core/deps.mk2
-rw-r--r--erlang.mk2
3 files changed, 15 insertions, 0 deletions
diff --git a/README.md b/README.md
index 583462c..a9ac8af 100644
--- a/README.md
+++ b/README.md
@@ -115,6 +115,17 @@ dep_cowboy = git https://github.com/ninenines/cowboy 1.0.0
They will always be compiled using the command `make`. If the dependency
does not feature a Makefile, then erlang.mk will be used for building.
+For subversion dependencies, the url specifies trunk, branch or
+tag. To specify a particular revision, use `@revision` at the end of
+the url. No separate specification of branch, tag, or revision is
+required or possible.
+
+``` erlang
+DEPS = ex1 ex2
+dep_ex1 = svn https://example.com/svn/trunk/project/ex1
+dep_ex2 = svn svn://example.com/svn/branches/erlang-proj/ex2@264
+```
+
You can also specify test-only dependencies. These dependencies will only
be downloaded when running `make tests`. The format is the same as above,
except the variable `TEST_DEPS` holds the list of test-only dependencies.
diff --git a/core/deps.mk b/core/deps.mk
index 80bedda..7d4b974 100644
--- a/core/deps.mk
+++ b/core/deps.mk
@@ -49,6 +49,8 @@ define dep_fetch
elif [ "$$$$VS" = "hg" ]; then \
hg clone -U $$$$REPO $(DEPS_DIR)/$(1); \
cd $(DEPS_DIR)/$(1) && hg update -q $$$$COMMIT; \
+ elif [ "$$$$VS" = "svn" ]; then \
+ svn checkout $$$$REPO $(DEPS_DIR)/$(1); \
else \
echo "Unknown or invalid dependency: $(1). Please consult the erlang.mk README for instructions." >&2; \
exit 78; \
diff --git a/erlang.mk b/erlang.mk
index fa52243..ff5042c 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -135,6 +135,8 @@ define dep_fetch
elif [ "$$$$VS" = "hg" ]; then \
hg clone -U $$$$REPO $(DEPS_DIR)/$(1); \
cd $(DEPS_DIR)/$(1) && hg update -q $$$$COMMIT; \
+ elif [ "$$$$VS" = "svn" ]; then \
+ svn checkout $$$$REPO $(DEPS_DIR)/$(1); \
else \
echo "Unknown or invalid dependency: $(1). Please consult the erlang.mk README for instructions." >&2; \
exit 78; \