THRIFT-1227 - erlang implementation of thrift json protocol

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1172199 13f79535-47bb-0310-9956-ffa450edef68

lib/erl/Makefile.am

@@ -28,6 +28,7 @@ THRIFT_FILES = $(wildcard ../../test/*.thrift) \
 	touch .generated
 
 all: .generated
+	./rebar get-deps
 	./rebar compile
 
 check: .generated
@@ -46,10 +47,8 @@ uninstall:
 	rm -rf $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)
 
 clean:
-	rm .generated
 	./rebar clean
-
-maintainer-clean-local:
+	rm .generated
 	rm -f test/secondService_* \
 		  test/aService_* \
 		  test/serviceForExceptionWithAMap_* \
@@ -73,8 +72,11 @@ maintainer-clean-local:
 		  test/optionalRequiredTest_* \
 		  test/yowza_* \
 		  test/reverseOrderService_*
+	./rebar clean
+
+maintainer-clean-local:
 	rm -rf ebin
 
-EXTRA_DIST = include src rebar rebar.config
+EXTRA_DIST = include src rebar rebar.config test
 
 MAINTAINERCLEANFILES = Makefile.in

lib/erl/README

@@ -41,3 +41,8 @@ ok
 {ok,ok}
 8> {C7, R7} = (catch thrift_client:call(C6, testException, ["Xception"])), R7.
 {exception,{xception,1001,<<"Xception">>}}
+
+Notes
+=====
+To use the JSON protocol client, you will need jsx.  This will be pulled in
+via rebar for building but not automatically installed by make install.

lib/erl/rebar.config

@@ -1,3 +1,5 @@
 {erl_opts, [debug_info]}.
-% {pre_hooks, [{compile, "./scripts/rebar-pre-compile"},
-%             {clean, "./scripts/rebar-clean"}]}.
+{lib_dirs, ["deps"]}.
+{deps, [
+         { jsx, "0.9.0", {git, "git://github.com/talentdeficit/jsx.git", {tag, "v0.9.0"}}}
+       ]}.