From a1a5e70a9d51100beb117ea3e36e543a7f972471 Mon Sep 17 00:00:00 2001 From: Matt Mullins Date: Sun, 1 Dec 2019 19:43:24 -0800 Subject: [PATCH] Fix up directory structure for rebar3 --- amqp/{amqp.app => src/amqp.app.src} | 0 amqp/{ => src}/amqp.appup | 0 amqp/{ => src}/amqp_app.erl | 0 amqp/{ => src}/amqp_bot_connection.erl | 0 amqp/{ => src}/amqp_bot_listener.erl | 0 amqp/{ => src}/amqp_bot_sup.erl | 0 bot-4.5.rel | 11 ----------- bot.rel | 11 ----------- core/{ => src}/config.erl | 0 core/{core.app => src/core.app.src} | 0 core/{ => src}/core.appup | 0 core/{ => src}/core_app.erl | 0 core/{ => src}/core_sup.erl | 0 core/{ => src}/pid_cache.erl | 0 core/{ => src}/rate_limit.erl | 0 irc/{irc.app => src/irc.app.src} | 0 irc/{ => src}/irc.appup | 0 irc/{ => src}/irc_amqp_listener.erl | 0 irc/{ => src}/irc_app.erl | 0 irc/{ => src}/irc_channel_sup.erl | 0 irc/{ => src}/irc_command.erl | 0 irc/{ => src}/irc_conn.erl | 0 irc/{ => src}/irc_net_sup.erl | 0 irc/{ => src}/irc_object_sup.erl | 0 irc/{ => src}/irc_pid_cache.erl | 0 irc/{ => src}/irc_sup.erl | 0 irc/{ => src}/irc_user_sup.erl | 0 irc/{ => src}/irc_util.erl | 0 irc/{ => src}/irc_util.hrl | 0 rebar.config | 12 ++++++++++++ rebar.lock | 10 ++++++++++ 31 files changed, 22 insertions(+), 22 deletions(-) rename amqp/{amqp.app => src/amqp.app.src} (100%) rename amqp/{ => src}/amqp.appup (100%) rename amqp/{ => src}/amqp_app.erl (100%) rename amqp/{ => src}/amqp_bot_connection.erl (100%) rename amqp/{ => src}/amqp_bot_listener.erl (100%) rename amqp/{ => src}/amqp_bot_sup.erl (100%) delete mode 100644 bot-4.5.rel delete mode 100644 bot.rel rename core/{ => src}/config.erl (100%) rename core/{core.app => src/core.app.src} (100%) rename core/{ => src}/core.appup (100%) rename core/{ => src}/core_app.erl (100%) rename core/{ => src}/core_sup.erl (100%) rename core/{ => src}/pid_cache.erl (100%) rename core/{ => src}/rate_limit.erl (100%) rename irc/{irc.app => src/irc.app.src} (100%) rename irc/{ => src}/irc.appup (100%) rename irc/{ => src}/irc_amqp_listener.erl (100%) rename irc/{ => src}/irc_app.erl (100%) rename irc/{ => src}/irc_channel_sup.erl (100%) rename irc/{ => src}/irc_command.erl (100%) rename irc/{ => src}/irc_conn.erl (100%) rename irc/{ => src}/irc_net_sup.erl (100%) rename irc/{ => src}/irc_object_sup.erl (100%) rename irc/{ => src}/irc_pid_cache.erl (100%) rename irc/{ => src}/irc_sup.erl (100%) rename irc/{ => src}/irc_user_sup.erl (100%) rename irc/{ => src}/irc_util.erl (100%) rename irc/{ => src}/irc_util.hrl (100%) create mode 100644 rebar.config create mode 100644 rebar.lock diff --git a/amqp/amqp.app b/amqp/src/amqp.app.src similarity index 100% rename from amqp/amqp.app rename to amqp/src/amqp.app.src diff --git a/amqp/amqp.appup b/amqp/src/amqp.appup similarity index 100% rename from amqp/amqp.appup rename to amqp/src/amqp.appup diff --git a/amqp/amqp_app.erl b/amqp/src/amqp_app.erl similarity index 100% rename from amqp/amqp_app.erl rename to amqp/src/amqp_app.erl diff --git a/amqp/amqp_bot_connection.erl b/amqp/src/amqp_bot_connection.erl similarity index 100% rename from amqp/amqp_bot_connection.erl rename to amqp/src/amqp_bot_connection.erl diff --git a/amqp/amqp_bot_listener.erl b/amqp/src/amqp_bot_listener.erl similarity index 100% rename from amqp/amqp_bot_listener.erl rename to amqp/src/amqp_bot_listener.erl diff --git a/amqp/amqp_bot_sup.erl b/amqp/src/amqp_bot_sup.erl similarity index 100% rename from amqp/amqp_bot_sup.erl rename to amqp/src/amqp_bot_sup.erl diff --git a/bot-4.5.rel b/bot-4.5.rel deleted file mode 100644 index 0a39390..0000000 --- a/bot-4.5.rel +++ /dev/null @@ -1,11 +0,0 @@ -{release, {"erlbot", "4.5"}, - {erts, "5.7.4"}, - [{kernel, "2.13.4"}, - {stdlib, "1.16.4"}, - {sasl, "2.1.8"}, - {rabbit_common, "0.0.0"}, - {amqp_client, "0.0.0"}, - {core, "2"}, - {amqp, "1"}, - {irc, "3"}] -}. diff --git a/bot.rel b/bot.rel deleted file mode 100644 index 8e551f3..0000000 --- a/bot.rel +++ /dev/null @@ -1,11 +0,0 @@ -{release, {"erlbot", "14"}, - {erts, "5.8.3"}, - [{kernel, "2.14.5"}, - {stdlib, "1.17.5"}, - {sasl, "2.1.10"}, - {rabbit_common, "0.0.0"}, - {amqp_client, "0.0.0"}, - {core, "3"}, - {amqp, "4"}, - {irc, "13"}] -}. diff --git a/core/config.erl b/core/src/config.erl similarity index 100% rename from core/config.erl rename to core/src/config.erl diff --git a/core/core.app b/core/src/core.app.src similarity index 100% rename from core/core.app rename to core/src/core.app.src diff --git a/core/core.appup b/core/src/core.appup similarity index 100% rename from core/core.appup rename to core/src/core.appup diff --git a/core/core_app.erl b/core/src/core_app.erl similarity index 100% rename from core/core_app.erl rename to core/src/core_app.erl diff --git a/core/core_sup.erl b/core/src/core_sup.erl similarity index 100% rename from core/core_sup.erl rename to core/src/core_sup.erl diff --git a/core/pid_cache.erl b/core/src/pid_cache.erl similarity index 100% rename from core/pid_cache.erl rename to core/src/pid_cache.erl diff --git a/core/rate_limit.erl b/core/src/rate_limit.erl similarity index 100% rename from core/rate_limit.erl rename to core/src/rate_limit.erl diff --git a/irc/irc.app b/irc/src/irc.app.src similarity index 100% rename from irc/irc.app rename to irc/src/irc.app.src diff --git a/irc/irc.appup b/irc/src/irc.appup similarity index 100% rename from irc/irc.appup rename to irc/src/irc.appup diff --git a/irc/irc_amqp_listener.erl b/irc/src/irc_amqp_listener.erl similarity index 100% rename from irc/irc_amqp_listener.erl rename to irc/src/irc_amqp_listener.erl diff --git a/irc/irc_app.erl b/irc/src/irc_app.erl similarity index 100% rename from irc/irc_app.erl rename to irc/src/irc_app.erl diff --git a/irc/irc_channel_sup.erl b/irc/src/irc_channel_sup.erl similarity index 100% rename from irc/irc_channel_sup.erl rename to irc/src/irc_channel_sup.erl diff --git a/irc/irc_command.erl b/irc/src/irc_command.erl similarity index 100% rename from irc/irc_command.erl rename to irc/src/irc_command.erl diff --git a/irc/irc_conn.erl b/irc/src/irc_conn.erl similarity index 100% rename from irc/irc_conn.erl rename to irc/src/irc_conn.erl diff --git a/irc/irc_net_sup.erl b/irc/src/irc_net_sup.erl similarity index 100% rename from irc/irc_net_sup.erl rename to irc/src/irc_net_sup.erl diff --git a/irc/irc_object_sup.erl b/irc/src/irc_object_sup.erl similarity index 100% rename from irc/irc_object_sup.erl rename to irc/src/irc_object_sup.erl diff --git a/irc/irc_pid_cache.erl b/irc/src/irc_pid_cache.erl similarity index 100% rename from irc/irc_pid_cache.erl rename to irc/src/irc_pid_cache.erl diff --git a/irc/irc_sup.erl b/irc/src/irc_sup.erl similarity index 100% rename from irc/irc_sup.erl rename to irc/src/irc_sup.erl diff --git a/irc/irc_user_sup.erl b/irc/src/irc_user_sup.erl similarity index 100% rename from irc/irc_user_sup.erl rename to irc/src/irc_user_sup.erl diff --git a/irc/irc_util.erl b/irc/src/irc_util.erl similarity index 100% rename from irc/irc_util.erl rename to irc/src/irc_util.erl diff --git a/irc/irc_util.hrl b/irc/src/irc_util.hrl similarity index 100% rename from irc/irc_util.hrl rename to irc/src/irc_util.hrl diff --git a/rebar.config b/rebar.config new file mode 100644 index 0000000..acdf83f --- /dev/null +++ b/rebar.config @@ -0,0 +1,12 @@ +{project_app_dirs, ["amqp", "core", "irc"]}. +{deps, [ + {amqp_client, "3.6.16"} + ] +}. +{relx, [{release, + {bot, "14rebar"}, + [irc, amqp, core, amqp_client]} + ] +}. +{profiles, [{prod, [{relx, [{dev_mode, false} + ,{include_erts, true}]}]}]}. diff --git a/rebar.lock b/rebar.lock new file mode 100644 index 0000000..ef84ae7 --- /dev/null +++ b/rebar.lock @@ -0,0 +1,10 @@ +{"1.1.0", +[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"3.6.16">>},0}, + {<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.6.16">>},1}, + {<<"recon">>,{pkg,<<"recon">>,<<"2.3.2">>},2}]}. +[ +{pkg_hash,[ + {<<"amqp_client">>, <<"9E61E7A021B850A3092C84B377FD6C0F19AE648E9B4CB7B41C620D4A9A397F3C">>}, + {<<"rabbit_common">>, <<"7F6A101963C151008B42373857AD7741BE476210CFD4DF5C4746AB45FA558861">>}, + {<<"recon">>, <<"4444C879BE323B1B133EEC5241CB84BD3821EA194C740D75617E106BE4744318">>}]} +]. -- 2.11.0