Commits

dizzyd  committed 4109e74

Removing Emakefile; reworking Makefile to use rebar (partially done)

  • Participants
  • Parent commits 6c966fd

Comments (0)

Files changed (3)

File Emakefile

-% -*- mode: erlang -*-
-{["src/gen_server2.erl", "src/*"], 
- [{i, "include"},
-  {outdir, "ebin"},
-  debug_info]
-}.
-ERL          ?= erl
-EBIN_DIRS    := $(wildcard deps/*/ebin)
-APP          := riak
 
-all:  webmachine erl 
+all: compile
 
-erl: ebin/$(APP).app
-	@$(ERL) -pa ebin -pa $(EBIN_DIRS) -noinput +B \
-	  -eval 'case make:all() of up_to_date -> halt(0); error -> halt(1) end.'
-
-webmachine:
-	@(cd deps/webmachine;$(MAKE))
-
-docs:
-	@erl -noshell -run edoc_run application '$(APP)' '"."' '[]'
-	@cp -r doc/* www/edoc
-	@cp README www/
-	@cp LICENSE www/
-	@cp TODO www/
-
-reldocs: docs
-	@cd client_lib/java && make javadoc && \
-		cp -r javadoc/* ../../www/java_client_api
-
+compile:
+	./rebar compile
 
 clean:
-	@echo "removing:"
-	@rm -fv ebin/*.beam ebin/*.app
+	./rebar clean
 
-ebin/$(APP).app: src/$(APP).app.src
-	@echo "generating ebin/riak.app"
-	@bash scripts/make_appfile.sh >ebin/riak.app	
+# docs:
+# 	@erl -noshell -run edoc_run application '$(APP)' '"."' '[]'
+# 	@cp -r doc/* www/edoc
+# 	@cp README www/
+# 	@cp LICENSE www/
+# 	@cp TODO www/
 
-dialyzer: erl 
-	@dialyzer -Wno_return -c ebin/ | tee priv/log/dialyzer.log
+# reldocs: docs
+# 	@cd client_lib/java && make javadoc && \
+# 		cp -r javadoc/* ../../www/java_client_api
 
-test: erl
-	scripts/run_tests.escript ebin | tee test.log
 
+
+# dialyzer: compile
+# 	@dialyzer -Wno_return -c ebin/ | tee priv/log/dialyzer.log
+
+# test: compile
+# 	scripts/run_tests.escript ebin | tee test.log
+

File scripts/make_appfile.sh

-#!/bin/bash
-prefix=""
-modules=$(
-    for f in $(ls src/*.erl); do 
-        echo -n "$prefix'$(basename $f .erl)'"
-        prefix=", "
-    done)
-sed "s/__MODULES__/$modules/g" <src/riak.app.src