Merge pull request #1980 from utkarshkukreti/erlang-18

Upgrade to Erlang 18

frameworks/Erlang/chicagoboss/boss.config

@@ -303,6 +303,95 @@
     {dummy, true}
   ]},
 
+%%%%%%%%%%%%%%%
+%% Webserver %%
+%%%%%%%%%%%%%%%
+
+{simple_bridge, [
+
+    %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+    %% STANDARD SETTINGS
+    %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+    {server_name, boss_webserver},
+    %% You can call this whatever you want. Name it after your application
+    %% is probably best
+
+    {handler, boss_simple_bridge_handler},
+    %% the name of the simple_bridge handler module, which is expected to
+    %% export run/1, ws_init/1, ws_message/1, ws_info/1, and terminate/1
+
+    {backend, cowboy},
+    %% cowboy | inets | mochiweb | webmachine | yaws
+    %% It's not necessary to specify this in the confiugration unless you
+    %% want to start simple_bridge with application:start(simple_bridge) or
+    %% simple_bridge:start/0
+
+    {address, "127.0.0.1"},
+    %% IP address to bind, either in tuple format or string
+    %% use "0.0.0.0" to start on all interfaces available
+
+    {port, 8080},
+    %% Port to bind
+
+    {document_root, "./priv/static"},
+    %% The path on the local machine to handle static files
+
+    {static_paths, ["js/"]},
+    %% The list of paths to be automatically translated to static paths by
+    %% simple_bridge
+
+    %% {anchor, AnchorModule},
+    %% If not provided or set to undefined, will use
+    %% BACKEND_simple_bridge_anchor. This is the backend-specific module
+    %% for handling the requests from your chosen backend.
+
+    %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+    %% FILE UPLOAD SETTINGS
+    %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+    {max_post_size, 100},
+    %% No multipart request greater than above will be accepted. Units are
+    %% MB
+
+    {max_file_size, 100},
+    %% No single uploaded file will be accepted greater than  the above.
+    %% Units are MB.
+
+    {max_file_in_memory_size,  0},
+    %% If a file is less than the above, then instead of writing the file
+    %% to disk, it'll be retained in memory and can be retrieved by
+    %% sb_uploaded_file:data/1. See the README for more info.
+
+    {scratch_dir, "./scratch"},
+    %% This is the location of the temp directory where uploaded files will
+    %% be placed.
+
+    %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+    %% BACKEND-SPECIFIC DISPATCH TABLES:
+    %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+    %% {webmachine_dispatch, DispatchTable},
+    %% Webmachine dispatch table override (ignores static_paths above)
+
+    %% {webmachine_dispatch_fun, {Module, Function}},
+    %% A Module:Function() that when evaluated will return a dispatch table
+    %% for Webmachine, again ignores the static_paths above
+
+    %% {cowboy_dispatch, DispatchTable},
+    %% Cowboy dispatch table override (ignores static_paths)
+
+    {cowboy_dispatch_fun, {boss_cowboy_dispacher, build_and_compile}},
+    %% A Module:Function() that when evaluated will return a dispatch table
+    %% for Cowboy, again ignoring the static_paths above. You'll likely
+    %% want to add a dispatch rule pointing at the standard simple_bridge
+    %% anchor (unless you're using your own custom anchor):
+    %%
+    %%      {'_', cowboy_simple_bridge_anchor,[]}
+
+    {dummy, true}
+]},
+
 %% APPLICATION CONFIGURATIONS
 
 %% domains - A list of domains to serve the application on

frameworks/Erlang/chicagoboss/rebar.config

@@ -1,5 +1,5 @@
 {deps, [
-  {boss, ".*", {git, "git://github.com/ChicagoBoss/ChicagoBoss.git", {tag, "v0.8.19"}}}
+  {boss, ".*", {git, "git://github.com/ChicagoBoss/ChicagoBoss.git", {tag, "v0.9.pre-alpha-2"}}}
 ]}.
 {plugin_dir, ["priv/rebar"]}.
 {plugins, [boss_plugin]}.

frameworks/Erlang/cowboy/rebar.config

@@ -2,6 +2,6 @@
  [
   {jiffy, ".*", {git, "https://github.com/davisp/jiffy.git", {tag, "0.8.5"}}},
   {mimetypes, ".*", {git, "http://github.com/spawngrid/mimetypes.git", {branch, master}}},
-  {emysql, ".*", {git, "https://github.com/Eonblast/Emysql.git"}},
+  {emysql, ".*", {git, "https://github.com/deadtrickster/Emysql.git", "52b802098322aad372198b9f5fa9ae9a4c758ad1"}},
   {cowboy, ".*", {git, "https://github.com/extend/cowboy.git", {tag, "0.8.3"}}}
  ]}.

frameworks/Erlang/elli/rebar.config

@@ -1,6 +1,6 @@
 {deps,
  [
   {jiffy, ".*", {git, "https://github.com/davisp/jiffy.git", {tag, "0.13.3"}}},
-  {emysql, ".*", {git, "https://github.com/Eonblast/Emysql.git"}},
-  {elli, "", {git, "git://github.com/knutin/elli.git", {tag, "v1.0.3"}}}
+  {emysql, ".*", {git, "https://github.com/deadtrickster/Emysql.git", "52b802098322aad372198b9f5fa9ae9a4c758ad1"}},
+  {elli, "", {git, "git://github.com/knutin/elli.git", {tag, "v1.0.5"}}}
  ]}.

frameworks/Erlang/misultin/rebar.config

@@ -1,5 +1,5 @@
 %% -*- erlang -*-
 {deps, [
-  {erl_bench, "0.0.1", {git, "git://github.com/b0oh/erl_bench.git", {tag, "v0.0.1"}}},
+  {erl_bench, ".*", {git, "git://github.com/utkarshkukreti/erl_bench.git", "cb70233d7de1e800893cf1460f181a706aa08a38"}},
   {misultin, "0.9", {git, "git://github.com/ostinelli/misultin.git", {tag, "misultin-0.9"}}}
 ]}.

frameworks/Erlang/mochiweb/rebar.config

@@ -1,5 +1,5 @@
 %% -*- erlang -*-
 {deps, [
-  {erl_bench, "0.0.1", {git, "git://github.com/b0oh/erl_bench.git", {tag, "v0.0.1"}}},
+  {erl_bench, ".*", {git, "git://github.com/utkarshkukreti/erl_bench.git", "cb70233d7de1e800893cf1460f181a706aa08a38"}},
   {mochiweb, "2.9.0", {git, "git://github.com/mochi/mochiweb.git", {tag, "v2.9.0"}}}
 ]}.

toolset/setup/linux/languages/erlang.sh

@@ -5,7 +5,7 @@ RETCODE=$(fw_exists ${IROOT}/erlang.installed)
   source $IROOT/erlang.installed
   return 0; }
 
-VERSION="17.4-2"
+VERSION="18.2-2"
 RELEASE="trusty"
 ARCH="amd64"