aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2015-05-14 18:50:05 +0300
committerLoïc Hoguin <[email protected]>2015-05-14 18:50:05 +0300
commitc0c2863a21a2eee46c69e5a2ce275c91aa2f2ba3 (patch)
tree2dc6049c8dfe2279163ba0cc023dd46e0a58559b
parenta34d21e62d3b53c149882e1307f3f77def89c918 (diff)
downloaderlang.mk-c0c2863a21a2eee46c69e5a2ce275c91aa2f2ba3.tar.gz
erlang.mk-c0c2863a21a2eee46c69e5a2ce275c91aa2f2ba3.tar.bz2
erlang.mk-c0c2863a21a2eee46c69e5a2ce275c91aa2f2ba3.zip
Add package json to the index
This commit also fixes dependencies which have no Makefile and are not Erlang projects. The detection of Erlang project is a little naive at the moment but works. We can refine it later on if needed.
-rw-r--r--core/deps.mk10
-rw-r--r--packages.v1.tsv1
-rw-r--r--packages.v1.txt1
-rw-r--r--packages.v2.tsv1
4 files changed, 12 insertions, 1 deletions
diff --git a/core/deps.mk b/core/deps.mk
index 103426d..4a9c9ac 100644
--- a/core/deps.mk
+++ b/core/deps.mk
@@ -66,7 +66,11 @@ define dep_autopatch
$(call dep_autopatch_erlang_mk,$(1)); \
fi \
else \
- $(call dep_autopatch2,$(1)); \
+ if [ ! -d $(DEPS_DIR)/$(1)/src/ ]; then \
+ $(call dep_autopatch_noop,$(1)); \
+ else \
+ $(call dep_autopatch2,$(1)); \
+ fi \
fi
endef
@@ -78,6 +82,10 @@ define dep_autopatch2
fi
endef
+define dep_autopatch_noop
+ printf "noop:\n" > $(DEPS_DIR)/$(1)/Makefile
+endef
+
# Overwrite erlang.mk with the current file by default.
ifeq ($(NO_AUTOPATCH_ERLANG_MK),)
define dep_autopatch_erlang_mk
diff --git a/packages.v1.tsv b/packages.v1.tsv
index b748b70..092134c 100644
--- a/packages.v1.tsv
+++ b/packages.v1.tsv
@@ -65,6 +65,7 @@ jiffy https://github.com/davisp/jiffy https://github.com/davisp/jiffy JSON NIFs
jiffy_v https://github.com/shizzard/jiffy-v https://github.com/shizzard/jiffy-v JSON validation utility
jobs https://github.com/esl/jobs https://github.com/esl/jobs a Job scheduler for load regulation
joxa https://github.com/joxa/joxa https://github.com/joxa/joxa A Modern Lisp for the Erlang VM
+json https://github.com/talentdeficit/json https://github.com/talentdeficit/json a high level json library for erlang (17.0+)
jsx https://github.com/talentdeficit/jsx https://github.com/talentdeficit/jsx An Erlang application for consuming, producing and manipulating JSON.
katja https://github.com/nifoc/katja https://github.com/nifoc/katja A simple Riemann client written in Erlang.
kjell https://github.com/karlll/kjell https://github.com/karlll/kjell Erlang Shell
diff --git a/packages.v1.txt b/packages.v1.txt
index b748b70..092134c 100644
--- a/packages.v1.txt
+++ b/packages.v1.txt
@@ -65,6 +65,7 @@ jiffy https://github.com/davisp/jiffy https://github.com/davisp/jiffy JSON NIFs
jiffy_v https://github.com/shizzard/jiffy-v https://github.com/shizzard/jiffy-v JSON validation utility
jobs https://github.com/esl/jobs https://github.com/esl/jobs a Job scheduler for load regulation
joxa https://github.com/joxa/joxa https://github.com/joxa/joxa A Modern Lisp for the Erlang VM
+json https://github.com/talentdeficit/json https://github.com/talentdeficit/json a high level json library for erlang (17.0+)
jsx https://github.com/talentdeficit/jsx https://github.com/talentdeficit/jsx An Erlang application for consuming, producing and manipulating JSON.
katja https://github.com/nifoc/katja https://github.com/nifoc/katja A simple Riemann client written in Erlang.
kjell https://github.com/karlll/kjell https://github.com/karlll/kjell Erlang Shell
diff --git a/packages.v2.tsv b/packages.v2.tsv
index 3dbf360..359a476 100644
--- a/packages.v2.tsv
+++ b/packages.v2.tsv
@@ -65,6 +65,7 @@ jiffy git https://github.com/davisp/jiffy master https://github.com/davisp/jiffy
jiffy_v git https://github.com/shizzard/jiffy-v 0.3.3 https://github.com/shizzard/jiffy-v JSON validation utility
jobs git https://github.com/esl/jobs 0.3 https://github.com/esl/jobs a Job scheduler for load regulation
joxa git https://github.com/joxa/joxa master https://github.com/joxa/joxa A Modern Lisp for the Erlang VM
+json git https://github.com/talentdeficit/json master https://github.com/talentdeficit/json a high level json library for erlang (17.0+)
jsx git https://github.com/talentdeficit/jsx master https://github.com/talentdeficit/jsx An Erlang application for consuming, producing and manipulating JSON.
katja git https://github.com/nifoc/katja master https://github.com/nifoc/katja A simple Riemann client written in Erlang.
kjell git https://github.com/karlll/kjell master https://github.com/karlll/kjell Erlang Shell