couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [10/45] mochiweb commit: updated refs/heads/master to cb521b3
Date Tue, 25 Aug 2015 17:38:28 GMT
upgrade rebar to v2.5.0 and upgrade app template #131


Project: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/commit/9090c794
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/tree/9090c794
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/diff/9090c794

Branch: refs/heads/master
Commit: 9090c7942f9dcde4ddbf9f78429e289ff5600c18
Parents: 5a01be4
Author: Bob Ippolito <bob@redivi.com>
Authored: Tue Jun 24 12:50:36 2014 -0700
Committer: Bob Ippolito <bob@redivi.com>
Committed: Tue Jun 24 12:50:36 2014 -0700

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 CHANGES.md                                      |   4 +++-
 Makefile                                        |  11 ++-------
 rebar                                           | Bin 95259 -> 159782 bytes
 scripts/new_mochiweb.erl                        |  23 -------------------
 src/mochiweb.app.src                            |   2 +-
 .../mochiwebapp_skel/src/mochiapp_web.erl       |   3 +--
 support/templates/mochiwebapp_skel/start-dev.sh |   9 ++++----
 8 files changed, 13 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/9090c794/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 8f4edf4..bb59f19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 .DS_Store
 /TEST-*.xml
 /deps
+/.rebar
 *.swp
 *.beam
 *.dump

http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/9090c794/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
index 89c8078..1cd02e6 100644
--- 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
 

http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/9090c794/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index b94be4b..6ee073d 100644
--- 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)

http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/9090c794/rebar
----------------------------------------------------------------------
diff --git a/rebar b/rebar
index 8082f14..0d1980b 100755
Binary files a/rebar and b/rebar differ

http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/9090c794/scripts/new_mochiweb.erl
----------------------------------------------------------------------
diff --git a/scripts/new_mochiweb.erl b/scripts/new_mochiweb.erl
deleted file mode 100755
index f49ed39..0000000
--- a/scripts/new_mochiweb.erl
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env escript
-%% -*- mode: erlang -*-
--export([main/1]).
-
-%% External API
-
-main(_) ->
-    usage().
-
-%% Internal API
-
-usage() ->
-    io:format(
-        "new_mochiweb.erl has been replaced by a rebar template!\n"
-        "\n"
-        "To create a new mochiweb using project:\n"
-        "   make app PROJECT=project_name\n"
-        "\n"
-        "To create a new mochiweb using project in a specific directory:\n"
-        "   make app PROJECT=project_name PREFIX=$HOME/projects/\n"
-        "\n"
-    ),
-    halt(1).

http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/9090c794/src/mochiweb.app.src
----------------------------------------------------------------------
diff --git a/src/mochiweb.app.src b/src/mochiweb.app.src
index b3b3d83..7c98141 100644
--- 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, []},

http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/9090c794/support/templates/mochiwebapp_skel/src/mochiapp_web.erl
----------------------------------------------------------------------
diff --git a/support/templates/mochiwebapp_skel/src/mochiapp_web.erl b/support/templates/mochiwebapp_skel/src/mochiapp_web.erl
index 8976265..5fe455a 100644
--- 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

http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/9090c794/support/templates/mochiwebapp_skel/start-dev.sh
----------------------------------------------------------------------
diff --git a/support/templates/mochiwebapp_skel/start-dev.sh b/support/templates/mochiwebapp_skel/start-dev.sh
index fb7c45e..65c1692 100755
--- 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


Mime
View raw message