upgrade rebar to v2.5.0 and upgrade app template mochi#131

jdhood1 · Jun 24, 2014 · 9090c79 · 9090c79
1 parent 5a01be4
commit 9090c79
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 .DS_Store
 /TEST-*.xml
 /deps
+/.rebar
 *.swp
 *.beam
 *.dump
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,7 +1,9 @@
-Version 2.8.1 released XXXX-XX-XX
+Version 2.9.0 released 2014-06-24
 
 * Increased timeout in test suite for FreeBSD
   https://github.com/mochi/mochiweb/pull/121
+* Updated rebar to v2.5.0 and fixed associated build issues
+  https://github.com/mochi/mochiweb/issues/131
 
 Version 2.8.0 released 2014-01-01
 

diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ REBAR=./rebar
 .PHONY: all edoc test clean build_plt dialyzer app
 
 all:
-	@$(REBAR) get-deps compile
+	@$(REBAR) -r get-deps compile
 
 edoc:
 	@$(REBAR) doc
@@ -19,12 +19,5 @@ test:
 clean:
 	@$(REBAR) clean
 
-build_plt:
-	@$(REBAR) build-plt
-
-dialyzer:
-	@$(REBAR) dialyze
-
 app:
-	@$(REBAR) create template=mochiwebapp dest=$(DEST) appid=$(PROJECT)
-
+	@$(REBAR) -r create template=mochiwebapp dest=$(DEST) appid=$(PROJECT)
diff --git a/rebar b/rebar
diff --git a/scripts/new_mochiweb.erl b/scripts/new_mochiweb.erl
diff --git a/src/mochiweb.app.src b/src/mochiweb.app.src
@@ -1,7 +1,7 @@
 %% This is generated from src/mochiweb.app.src
 {application, mochiweb,
  [{description, "MochiMedia Web Server"},
-  {vsn, "2.8.1"},
+  {vsn, "2.9.0"},
   {modules, []},
   {registered, []},
   {env, []},

diff --git a/support/templates/mochiwebapp_skel/src/mochiapp_web.erl b/support/templates/mochiwebapp_skel/src/mochiapp_web.erl
@@ -44,9 +44,8 @@ loop(Req, DocRoot) ->
                       {type, Type}, {what, What},
                       {trace, erlang:get_stacktrace()}],
             error_logger:error_report(Report),
-            %% NOTE: mustache templates need \\ because they are not awesome.
             Req:respond({500, [{"Content-Type", "text/plain"}],
-                         "request failed, sorry\\n"})
+                         "request failed, sorry\n"})
     end.
 
 %% Internal API

diff --git a/support/templates/mochiwebapp_skel/start-dev.sh b/support/templates/mochiwebapp_skel/start-dev.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
-# NOTE: mustache templates need \\ because they are not awesome.
-exec erl -pa ebin edit deps/*/ebin -boot start_sasl \\
-    -sname {{appid}}_dev \\
-    -s {{appid}} \\
+exec erl \
+    -pa ebin deps/*/ebin \
+    -boot start_sasl \
+    -sname {{appid}}_dev \
+    -s {{appid}} \
     -s reloader
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     .DS_Store
     /TEST-*.xml
     /deps
+    /.rebar
     *.swp
     *.beam
     *.dump