From 8a368efb9571a96b3a1ce9849ae1ba905672a9ff Mon Sep 17 00:00:00 2001 From: zhanghongtong Date: Tue, 15 Jun 2021 11:50:15 +0800 Subject: [PATCH] chore: move lib-ce to apps Signed-off-by: zhanghongtong --- {lib-ce => apps}/emqx_dashboard/.gitignore | 0 {lib-ce => apps}/emqx_dashboard/README.md | 0 .../emqx_dashboard/etc/emqx_dashboard.conf | 0 .../emqx_dashboard/include/emqx_dashboard.hrl | 0 .../emqx_dashboard/priv/emqx_dashboard.schema | 0 {lib-ce => apps}/emqx_dashboard/rebar.config | 0 .../emqx_dashboard/src/emqx_dashboard.app.src | 0 .../emqx_dashboard/src/emqx_dashboard.erl | 0 .../src/emqx_dashboard_admin.erl | 0 .../emqx_dashboard/src/emqx_dashboard_api.erl | 0 .../emqx_dashboard/src/emqx_dashboard_app.erl | 0 .../emqx_dashboard/src/emqx_dashboard_cli.erl | 0 .../emqx_dashboard/src/emqx_dashboard_sup.erl | 0 .../emqx_dashboard/test/.placeholder | 0 .../test/emqx_dashboard_SUITE.erl | 0 .../emqx_modules/etc/emqx_modules.conf | 0 .../emqx_modules/priv/emqx_modules.schema | 0 {lib-ce => apps}/emqx_modules/rebar.config | 0 .../src/emqx_mod_acl_internal.erl | 0 .../src/emqx_mod_api_topic_metrics.erl | 0 .../emqx_modules/src/emqx_mod_delayed.erl | 0 .../emqx_modules/src/emqx_mod_presence.erl | 0 .../emqx_modules/src/emqx_mod_rewrite.erl | 0 .../src/emqx_mod_subscription.erl | 0 .../emqx_modules/src/emqx_mod_sup.erl | 0 .../src/emqx_mod_topic_metrics.erl | 0 .../emqx_modules/src/emqx_modules.app.src | 0 .../emqx_modules/src/emqx_modules.appup.src | 0 .../emqx_modules/src/emqx_modules.erl | 0 .../emqx_modules/src/emqx_modules_api.erl | 0 .../emqx_modules/src/emqx_modules_app.erl | 0 .../test/emqx_mod_acl_internal_SUITE.erl | 0 .../test/emqx_mod_delayed_SUITE.erl | 0 .../test/emqx_mod_presence_SUITE.erl | 0 .../test/emqx_mod_rewrite_SUITE.erl | 0 .../test/emqx_mod_subscription_SUITE.erl | 0 .../emqx_modules/test/emqx_mod_sup_SUITE.erl | 0 .../test/emqx_mod_topic_metrics_SUITE.erl | 0 .../emqx_modules/test/emqx_modules_SUITE.erl | 0 {lib-ce => apps}/emqx_telemetry/.gitignore | 0 {lib-ce => apps}/emqx_telemetry/README.md | 0 .../emqx_telemetry/etc/emqx_telemetry.conf | 0 .../emqx_telemetry/priv/emqx_telemetry.schema | 0 {lib-ce => apps}/emqx_telemetry/rebar.config | 0 .../emqx_telemetry/src/emqx_telemetry.app.src | 0 .../src/emqx_telemetry.appup.src | 0 .../emqx_telemetry/src/emqx_telemetry.erl | 0 .../emqx_telemetry/src/emqx_telemetry_api.erl | 0 .../emqx_telemetry/src/emqx_telemetry_app.erl | 0 .../emqx_telemetry/src/emqx_telemetry_sup.erl | 0 .../test/emqx_telemetry_SUITE.erl | 0 elvis.config | 4 +-- rebar.config.erl | 33 ++++++++++++------- scripts/check-deps-integrity.escript | 12 +++---- scripts/find-apps.sh | 2 -- scripts/get-dashboard.sh | 2 +- 56 files changed, 31 insertions(+), 22 deletions(-) rename {lib-ce => apps}/emqx_dashboard/.gitignore (100%) rename {lib-ce => apps}/emqx_dashboard/README.md (100%) rename {lib-ce => apps}/emqx_dashboard/etc/emqx_dashboard.conf (100%) rename {lib-ce => apps}/emqx_dashboard/include/emqx_dashboard.hrl (100%) rename {lib-ce => apps}/emqx_dashboard/priv/emqx_dashboard.schema (100%) rename {lib-ce => apps}/emqx_dashboard/rebar.config (100%) rename {lib-ce => apps}/emqx_dashboard/src/emqx_dashboard.app.src (100%) rename {lib-ce => apps}/emqx_dashboard/src/emqx_dashboard.erl (100%) rename {lib-ce => apps}/emqx_dashboard/src/emqx_dashboard_admin.erl (100%) rename {lib-ce => apps}/emqx_dashboard/src/emqx_dashboard_api.erl (100%) rename {lib-ce => apps}/emqx_dashboard/src/emqx_dashboard_app.erl (100%) rename {lib-ce => apps}/emqx_dashboard/src/emqx_dashboard_cli.erl (100%) rename {lib-ce => apps}/emqx_dashboard/src/emqx_dashboard_sup.erl (100%) rename {lib-ce => apps}/emqx_dashboard/test/.placeholder (100%) rename {lib-ce => apps}/emqx_dashboard/test/emqx_dashboard_SUITE.erl (100%) rename {lib-ce => apps}/emqx_modules/etc/emqx_modules.conf (100%) rename {lib-ce => apps}/emqx_modules/priv/emqx_modules.schema (100%) rename {lib-ce => apps}/emqx_modules/rebar.config (100%) rename {lib-ce => apps}/emqx_modules/src/emqx_mod_acl_internal.erl (100%) rename {lib-ce => apps}/emqx_modules/src/emqx_mod_api_topic_metrics.erl (100%) rename {lib-ce => apps}/emqx_modules/src/emqx_mod_delayed.erl (100%) rename {lib-ce => apps}/emqx_modules/src/emqx_mod_presence.erl (100%) rename {lib-ce => apps}/emqx_modules/src/emqx_mod_rewrite.erl (100%) rename {lib-ce => apps}/emqx_modules/src/emqx_mod_subscription.erl (100%) rename {lib-ce => apps}/emqx_modules/src/emqx_mod_sup.erl (100%) rename {lib-ce => apps}/emqx_modules/src/emqx_mod_topic_metrics.erl (100%) rename {lib-ce => apps}/emqx_modules/src/emqx_modules.app.src (100%) rename {lib-ce => apps}/emqx_modules/src/emqx_modules.appup.src (100%) rename {lib-ce => apps}/emqx_modules/src/emqx_modules.erl (100%) rename {lib-ce => apps}/emqx_modules/src/emqx_modules_api.erl (100%) rename {lib-ce => apps}/emqx_modules/src/emqx_modules_app.erl (100%) rename {lib-ce => apps}/emqx_modules/test/emqx_mod_acl_internal_SUITE.erl (100%) rename {lib-ce => apps}/emqx_modules/test/emqx_mod_delayed_SUITE.erl (100%) rename {lib-ce => apps}/emqx_modules/test/emqx_mod_presence_SUITE.erl (100%) rename {lib-ce => apps}/emqx_modules/test/emqx_mod_rewrite_SUITE.erl (100%) rename {lib-ce => apps}/emqx_modules/test/emqx_mod_subscription_SUITE.erl (100%) rename {lib-ce => apps}/emqx_modules/test/emqx_mod_sup_SUITE.erl (100%) rename {lib-ce => apps}/emqx_modules/test/emqx_mod_topic_metrics_SUITE.erl (100%) rename {lib-ce => apps}/emqx_modules/test/emqx_modules_SUITE.erl (100%) rename {lib-ce => apps}/emqx_telemetry/.gitignore (100%) rename {lib-ce => apps}/emqx_telemetry/README.md (100%) rename {lib-ce => apps}/emqx_telemetry/etc/emqx_telemetry.conf (100%) rename {lib-ce => apps}/emqx_telemetry/priv/emqx_telemetry.schema (100%) rename {lib-ce => apps}/emqx_telemetry/rebar.config (100%) rename {lib-ce => apps}/emqx_telemetry/src/emqx_telemetry.app.src (100%) rename {lib-ce => apps}/emqx_telemetry/src/emqx_telemetry.appup.src (100%) rename {lib-ce => apps}/emqx_telemetry/src/emqx_telemetry.erl (100%) rename {lib-ce => apps}/emqx_telemetry/src/emqx_telemetry_api.erl (100%) rename {lib-ce => apps}/emqx_telemetry/src/emqx_telemetry_app.erl (100%) rename {lib-ce => apps}/emqx_telemetry/src/emqx_telemetry_sup.erl (100%) rename {lib-ce => apps}/emqx_telemetry/test/emqx_telemetry_SUITE.erl (100%) diff --git a/lib-ce/emqx_dashboard/.gitignore b/apps/emqx_dashboard/.gitignore similarity index 100% rename from lib-ce/emqx_dashboard/.gitignore rename to apps/emqx_dashboard/.gitignore diff --git a/lib-ce/emqx_dashboard/README.md b/apps/emqx_dashboard/README.md similarity index 100% rename from lib-ce/emqx_dashboard/README.md rename to apps/emqx_dashboard/README.md diff --git a/lib-ce/emqx_dashboard/etc/emqx_dashboard.conf b/apps/emqx_dashboard/etc/emqx_dashboard.conf similarity index 100% rename from lib-ce/emqx_dashboard/etc/emqx_dashboard.conf rename to apps/emqx_dashboard/etc/emqx_dashboard.conf diff --git a/lib-ce/emqx_dashboard/include/emqx_dashboard.hrl b/apps/emqx_dashboard/include/emqx_dashboard.hrl similarity index 100% rename from lib-ce/emqx_dashboard/include/emqx_dashboard.hrl rename to apps/emqx_dashboard/include/emqx_dashboard.hrl diff --git a/lib-ce/emqx_dashboard/priv/emqx_dashboard.schema b/apps/emqx_dashboard/priv/emqx_dashboard.schema similarity index 100% rename from lib-ce/emqx_dashboard/priv/emqx_dashboard.schema rename to apps/emqx_dashboard/priv/emqx_dashboard.schema diff --git a/lib-ce/emqx_dashboard/rebar.config b/apps/emqx_dashboard/rebar.config similarity index 100% rename from lib-ce/emqx_dashboard/rebar.config rename to apps/emqx_dashboard/rebar.config diff --git a/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src b/apps/emqx_dashboard/src/emqx_dashboard.app.src similarity index 100% rename from lib-ce/emqx_dashboard/src/emqx_dashboard.app.src rename to apps/emqx_dashboard/src/emqx_dashboard.app.src diff --git a/lib-ce/emqx_dashboard/src/emqx_dashboard.erl b/apps/emqx_dashboard/src/emqx_dashboard.erl similarity index 100% rename from lib-ce/emqx_dashboard/src/emqx_dashboard.erl rename to apps/emqx_dashboard/src/emqx_dashboard.erl diff --git a/lib-ce/emqx_dashboard/src/emqx_dashboard_admin.erl b/apps/emqx_dashboard/src/emqx_dashboard_admin.erl similarity index 100% rename from lib-ce/emqx_dashboard/src/emqx_dashboard_admin.erl rename to apps/emqx_dashboard/src/emqx_dashboard_admin.erl diff --git a/lib-ce/emqx_dashboard/src/emqx_dashboard_api.erl b/apps/emqx_dashboard/src/emqx_dashboard_api.erl similarity index 100% rename from lib-ce/emqx_dashboard/src/emqx_dashboard_api.erl rename to apps/emqx_dashboard/src/emqx_dashboard_api.erl diff --git a/lib-ce/emqx_dashboard/src/emqx_dashboard_app.erl b/apps/emqx_dashboard/src/emqx_dashboard_app.erl similarity index 100% rename from lib-ce/emqx_dashboard/src/emqx_dashboard_app.erl rename to apps/emqx_dashboard/src/emqx_dashboard_app.erl diff --git a/lib-ce/emqx_dashboard/src/emqx_dashboard_cli.erl b/apps/emqx_dashboard/src/emqx_dashboard_cli.erl similarity index 100% rename from lib-ce/emqx_dashboard/src/emqx_dashboard_cli.erl rename to apps/emqx_dashboard/src/emqx_dashboard_cli.erl diff --git a/lib-ce/emqx_dashboard/src/emqx_dashboard_sup.erl b/apps/emqx_dashboard/src/emqx_dashboard_sup.erl similarity index 100% rename from lib-ce/emqx_dashboard/src/emqx_dashboard_sup.erl rename to apps/emqx_dashboard/src/emqx_dashboard_sup.erl diff --git a/lib-ce/emqx_dashboard/test/.placeholder b/apps/emqx_dashboard/test/.placeholder similarity index 100% rename from lib-ce/emqx_dashboard/test/.placeholder rename to apps/emqx_dashboard/test/.placeholder diff --git a/lib-ce/emqx_dashboard/test/emqx_dashboard_SUITE.erl b/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl similarity index 100% rename from lib-ce/emqx_dashboard/test/emqx_dashboard_SUITE.erl rename to apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl diff --git a/lib-ce/emqx_modules/etc/emqx_modules.conf b/apps/emqx_modules/etc/emqx_modules.conf similarity index 100% rename from lib-ce/emqx_modules/etc/emqx_modules.conf rename to apps/emqx_modules/etc/emqx_modules.conf diff --git a/lib-ce/emqx_modules/priv/emqx_modules.schema b/apps/emqx_modules/priv/emqx_modules.schema similarity index 100% rename from lib-ce/emqx_modules/priv/emqx_modules.schema rename to apps/emqx_modules/priv/emqx_modules.schema diff --git a/lib-ce/emqx_modules/rebar.config b/apps/emqx_modules/rebar.config similarity index 100% rename from lib-ce/emqx_modules/rebar.config rename to apps/emqx_modules/rebar.config diff --git a/lib-ce/emqx_modules/src/emqx_mod_acl_internal.erl b/apps/emqx_modules/src/emqx_mod_acl_internal.erl similarity index 100% rename from lib-ce/emqx_modules/src/emqx_mod_acl_internal.erl rename to apps/emqx_modules/src/emqx_mod_acl_internal.erl diff --git a/lib-ce/emqx_modules/src/emqx_mod_api_topic_metrics.erl b/apps/emqx_modules/src/emqx_mod_api_topic_metrics.erl similarity index 100% rename from lib-ce/emqx_modules/src/emqx_mod_api_topic_metrics.erl rename to apps/emqx_modules/src/emqx_mod_api_topic_metrics.erl diff --git a/lib-ce/emqx_modules/src/emqx_mod_delayed.erl b/apps/emqx_modules/src/emqx_mod_delayed.erl similarity index 100% rename from lib-ce/emqx_modules/src/emqx_mod_delayed.erl rename to apps/emqx_modules/src/emqx_mod_delayed.erl diff --git a/lib-ce/emqx_modules/src/emqx_mod_presence.erl b/apps/emqx_modules/src/emqx_mod_presence.erl similarity index 100% rename from lib-ce/emqx_modules/src/emqx_mod_presence.erl rename to apps/emqx_modules/src/emqx_mod_presence.erl diff --git a/lib-ce/emqx_modules/src/emqx_mod_rewrite.erl b/apps/emqx_modules/src/emqx_mod_rewrite.erl similarity index 100% rename from lib-ce/emqx_modules/src/emqx_mod_rewrite.erl rename to apps/emqx_modules/src/emqx_mod_rewrite.erl diff --git a/lib-ce/emqx_modules/src/emqx_mod_subscription.erl b/apps/emqx_modules/src/emqx_mod_subscription.erl similarity index 100% rename from lib-ce/emqx_modules/src/emqx_mod_subscription.erl rename to apps/emqx_modules/src/emqx_mod_subscription.erl diff --git a/lib-ce/emqx_modules/src/emqx_mod_sup.erl b/apps/emqx_modules/src/emqx_mod_sup.erl similarity index 100% rename from lib-ce/emqx_modules/src/emqx_mod_sup.erl rename to apps/emqx_modules/src/emqx_mod_sup.erl diff --git a/lib-ce/emqx_modules/src/emqx_mod_topic_metrics.erl b/apps/emqx_modules/src/emqx_mod_topic_metrics.erl similarity index 100% rename from lib-ce/emqx_modules/src/emqx_mod_topic_metrics.erl rename to apps/emqx_modules/src/emqx_mod_topic_metrics.erl diff --git a/lib-ce/emqx_modules/src/emqx_modules.app.src b/apps/emqx_modules/src/emqx_modules.app.src similarity index 100% rename from lib-ce/emqx_modules/src/emqx_modules.app.src rename to apps/emqx_modules/src/emqx_modules.app.src diff --git a/lib-ce/emqx_modules/src/emqx_modules.appup.src b/apps/emqx_modules/src/emqx_modules.appup.src similarity index 100% rename from lib-ce/emqx_modules/src/emqx_modules.appup.src rename to apps/emqx_modules/src/emqx_modules.appup.src diff --git a/lib-ce/emqx_modules/src/emqx_modules.erl b/apps/emqx_modules/src/emqx_modules.erl similarity index 100% rename from lib-ce/emqx_modules/src/emqx_modules.erl rename to apps/emqx_modules/src/emqx_modules.erl diff --git a/lib-ce/emqx_modules/src/emqx_modules_api.erl b/apps/emqx_modules/src/emqx_modules_api.erl similarity index 100% rename from lib-ce/emqx_modules/src/emqx_modules_api.erl rename to apps/emqx_modules/src/emqx_modules_api.erl diff --git a/lib-ce/emqx_modules/src/emqx_modules_app.erl b/apps/emqx_modules/src/emqx_modules_app.erl similarity index 100% rename from lib-ce/emqx_modules/src/emqx_modules_app.erl rename to apps/emqx_modules/src/emqx_modules_app.erl diff --git a/lib-ce/emqx_modules/test/emqx_mod_acl_internal_SUITE.erl b/apps/emqx_modules/test/emqx_mod_acl_internal_SUITE.erl similarity index 100% rename from lib-ce/emqx_modules/test/emqx_mod_acl_internal_SUITE.erl rename to apps/emqx_modules/test/emqx_mod_acl_internal_SUITE.erl diff --git a/lib-ce/emqx_modules/test/emqx_mod_delayed_SUITE.erl b/apps/emqx_modules/test/emqx_mod_delayed_SUITE.erl similarity index 100% rename from lib-ce/emqx_modules/test/emqx_mod_delayed_SUITE.erl rename to apps/emqx_modules/test/emqx_mod_delayed_SUITE.erl diff --git a/lib-ce/emqx_modules/test/emqx_mod_presence_SUITE.erl b/apps/emqx_modules/test/emqx_mod_presence_SUITE.erl similarity index 100% rename from lib-ce/emqx_modules/test/emqx_mod_presence_SUITE.erl rename to apps/emqx_modules/test/emqx_mod_presence_SUITE.erl diff --git a/lib-ce/emqx_modules/test/emqx_mod_rewrite_SUITE.erl b/apps/emqx_modules/test/emqx_mod_rewrite_SUITE.erl similarity index 100% rename from lib-ce/emqx_modules/test/emqx_mod_rewrite_SUITE.erl rename to apps/emqx_modules/test/emqx_mod_rewrite_SUITE.erl diff --git a/lib-ce/emqx_modules/test/emqx_mod_subscription_SUITE.erl b/apps/emqx_modules/test/emqx_mod_subscription_SUITE.erl similarity index 100% rename from lib-ce/emqx_modules/test/emqx_mod_subscription_SUITE.erl rename to apps/emqx_modules/test/emqx_mod_subscription_SUITE.erl diff --git a/lib-ce/emqx_modules/test/emqx_mod_sup_SUITE.erl b/apps/emqx_modules/test/emqx_mod_sup_SUITE.erl similarity index 100% rename from lib-ce/emqx_modules/test/emqx_mod_sup_SUITE.erl rename to apps/emqx_modules/test/emqx_mod_sup_SUITE.erl diff --git a/lib-ce/emqx_modules/test/emqx_mod_topic_metrics_SUITE.erl b/apps/emqx_modules/test/emqx_mod_topic_metrics_SUITE.erl similarity index 100% rename from lib-ce/emqx_modules/test/emqx_mod_topic_metrics_SUITE.erl rename to apps/emqx_modules/test/emqx_mod_topic_metrics_SUITE.erl diff --git a/lib-ce/emqx_modules/test/emqx_modules_SUITE.erl b/apps/emqx_modules/test/emqx_modules_SUITE.erl similarity index 100% rename from lib-ce/emqx_modules/test/emqx_modules_SUITE.erl rename to apps/emqx_modules/test/emqx_modules_SUITE.erl diff --git a/lib-ce/emqx_telemetry/.gitignore b/apps/emqx_telemetry/.gitignore similarity index 100% rename from lib-ce/emqx_telemetry/.gitignore rename to apps/emqx_telemetry/.gitignore diff --git a/lib-ce/emqx_telemetry/README.md b/apps/emqx_telemetry/README.md similarity index 100% rename from lib-ce/emqx_telemetry/README.md rename to apps/emqx_telemetry/README.md diff --git a/lib-ce/emqx_telemetry/etc/emqx_telemetry.conf b/apps/emqx_telemetry/etc/emqx_telemetry.conf similarity index 100% rename from lib-ce/emqx_telemetry/etc/emqx_telemetry.conf rename to apps/emqx_telemetry/etc/emqx_telemetry.conf diff --git a/lib-ce/emqx_telemetry/priv/emqx_telemetry.schema b/apps/emqx_telemetry/priv/emqx_telemetry.schema similarity index 100% rename from lib-ce/emqx_telemetry/priv/emqx_telemetry.schema rename to apps/emqx_telemetry/priv/emqx_telemetry.schema diff --git a/lib-ce/emqx_telemetry/rebar.config b/apps/emqx_telemetry/rebar.config similarity index 100% rename from lib-ce/emqx_telemetry/rebar.config rename to apps/emqx_telemetry/rebar.config diff --git a/lib-ce/emqx_telemetry/src/emqx_telemetry.app.src b/apps/emqx_telemetry/src/emqx_telemetry.app.src similarity index 100% rename from lib-ce/emqx_telemetry/src/emqx_telemetry.app.src rename to apps/emqx_telemetry/src/emqx_telemetry.app.src diff --git a/lib-ce/emqx_telemetry/src/emqx_telemetry.appup.src b/apps/emqx_telemetry/src/emqx_telemetry.appup.src similarity index 100% rename from lib-ce/emqx_telemetry/src/emqx_telemetry.appup.src rename to apps/emqx_telemetry/src/emqx_telemetry.appup.src diff --git a/lib-ce/emqx_telemetry/src/emqx_telemetry.erl b/apps/emqx_telemetry/src/emqx_telemetry.erl similarity index 100% rename from lib-ce/emqx_telemetry/src/emqx_telemetry.erl rename to apps/emqx_telemetry/src/emqx_telemetry.erl diff --git a/lib-ce/emqx_telemetry/src/emqx_telemetry_api.erl b/apps/emqx_telemetry/src/emqx_telemetry_api.erl similarity index 100% rename from lib-ce/emqx_telemetry/src/emqx_telemetry_api.erl rename to apps/emqx_telemetry/src/emqx_telemetry_api.erl diff --git a/lib-ce/emqx_telemetry/src/emqx_telemetry_app.erl b/apps/emqx_telemetry/src/emqx_telemetry_app.erl similarity index 100% rename from lib-ce/emqx_telemetry/src/emqx_telemetry_app.erl rename to apps/emqx_telemetry/src/emqx_telemetry_app.erl diff --git a/lib-ce/emqx_telemetry/src/emqx_telemetry_sup.erl b/apps/emqx_telemetry/src/emqx_telemetry_sup.erl similarity index 100% rename from lib-ce/emqx_telemetry/src/emqx_telemetry_sup.erl rename to apps/emqx_telemetry/src/emqx_telemetry_sup.erl diff --git a/lib-ce/emqx_telemetry/test/emqx_telemetry_SUITE.erl b/apps/emqx_telemetry/test/emqx_telemetry_SUITE.erl similarity index 100% rename from lib-ce/emqx_telemetry/test/emqx_telemetry_SUITE.erl rename to apps/emqx_telemetry/test/emqx_telemetry_SUITE.erl diff --git a/elvis.config b/elvis.config index ae47fc8f9..ef695458c 100644 --- a/elvis.config +++ b/elvis.config @@ -5,7 +5,7 @@ [ {config, [ - #{dirs => ["src", "apps/**/src", "lib-ce/**/src", "lib-ee/**/src"], + #{dirs => ["src", "apps/**/src", "lib-ee/**/src"], filter => "*.erl", ruleset => erl_files, rules => [ @@ -20,7 +20,7 @@ {left, "||"}]}} ] }, - #{dirs => ["test", "apps/**/test", "lib-ce/**/src"], + #{dirs => ["test", "apps/**/test"], filter => "*.erl", rules => [ {elvis_text_style, line_length, #{ limit => 100 diff --git a/rebar.config.erl b/rebar.config.erl index a38aa610a..3e7993f4c 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -78,14 +78,12 @@ is_cover_enabled() -> is_enterprise() -> filelib:is_regular("EMQX_ENTERPRISE"). -alternative_lib_dir() -> - case is_enterprise() of - true -> "lib-ee"; - false -> "lib-ce" - end. - project_app_dirs() -> - ["apps/*", alternative_lib_dir() ++ "/*", "."]. + ["apps/*"] ++ + case is_enterprise() of + true -> ["lib-ee/*"]; + false -> [] + end. plugins(HasElixir) -> [ {relup_helper,{git,"https://github.com/emqx/relup_helper", {tag, "2.0.0"}}} @@ -403,8 +401,13 @@ community_plugin_etc_overlays(App0) -> %% the overlay should be hand-coded but not to rely on build-time wildcards. find_conf_files(App) -> Dir1 = filename:join(["apps", App, "etc"]), - Dir2 = filename:join([alternative_lib_dir(), App, "etc"]), - filelib:wildcard("*.conf", Dir1) ++ filelib:wildcard("*.conf", Dir2). + filelib:wildcard("*.conf", Dir1) ++ + case is_enterprise() of + true -> + Dir2 = filename:join(["lib-ee", App, "etc"]), + filelib:wildcard("*.conf", Dir2); + false -> [] + end. env(Name, Default) -> case os:getenv(Name) of @@ -445,7 +448,11 @@ provide_bcrypt_release(ReleaseType) -> erl_opts_i() -> [{i, "apps"}] ++ [{i, Dir} || Dir <- filelib:wildcard(filename:join(["apps", "*", "include"]))] ++ - [{i, Dir} || Dir <- filelib:wildcard(filename:join([alternative_lib_dir(), "*", "include"]))]. + case is_enterprise() of + true -> + [{i, Dir} || Dir <- filelib:wildcard(filename:join(["lib-ee", "*", "include"]))]; + false -> [] + end. dialyzer(Config) -> {dialyzer, OldDialyzerConfig} = lists:keyfind(dialyzer, 1, Config), @@ -457,7 +464,11 @@ dialyzer(Config) -> [ list_to_atom(App) || App <- string:tokens(Value, ",")] end, - AppNames = [emqx | list_dir("apps")] ++ list_dir(alternative_lib_dir()), + AppNames = [list_dir("apps")] ++ + case is_enterprise() of + true -> [list_dir("lib-ee")]; + false -> [] + end, KnownApps = [Name || Name <- AppsToAnalyse, lists:member(Name, AppNames)], diff --git a/scripts/check-deps-integrity.escript b/scripts/check-deps-integrity.escript index 2dd16afb9..d875a2c40 100755 --- a/scripts/check-deps-integrity.escript +++ b/scripts/check-deps-integrity.escript @@ -5,14 +5,14 @@ -mode(compile). main([]) -> - AppsDir = case filelib:is_file("EMQX_ENTERPRISE") of - true -> "lib-ee"; - false -> "lib-ce" - end, - true = filelib:is_dir(AppsDir), Files = ["rebar.config"] ++ apps_rebar_config("apps") ++ - apps_rebar_config(AppsDir), + case filelib:is_file("EMQX_ENTERPRISE") of + true -> + true = filelib:is_dir("lib-ee"), + apps_rebar_config("lib-ee"); + false -> [] + end, Deps = collect_deps(Files, #{}), case count_bad_deps(Deps) of 0 -> diff --git a/scripts/find-apps.sh b/scripts/find-apps.sh index 1f199269c..47b71c7ca 100755 --- a/scripts/find-apps.sh +++ b/scripts/find-apps.sh @@ -13,8 +13,6 @@ find_app() { find_app 'apps' if [ -f 'EMQX_ENTERPRISE' ]; then find_app 'lib-ee' -else - find_app 'lib-ce' fi ## find directories in lib-extra diff --git a/scripts/get-dashboard.sh b/scripts/get-dashboard.sh index 99c5b5330..c4468ce80 100755 --- a/scripts/get-dashboard.sh +++ b/scripts/get-dashboard.sh @@ -16,7 +16,7 @@ if [ -f 'EMQX_ENTERPRISE' ]; then DIRECT_DOWNLOAD_URL="" else VERSION="${EMQX_CE_DASHBOARD_VERSION}" - DASHBOARD_PATH='lib-ce/emqx_dashboard/priv' + DASHBOARD_PATH='apps/emqx_dashboard/priv' DASHBOARD_REPO='emqx-dashboard-frontend' AUTH="" DIRECT_DOWNLOAD_URL="https://github.com/emqx/${DASHBOARD_REPO}/releases/download/${VERSION}/emqx-dashboard.zip"