From 8f477e8411009d96f6f97f2f9a468d0b889a9715 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Wed, 10 Feb 2021 22:09:41 +0100 Subject: [PATCH 1/3] refactor(proj): Move opensource apps to lib-opensource One step closer for better code abstraction for opensorce vs enterprise So far this relocation is to make opensource to enterprise merges conflict free. --- .gitignore | 2 +- {apps => lib-opensource}/emqx_dashboard/.gitignore | 0 {apps => lib-opensource}/emqx_dashboard/README.md | 0 {apps => lib-opensource}/emqx_dashboard/etc/emqx_dashboard.conf | 0 .../emqx_dashboard/include/emqx_dashboard.hrl | 0 .../emqx_dashboard/priv/emqx_dashboard.schema | 0 {apps => lib-opensource}/emqx_dashboard/rebar.config | 0 .../emqx_dashboard/src/emqx_dashboard.app.src | 0 {apps => lib-opensource}/emqx_dashboard/src/emqx_dashboard.erl | 0 .../emqx_dashboard/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 {apps => lib-opensource}/emqx_dashboard/test/.placeholder | 0 .../emqx_dashboard/test/emqx_dashboard_SUITE.erl | 0 {apps => lib-opensource}/emqx_management/.gitignore | 0 {apps => lib-opensource}/emqx_management/README.md | 0 .../emqx_management/etc/emqx_management.conf | 0 {apps => lib-opensource}/emqx_management/include/emqx_mgmt.hrl | 0 .../emqx_management/priv/emqx_management.schema | 0 {apps => lib-opensource}/emqx_management/rebar.config | 0 .../emqx_management/src/emqx_management.app.src | 0 {apps => lib-opensource}/emqx_management/src/emqx_mgmt.erl | 0 {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api.erl | 0 .../emqx_management/src/emqx_mgmt_api_alarms.erl | 0 .../emqx_management/src/emqx_mgmt_api_apps.erl | 0 .../emqx_management/src/emqx_mgmt_api_banned.erl | 0 .../emqx_management/src/emqx_mgmt_api_brokers.erl | 0 .../emqx_management/src/emqx_mgmt_api_clients.erl | 0 .../emqx_management/src/emqx_mgmt_api_data.erl | 0 .../emqx_management/src/emqx_mgmt_api_listeners.erl | 0 .../emqx_management/src/emqx_mgmt_api_metrics.erl | 0 .../emqx_management/src/emqx_mgmt_api_modules.erl | 0 .../emqx_management/src/emqx_mgmt_api_nodes.erl | 0 .../emqx_management/src/emqx_mgmt_api_plugins.erl | 0 .../emqx_management/src/emqx_mgmt_api_pubsub.erl | 0 .../emqx_management/src/emqx_mgmt_api_routes.erl | 0 .../emqx_management/src/emqx_mgmt_api_stats.erl | 0 .../emqx_management/src/emqx_mgmt_api_subscriptions.erl | 0 .../emqx_management/src/emqx_mgmt_api_topic_metrics.erl | 0 {apps => lib-opensource}/emqx_management/src/emqx_mgmt_app.erl | 0 {apps => lib-opensource}/emqx_management/src/emqx_mgmt_auth.erl | 0 {apps => lib-opensource}/emqx_management/src/emqx_mgmt_cli.erl | 0 {apps => lib-opensource}/emqx_management/src/emqx_mgmt_http.erl | 0 {apps => lib-opensource}/emqx_management/src/emqx_mgmt_sup.erl | 0 {apps => lib-opensource}/emqx_management/src/emqx_mgmt_util.erl | 0 .../emqx_management/test/emqx_mgmt_SUITE.erl | 0 .../emqx_management/test/emqx_mgmt_api_SUITE.erl | 0 .../emqx_management/test/etc/emqx_management.conf | 0 .../emqx_management/test/etc/emqx_reloader.conf | 0 .../emqx_management/test/rfc6455_client.erl | 0 {apps => lib-opensource}/emqx_rule_engine/.gitignore | 0 {apps => lib-opensource}/emqx_rule_engine/README.md | 0 {apps => lib-opensource}/emqx_rule_engine/docs/api_examples.md | 0 {apps => lib-opensource}/emqx_rule_engine/docs/cli_examples.md | 0 {apps => lib-opensource}/emqx_rule_engine/docs/design.md | 0 .../emqx_rule_engine/etc/emqx_rule_engine.conf | 0 .../emqx_rule_engine/include/rule_actions.hrl | 0 .../emqx_rule_engine/include/rule_engine.hrl | 0 .../emqx_rule_engine/priv/emqx_rule_engine.schema | 0 {apps => lib-opensource}/emqx_rule_engine/rebar.config | 0 .../emqx_rule_engine/src/emqx_rule_actions.erl | 0 .../emqx_rule_engine/src/emqx_rule_actions_trans.erl | 0 .../emqx_rule_engine/src/emqx_rule_engine.app.src | 0 .../emqx_rule_engine/src/emqx_rule_engine.erl | 0 .../emqx_rule_engine/src/emqx_rule_engine_api.erl | 0 .../emqx_rule_engine/src/emqx_rule_engine_app.erl | 0 .../emqx_rule_engine/src/emqx_rule_engine_cli.erl | 0 .../emqx_rule_engine/src/emqx_rule_engine_sup.erl | 0 .../emqx_rule_engine/src/emqx_rule_events.erl | 0 .../emqx_rule_engine/src/emqx_rule_funcs.erl | 0 {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_id.erl | 0 .../emqx_rule_engine/src/emqx_rule_locker.erl | 0 .../emqx_rule_engine/src/emqx_rule_maps.erl | 0 .../emqx_rule_engine/src/emqx_rule_metrics.erl | 0 .../emqx_rule_engine/src/emqx_rule_registry.erl | 0 .../emqx_rule_engine/src/emqx_rule_runtime.erl | 0 .../emqx_rule_engine/src/emqx_rule_sqlparser.erl | 0 .../emqx_rule_engine/src/emqx_rule_sqltester.erl | 0 .../emqx_rule_engine/src/emqx_rule_utils.erl | 0 .../emqx_rule_engine/src/emqx_rule_validator.erl | 0 .../emqx_rule_engine/test/emqx_rule_engine_SUITE.erl | 0 .../emqx_rule_engine/test/emqx_rule_events_SUITE.erl | 0 .../emqx_rule_engine/test/emqx_rule_funcs_SUITE.erl | 0 .../emqx_rule_engine/test/emqx_rule_id_SUITE.erl | 0 .../emqx_rule_engine/test/emqx_rule_maps_SUITE.erl | 0 .../emqx_rule_engine/test/emqx_rule_metrics_SUITE.erl | 0 .../emqx_rule_engine/test/emqx_rule_registry_SUITE.erl | 0 .../emqx_rule_engine/test/emqx_rule_utils_SUITE.erl | 0 .../emqx_rule_engine/test/emqx_rule_validator_SUITE.erl | 0 .../emqx_rule_engine/test/prop_rule_maps.erl | 0 92 files changed, 1 insertion(+), 1 deletion(-) rename {apps => lib-opensource}/emqx_dashboard/.gitignore (100%) rename {apps => lib-opensource}/emqx_dashboard/README.md (100%) rename {apps => lib-opensource}/emqx_dashboard/etc/emqx_dashboard.conf (100%) rename {apps => lib-opensource}/emqx_dashboard/include/emqx_dashboard.hrl (100%) rename {apps => lib-opensource}/emqx_dashboard/priv/emqx_dashboard.schema (100%) rename {apps => lib-opensource}/emqx_dashboard/rebar.config (100%) rename {apps => lib-opensource}/emqx_dashboard/src/emqx_dashboard.app.src (100%) rename {apps => lib-opensource}/emqx_dashboard/src/emqx_dashboard.erl (100%) rename {apps => lib-opensource}/emqx_dashboard/src/emqx_dashboard_admin.erl (100%) rename {apps => lib-opensource}/emqx_dashboard/src/emqx_dashboard_api.erl (100%) rename {apps => lib-opensource}/emqx_dashboard/src/emqx_dashboard_app.erl (100%) rename {apps => lib-opensource}/emqx_dashboard/src/emqx_dashboard_cli.erl (100%) rename {apps => lib-opensource}/emqx_dashboard/src/emqx_dashboard_sup.erl (100%) rename {apps => lib-opensource}/emqx_dashboard/test/.placeholder (100%) rename {apps => lib-opensource}/emqx_dashboard/test/emqx_dashboard_SUITE.erl (100%) rename {apps => lib-opensource}/emqx_management/.gitignore (100%) rename {apps => lib-opensource}/emqx_management/README.md (100%) rename {apps => lib-opensource}/emqx_management/etc/emqx_management.conf (100%) rename {apps => lib-opensource}/emqx_management/include/emqx_mgmt.hrl (100%) rename {apps => lib-opensource}/emqx_management/priv/emqx_management.schema (100%) rename {apps => lib-opensource}/emqx_management/rebar.config (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_management.app.src (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_alarms.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_apps.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_banned.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_brokers.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_clients.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_data.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_listeners.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_metrics.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_modules.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_nodes.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_plugins.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_pubsub.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_routes.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_stats.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_subscriptions.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_api_topic_metrics.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_app.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_auth.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_cli.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_http.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_sup.erl (100%) rename {apps => lib-opensource}/emqx_management/src/emqx_mgmt_util.erl (100%) rename {apps => lib-opensource}/emqx_management/test/emqx_mgmt_SUITE.erl (100%) rename {apps => lib-opensource}/emqx_management/test/emqx_mgmt_api_SUITE.erl (100%) rename {apps => lib-opensource}/emqx_management/test/etc/emqx_management.conf (100%) rename {apps => lib-opensource}/emqx_management/test/etc/emqx_reloader.conf (100%) rename {apps => lib-opensource}/emqx_management/test/rfc6455_client.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/.gitignore (100%) rename {apps => lib-opensource}/emqx_rule_engine/README.md (100%) rename {apps => lib-opensource}/emqx_rule_engine/docs/api_examples.md (100%) rename {apps => lib-opensource}/emqx_rule_engine/docs/cli_examples.md (100%) rename {apps => lib-opensource}/emqx_rule_engine/docs/design.md (100%) rename {apps => lib-opensource}/emqx_rule_engine/etc/emqx_rule_engine.conf (100%) rename {apps => lib-opensource}/emqx_rule_engine/include/rule_actions.hrl (100%) rename {apps => lib-opensource}/emqx_rule_engine/include/rule_engine.hrl (100%) rename {apps => lib-opensource}/emqx_rule_engine/priv/emqx_rule_engine.schema (100%) rename {apps => lib-opensource}/emqx_rule_engine/rebar.config (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_actions.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_actions_trans.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_engine.app.src (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_engine.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_engine_api.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_engine_app.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_engine_cli.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_engine_sup.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_events.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_funcs.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_id.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_locker.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_maps.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_metrics.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_registry.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_runtime.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_sqlparser.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_sqltester.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_utils.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/src/emqx_rule_validator.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/test/emqx_rule_events_SUITE.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/test/emqx_rule_funcs_SUITE.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/test/emqx_rule_id_SUITE.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/test/emqx_rule_maps_SUITE.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/test/emqx_rule_metrics_SUITE.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/test/emqx_rule_registry_SUITE.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/test/emqx_rule_utils_SUITE.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/test/emqx_rule_validator_SUITE.erl (100%) rename {apps => lib-opensource}/emqx_rule_engine/test/prop_rule_maps.erl (100%) diff --git a/.gitignore b/.gitignore index d320582c5..51b4acf83 100644 --- a/.gitignore +++ b/.gitignore @@ -41,5 +41,5 @@ tmp/ _packages elvis emqx_dialyzer_*_plt -apps/emqx_dashboard/priv/www +*/emqx_dashboard/priv/www dist.zip diff --git a/apps/emqx_dashboard/.gitignore b/lib-opensource/emqx_dashboard/.gitignore similarity index 100% rename from apps/emqx_dashboard/.gitignore rename to lib-opensource/emqx_dashboard/.gitignore diff --git a/apps/emqx_dashboard/README.md b/lib-opensource/emqx_dashboard/README.md similarity index 100% rename from apps/emqx_dashboard/README.md rename to lib-opensource/emqx_dashboard/README.md diff --git a/apps/emqx_dashboard/etc/emqx_dashboard.conf b/lib-opensource/emqx_dashboard/etc/emqx_dashboard.conf similarity index 100% rename from apps/emqx_dashboard/etc/emqx_dashboard.conf rename to lib-opensource/emqx_dashboard/etc/emqx_dashboard.conf diff --git a/apps/emqx_dashboard/include/emqx_dashboard.hrl b/lib-opensource/emqx_dashboard/include/emqx_dashboard.hrl similarity index 100% rename from apps/emqx_dashboard/include/emqx_dashboard.hrl rename to lib-opensource/emqx_dashboard/include/emqx_dashboard.hrl diff --git a/apps/emqx_dashboard/priv/emqx_dashboard.schema b/lib-opensource/emqx_dashboard/priv/emqx_dashboard.schema similarity index 100% rename from apps/emqx_dashboard/priv/emqx_dashboard.schema rename to lib-opensource/emqx_dashboard/priv/emqx_dashboard.schema diff --git a/apps/emqx_dashboard/rebar.config b/lib-opensource/emqx_dashboard/rebar.config similarity index 100% rename from apps/emqx_dashboard/rebar.config rename to lib-opensource/emqx_dashboard/rebar.config diff --git a/apps/emqx_dashboard/src/emqx_dashboard.app.src b/lib-opensource/emqx_dashboard/src/emqx_dashboard.app.src similarity index 100% rename from apps/emqx_dashboard/src/emqx_dashboard.app.src rename to lib-opensource/emqx_dashboard/src/emqx_dashboard.app.src diff --git a/apps/emqx_dashboard/src/emqx_dashboard.erl b/lib-opensource/emqx_dashboard/src/emqx_dashboard.erl similarity index 100% rename from apps/emqx_dashboard/src/emqx_dashboard.erl rename to lib-opensource/emqx_dashboard/src/emqx_dashboard.erl diff --git a/apps/emqx_dashboard/src/emqx_dashboard_admin.erl b/lib-opensource/emqx_dashboard/src/emqx_dashboard_admin.erl similarity index 100% rename from apps/emqx_dashboard/src/emqx_dashboard_admin.erl rename to lib-opensource/emqx_dashboard/src/emqx_dashboard_admin.erl diff --git a/apps/emqx_dashboard/src/emqx_dashboard_api.erl b/lib-opensource/emqx_dashboard/src/emqx_dashboard_api.erl similarity index 100% rename from apps/emqx_dashboard/src/emqx_dashboard_api.erl rename to lib-opensource/emqx_dashboard/src/emqx_dashboard_api.erl diff --git a/apps/emqx_dashboard/src/emqx_dashboard_app.erl b/lib-opensource/emqx_dashboard/src/emqx_dashboard_app.erl similarity index 100% rename from apps/emqx_dashboard/src/emqx_dashboard_app.erl rename to lib-opensource/emqx_dashboard/src/emqx_dashboard_app.erl diff --git a/apps/emqx_dashboard/src/emqx_dashboard_cli.erl b/lib-opensource/emqx_dashboard/src/emqx_dashboard_cli.erl similarity index 100% rename from apps/emqx_dashboard/src/emqx_dashboard_cli.erl rename to lib-opensource/emqx_dashboard/src/emqx_dashboard_cli.erl diff --git a/apps/emqx_dashboard/src/emqx_dashboard_sup.erl b/lib-opensource/emqx_dashboard/src/emqx_dashboard_sup.erl similarity index 100% rename from apps/emqx_dashboard/src/emqx_dashboard_sup.erl rename to lib-opensource/emqx_dashboard/src/emqx_dashboard_sup.erl diff --git a/apps/emqx_dashboard/test/.placeholder b/lib-opensource/emqx_dashboard/test/.placeholder similarity index 100% rename from apps/emqx_dashboard/test/.placeholder rename to lib-opensource/emqx_dashboard/test/.placeholder diff --git a/apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl b/lib-opensource/emqx_dashboard/test/emqx_dashboard_SUITE.erl similarity index 100% rename from apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl rename to lib-opensource/emqx_dashboard/test/emqx_dashboard_SUITE.erl diff --git a/apps/emqx_management/.gitignore b/lib-opensource/emqx_management/.gitignore similarity index 100% rename from apps/emqx_management/.gitignore rename to lib-opensource/emqx_management/.gitignore diff --git a/apps/emqx_management/README.md b/lib-opensource/emqx_management/README.md similarity index 100% rename from apps/emqx_management/README.md rename to lib-opensource/emqx_management/README.md diff --git a/apps/emqx_management/etc/emqx_management.conf b/lib-opensource/emqx_management/etc/emqx_management.conf similarity index 100% rename from apps/emqx_management/etc/emqx_management.conf rename to lib-opensource/emqx_management/etc/emqx_management.conf diff --git a/apps/emqx_management/include/emqx_mgmt.hrl b/lib-opensource/emqx_management/include/emqx_mgmt.hrl similarity index 100% rename from apps/emqx_management/include/emqx_mgmt.hrl rename to lib-opensource/emqx_management/include/emqx_mgmt.hrl diff --git a/apps/emqx_management/priv/emqx_management.schema b/lib-opensource/emqx_management/priv/emqx_management.schema similarity index 100% rename from apps/emqx_management/priv/emqx_management.schema rename to lib-opensource/emqx_management/priv/emqx_management.schema diff --git a/apps/emqx_management/rebar.config b/lib-opensource/emqx_management/rebar.config similarity index 100% rename from apps/emqx_management/rebar.config rename to lib-opensource/emqx_management/rebar.config diff --git a/apps/emqx_management/src/emqx_management.app.src b/lib-opensource/emqx_management/src/emqx_management.app.src similarity index 100% rename from apps/emqx_management/src/emqx_management.app.src rename to lib-opensource/emqx_management/src/emqx_management.app.src diff --git a/apps/emqx_management/src/emqx_mgmt.erl b/lib-opensource/emqx_management/src/emqx_mgmt.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt.erl rename to lib-opensource/emqx_management/src/emqx_mgmt.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_alarms.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_alarms.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_alarms.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_alarms.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_apps.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_apps.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_apps.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_apps.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_banned.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_banned.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_banned.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_banned.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_brokers.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_brokers.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_brokers.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_brokers.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_clients.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_clients.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_clients.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_clients.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_data.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_data.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_data.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_data.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_listeners.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_listeners.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_listeners.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_listeners.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_metrics.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_metrics.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_metrics.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_metrics.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_modules.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_modules.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_modules.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_modules.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_nodes.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_nodes.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_nodes.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_nodes.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_plugins.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_plugins.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_plugins.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_plugins.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_pubsub.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_pubsub.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_pubsub.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_pubsub.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_routes.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_routes.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_routes.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_routes.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_stats.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_stats.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_stats.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_stats.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_subscriptions.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_subscriptions.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_subscriptions.erl diff --git a/apps/emqx_management/src/emqx_mgmt_api_topic_metrics.erl b/lib-opensource/emqx_management/src/emqx_mgmt_api_topic_metrics.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_api_topic_metrics.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_api_topic_metrics.erl diff --git a/apps/emqx_management/src/emqx_mgmt_app.erl b/lib-opensource/emqx_management/src/emqx_mgmt_app.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_app.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_app.erl diff --git a/apps/emqx_management/src/emqx_mgmt_auth.erl b/lib-opensource/emqx_management/src/emqx_mgmt_auth.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_auth.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_auth.erl diff --git a/apps/emqx_management/src/emqx_mgmt_cli.erl b/lib-opensource/emqx_management/src/emqx_mgmt_cli.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_cli.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_cli.erl diff --git a/apps/emqx_management/src/emqx_mgmt_http.erl b/lib-opensource/emqx_management/src/emqx_mgmt_http.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_http.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_http.erl diff --git a/apps/emqx_management/src/emqx_mgmt_sup.erl b/lib-opensource/emqx_management/src/emqx_mgmt_sup.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_sup.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_sup.erl diff --git a/apps/emqx_management/src/emqx_mgmt_util.erl b/lib-opensource/emqx_management/src/emqx_mgmt_util.erl similarity index 100% rename from apps/emqx_management/src/emqx_mgmt_util.erl rename to lib-opensource/emqx_management/src/emqx_mgmt_util.erl diff --git a/apps/emqx_management/test/emqx_mgmt_SUITE.erl b/lib-opensource/emqx_management/test/emqx_mgmt_SUITE.erl similarity index 100% rename from apps/emqx_management/test/emqx_mgmt_SUITE.erl rename to lib-opensource/emqx_management/test/emqx_mgmt_SUITE.erl diff --git a/apps/emqx_management/test/emqx_mgmt_api_SUITE.erl b/lib-opensource/emqx_management/test/emqx_mgmt_api_SUITE.erl similarity index 100% rename from apps/emqx_management/test/emqx_mgmt_api_SUITE.erl rename to lib-opensource/emqx_management/test/emqx_mgmt_api_SUITE.erl diff --git a/apps/emqx_management/test/etc/emqx_management.conf b/lib-opensource/emqx_management/test/etc/emqx_management.conf similarity index 100% rename from apps/emqx_management/test/etc/emqx_management.conf rename to lib-opensource/emqx_management/test/etc/emqx_management.conf diff --git a/apps/emqx_management/test/etc/emqx_reloader.conf b/lib-opensource/emqx_management/test/etc/emqx_reloader.conf similarity index 100% rename from apps/emqx_management/test/etc/emqx_reloader.conf rename to lib-opensource/emqx_management/test/etc/emqx_reloader.conf diff --git a/apps/emqx_management/test/rfc6455_client.erl b/lib-opensource/emqx_management/test/rfc6455_client.erl similarity index 100% rename from apps/emqx_management/test/rfc6455_client.erl rename to lib-opensource/emqx_management/test/rfc6455_client.erl diff --git a/apps/emqx_rule_engine/.gitignore b/lib-opensource/emqx_rule_engine/.gitignore similarity index 100% rename from apps/emqx_rule_engine/.gitignore rename to lib-opensource/emqx_rule_engine/.gitignore diff --git a/apps/emqx_rule_engine/README.md b/lib-opensource/emqx_rule_engine/README.md similarity index 100% rename from apps/emqx_rule_engine/README.md rename to lib-opensource/emqx_rule_engine/README.md diff --git a/apps/emqx_rule_engine/docs/api_examples.md b/lib-opensource/emqx_rule_engine/docs/api_examples.md similarity index 100% rename from apps/emqx_rule_engine/docs/api_examples.md rename to lib-opensource/emqx_rule_engine/docs/api_examples.md diff --git a/apps/emqx_rule_engine/docs/cli_examples.md b/lib-opensource/emqx_rule_engine/docs/cli_examples.md similarity index 100% rename from apps/emqx_rule_engine/docs/cli_examples.md rename to lib-opensource/emqx_rule_engine/docs/cli_examples.md diff --git a/apps/emqx_rule_engine/docs/design.md b/lib-opensource/emqx_rule_engine/docs/design.md similarity index 100% rename from apps/emqx_rule_engine/docs/design.md rename to lib-opensource/emqx_rule_engine/docs/design.md diff --git a/apps/emqx_rule_engine/etc/emqx_rule_engine.conf b/lib-opensource/emqx_rule_engine/etc/emqx_rule_engine.conf similarity index 100% rename from apps/emqx_rule_engine/etc/emqx_rule_engine.conf rename to lib-opensource/emqx_rule_engine/etc/emqx_rule_engine.conf diff --git a/apps/emqx_rule_engine/include/rule_actions.hrl b/lib-opensource/emqx_rule_engine/include/rule_actions.hrl similarity index 100% rename from apps/emqx_rule_engine/include/rule_actions.hrl rename to lib-opensource/emqx_rule_engine/include/rule_actions.hrl diff --git a/apps/emqx_rule_engine/include/rule_engine.hrl b/lib-opensource/emqx_rule_engine/include/rule_engine.hrl similarity index 100% rename from apps/emqx_rule_engine/include/rule_engine.hrl rename to lib-opensource/emqx_rule_engine/include/rule_engine.hrl diff --git a/apps/emqx_rule_engine/priv/emqx_rule_engine.schema b/lib-opensource/emqx_rule_engine/priv/emqx_rule_engine.schema similarity index 100% rename from apps/emqx_rule_engine/priv/emqx_rule_engine.schema rename to lib-opensource/emqx_rule_engine/priv/emqx_rule_engine.schema diff --git a/apps/emqx_rule_engine/rebar.config b/lib-opensource/emqx_rule_engine/rebar.config similarity index 100% rename from apps/emqx_rule_engine/rebar.config rename to lib-opensource/emqx_rule_engine/rebar.config diff --git a/apps/emqx_rule_engine/src/emqx_rule_actions.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_actions.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_actions.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_actions.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_actions_trans.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_actions_trans.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_actions_trans.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_actions_trans.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src b/lib-opensource/emqx_rule_engine/src/emqx_rule_engine.app.src similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_engine.app.src rename to lib-opensource/emqx_rule_engine/src/emqx_rule_engine.app.src diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_engine.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_engine.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_engine.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine_api.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_engine_api.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_engine_api.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_engine_api.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine_app.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_engine_app.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_engine_app.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_engine_app.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine_cli.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_engine_cli.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_engine_cli.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_engine_cli.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine_sup.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_engine_sup.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_engine_sup.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_engine_sup.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_events.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_events.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_events.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_events.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_funcs.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_funcs.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_funcs.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_funcs.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_id.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_id.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_id.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_id.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_locker.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_locker.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_locker.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_locker.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_maps.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_maps.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_maps.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_maps.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_metrics.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_metrics.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_metrics.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_metrics.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_registry.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_registry.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_registry.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_registry.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_runtime.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_runtime.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_runtime.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_runtime.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_sqlparser.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_sqlparser.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_sqlparser.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_sqlparser.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_sqltester.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_sqltester.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_sqltester.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_sqltester.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_utils.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_utils.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_utils.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_utils.erl diff --git a/apps/emqx_rule_engine/src/emqx_rule_validator.erl b/lib-opensource/emqx_rule_engine/src/emqx_rule_validator.erl similarity index 100% rename from apps/emqx_rule_engine/src/emqx_rule_validator.erl rename to lib-opensource/emqx_rule_engine/src/emqx_rule_validator.erl diff --git a/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl b/lib-opensource/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl similarity index 100% rename from apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl rename to lib-opensource/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl diff --git a/apps/emqx_rule_engine/test/emqx_rule_events_SUITE.erl b/lib-opensource/emqx_rule_engine/test/emqx_rule_events_SUITE.erl similarity index 100% rename from apps/emqx_rule_engine/test/emqx_rule_events_SUITE.erl rename to lib-opensource/emqx_rule_engine/test/emqx_rule_events_SUITE.erl diff --git a/apps/emqx_rule_engine/test/emqx_rule_funcs_SUITE.erl b/lib-opensource/emqx_rule_engine/test/emqx_rule_funcs_SUITE.erl similarity index 100% rename from apps/emqx_rule_engine/test/emqx_rule_funcs_SUITE.erl rename to lib-opensource/emqx_rule_engine/test/emqx_rule_funcs_SUITE.erl diff --git a/apps/emqx_rule_engine/test/emqx_rule_id_SUITE.erl b/lib-opensource/emqx_rule_engine/test/emqx_rule_id_SUITE.erl similarity index 100% rename from apps/emqx_rule_engine/test/emqx_rule_id_SUITE.erl rename to lib-opensource/emqx_rule_engine/test/emqx_rule_id_SUITE.erl diff --git a/apps/emqx_rule_engine/test/emqx_rule_maps_SUITE.erl b/lib-opensource/emqx_rule_engine/test/emqx_rule_maps_SUITE.erl similarity index 100% rename from apps/emqx_rule_engine/test/emqx_rule_maps_SUITE.erl rename to lib-opensource/emqx_rule_engine/test/emqx_rule_maps_SUITE.erl diff --git a/apps/emqx_rule_engine/test/emqx_rule_metrics_SUITE.erl b/lib-opensource/emqx_rule_engine/test/emqx_rule_metrics_SUITE.erl similarity index 100% rename from apps/emqx_rule_engine/test/emqx_rule_metrics_SUITE.erl rename to lib-opensource/emqx_rule_engine/test/emqx_rule_metrics_SUITE.erl diff --git a/apps/emqx_rule_engine/test/emqx_rule_registry_SUITE.erl b/lib-opensource/emqx_rule_engine/test/emqx_rule_registry_SUITE.erl similarity index 100% rename from apps/emqx_rule_engine/test/emqx_rule_registry_SUITE.erl rename to lib-opensource/emqx_rule_engine/test/emqx_rule_registry_SUITE.erl diff --git a/apps/emqx_rule_engine/test/emqx_rule_utils_SUITE.erl b/lib-opensource/emqx_rule_engine/test/emqx_rule_utils_SUITE.erl similarity index 100% rename from apps/emqx_rule_engine/test/emqx_rule_utils_SUITE.erl rename to lib-opensource/emqx_rule_engine/test/emqx_rule_utils_SUITE.erl diff --git a/apps/emqx_rule_engine/test/emqx_rule_validator_SUITE.erl b/lib-opensource/emqx_rule_engine/test/emqx_rule_validator_SUITE.erl similarity index 100% rename from apps/emqx_rule_engine/test/emqx_rule_validator_SUITE.erl rename to lib-opensource/emqx_rule_engine/test/emqx_rule_validator_SUITE.erl diff --git a/apps/emqx_rule_engine/test/prop_rule_maps.erl b/lib-opensource/emqx_rule_engine/test/prop_rule_maps.erl similarity index 100% rename from apps/emqx_rule_engine/test/prop_rule_maps.erl rename to lib-opensource/emqx_rule_engine/test/prop_rule_maps.erl From e7785a63eec21c18b23430176ba1c6ea5d2e0865 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Wed, 10 Feb 2021 22:24:41 +0100 Subject: [PATCH 2/3] fix(scripts): update scripts to work with new lib-opensource dir --- Makefile | 1 + elvis.config | 4 ++-- get-dashboard.sh | 9 ++++++--- rebar.config.erl | 2 +- sync-apps.sh | 6 +++--- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 76e3802bd..81b8b4fb0 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ REBAR_VERSION = 3.14.3-emqx-4 DASHBOARD_VERSION = v4.3.0 REBAR = $(CURDIR)/rebar3 BUILD = $(CURDIR)/build +export EMQX_ENTERPRISE=false export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh) PROFILE ?= emqx diff --git a/elvis.config b/elvis.config index 42f67e40f..bb551e81a 100644 --- a/elvis.config +++ b/elvis.config @@ -5,7 +5,7 @@ [ {config, [ - #{dirs => ["apps/**/src", "src"], + #{dirs => ["src", "apps/**/src", "lib-opensource/**/src"], filter => "*.erl", ruleset => erl_files, rules => [ @@ -16,7 +16,7 @@ ]}} ] }, - #{dirs => ["apps/**/test", "test"], + #{dirs => ["test", "apps/**/test", "lib-opensource/**/src"], filter => "*.erl", rules => [ {elvis_text_style, line_length, #{ limit => 100 diff --git a/get-dashboard.sh b/get-dashboard.sh index 08879351d..885a68f77 100755 --- a/get-dashboard.sh +++ b/get-dashboard.sh @@ -1,6 +1,5 @@ -#!/bin/sh +#!/bin/bash -#set -euo pipefail set -eu VERSION="$1" @@ -10,7 +9,11 @@ cd -P -- "$(dirname -- "$0")" DOWNLOAD_URL='https://github.com/emqx/emqx-dashboard-frontend/releases/download' -DASHBOARD_PATH='apps/emqx_dashboard/priv' +if [ "$EMQX_ENTERPRISE" = 'true' ] || [ "$EMQX_ENTERPRISE" == '1' ]; then + DASHBOARD_PATH='lib-enterprise/emqx_dashboard/priv' +else + DASHBOARD_PATH='lib-opensource/emqx_dashboard/priv' +fi case $(uname) in *Darwin*) SED="sed -E";; diff --git a/rebar.config.erl b/rebar.config.erl index d68d46b9b..4bd8f45e4 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -279,7 +279,7 @@ provide_bcrypt_release(ReleaseType) -> %% rebar3 does not handle umberella project's cross-app parse_transform well compile_and_load_pase_transforms(Dir) -> PtFiles = - [ "apps/emqx_rule_engine/src/emqx_rule_actions_trans.erl" + [ "lib-opensource/emqx_rule_engine/src/emqx_rule_actions_trans.erl" ], CompileOpts = [verbose,report_errors,report_warnings,return_errors,debug_info], lists:foreach(fun(PtFile) -> {ok, _Mod} = compile:file(path(Dir, PtFile), CompileOpts) end, PtFiles). diff --git a/sync-apps.sh b/sync-apps.sh index 1b4b8fcc2..e5c36228f 100755 --- a/sync-apps.sh +++ b/sync-apps.sh @@ -15,17 +15,17 @@ apps=( "emqx_auth_redis" "emqx_bridge_mqtt" "emqx_coap" -"emqx_dashboard" +# "emqx_dashboard" # moved to lib-opensource "emqx_exhook" "emqx_exproto" "emqx_lua_hook" "emqx_lwm2m" -"emqx_management" +# "emqx_management" # moved to lib-opensource "emqx_prometheus" "emqx_psk_file" "emqx_recon" "emqx_retainer" -"emqx_rule_engine" +# "emqx_rule_engine" # moved to lib-opensource "emqx_sasl" "emqx_sn" "emqx_stomp" From 23b66c0fd58b40cb499dad0649359b20280a16b0 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Wed, 10 Feb 2021 22:25:16 +0100 Subject: [PATCH 3/3] chore(rebar.config.erl): wildcard only one level for include dir --- rebar.config.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rebar.config.erl b/rebar.config.erl index 4bd8f45e4..08b3e2be9 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -291,8 +291,8 @@ str(B) when is_binary(B) -> unicode:characters_to_list(B, utf8). erl_opts_i() -> [{i, "apps"}] ++ - [{i, Dir} || Dir <- filelib:wildcard(filename:join(["apps", "**", "include"]))] ++ - [{i, Dir} || Dir <- filelib:wildcard(filename:join([extra_lib_dir(), "**", "include"]))]. + [{i, Dir} || Dir <- filelib:wildcard(filename:join(["apps", "*", "include"]))] ++ + [{i, Dir} || Dir <- filelib:wildcard(filename:join([extra_lib_dir(), "*", "include"]))]. dialyzer(Config) -> {dialyzer, OldDialyzerConfig} = lists:keyfind(dialyzer, 1, Config),