From e82247bf35d9abf7d3d2cd946d5c3e48e4705cf2 Mon Sep 17 00:00:00 2001 From: zhangjunhao Date: Sat, 21 Apr 2018 14:26:44 +0800 Subject: [PATCH] feat(nopoll): Redefine nopoll file folder structure --- components/nopoll/component.mk | 4 ++-- .../nopoll/{library => nopoll/src}/nopoll-regression-client.c | 2 +- components/nopoll/{library => nopoll/src}/nopoll.c | 0 components/nopoll/{include/nopoll => nopoll/src}/nopoll.h | 0 components/nopoll/{library => nopoll/src}/nopoll_conn.c | 0 .../nopoll/{include/nopoll => nopoll/src}/nopoll_conn.h | 0 components/nopoll/{library => nopoll/src}/nopoll_conn_opts.c | 0 .../nopoll/{include/nopoll => nopoll/src}/nopoll_conn_opts.h | 0 components/nopoll/{library => nopoll/src}/nopoll_ctx.c | 0 components/nopoll/{include/nopoll => nopoll/src}/nopoll_ctx.h | 0 components/nopoll/{library => nopoll/src}/nopoll_decl.c | 0 .../nopoll/{include/nopoll => nopoll/src}/nopoll_decl.h | 0 .../nopoll/{include/nopoll => nopoll/src}/nopoll_handlers.h | 0 components/nopoll/{library => nopoll/src}/nopoll_io.c | 0 components/nopoll/{include/nopoll => nopoll/src}/nopoll_io.h | 0 components/nopoll/{library => nopoll/src}/nopoll_listener.c | 0 .../nopoll/{include/nopoll => nopoll/src}/nopoll_listener.h | 0 components/nopoll/{library => nopoll/src}/nopoll_log.c | 0 components/nopoll/{include/nopoll => nopoll/src}/nopoll_log.h | 0 components/nopoll/{library => nopoll/src}/nopoll_loop.c | 0 .../nopoll/{include/nopoll => nopoll/src}/nopoll_loop.h | 0 components/nopoll/{library => nopoll/src}/nopoll_msg.c | 0 components/nopoll/{include/nopoll => nopoll/src}/nopoll_msg.h | 0 .../nopoll/{include/nopoll => nopoll/src}/nopoll_private.h | 0 components/nopoll/{library => nopoll/src}/nopoll_win32.c | 0 .../nopoll/{include/nopoll => nopoll/src}/nopoll_win32.h | 0 .../nopoll/{include/nopoll => port/include}/nopoll_config.h | 0 examples/protocols/websocket/main/websocket.c | 2 +- 28 files changed, 4 insertions(+), 4 deletions(-) rename components/nopoll/{library => nopoll/src}/nopoll-regression-client.c (99%) rename components/nopoll/{library => nopoll/src}/nopoll.c (100%) rename components/nopoll/{include/nopoll => nopoll/src}/nopoll.h (100%) rename components/nopoll/{library => nopoll/src}/nopoll_conn.c (100%) rename components/nopoll/{include/nopoll => nopoll/src}/nopoll_conn.h (100%) rename components/nopoll/{library => nopoll/src}/nopoll_conn_opts.c (100%) rename components/nopoll/{include/nopoll => nopoll/src}/nopoll_conn_opts.h (100%) rename components/nopoll/{library => nopoll/src}/nopoll_ctx.c (100%) rename components/nopoll/{include/nopoll => nopoll/src}/nopoll_ctx.h (100%) rename components/nopoll/{library => nopoll/src}/nopoll_decl.c (100%) rename components/nopoll/{include/nopoll => nopoll/src}/nopoll_decl.h (100%) rename components/nopoll/{include/nopoll => nopoll/src}/nopoll_handlers.h (100%) rename components/nopoll/{library => nopoll/src}/nopoll_io.c (100%) rename components/nopoll/{include/nopoll => nopoll/src}/nopoll_io.h (100%) rename components/nopoll/{library => nopoll/src}/nopoll_listener.c (100%) rename components/nopoll/{include/nopoll => nopoll/src}/nopoll_listener.h (100%) rename components/nopoll/{library => nopoll/src}/nopoll_log.c (100%) rename components/nopoll/{include/nopoll => nopoll/src}/nopoll_log.h (100%) rename components/nopoll/{library => nopoll/src}/nopoll_loop.c (100%) rename components/nopoll/{include/nopoll => nopoll/src}/nopoll_loop.h (100%) rename components/nopoll/{library => nopoll/src}/nopoll_msg.c (100%) rename components/nopoll/{include/nopoll => nopoll/src}/nopoll_msg.h (100%) rename components/nopoll/{include/nopoll => nopoll/src}/nopoll_private.h (100%) rename components/nopoll/{library => nopoll/src}/nopoll_win32.c (100%) rename components/nopoll/{include/nopoll => nopoll/src}/nopoll_win32.h (100%) rename components/nopoll/{include/nopoll => port/include}/nopoll_config.h (100%) diff --git a/components/nopoll/component.mk b/components/nopoll/component.mk index 116d437d..c25e549d 100644 --- a/components/nopoll/component.mk +++ b/components/nopoll/component.mk @@ -3,7 +3,7 @@ # ifdef CONFIG_SSL_USING_MBEDTLS -COMPONENT_ADD_INCLUDEDIRS += include/nopoll +COMPONENT_ADD_INCLUDEDIRS += nopoll/src port/include -COMPONENT_SRCDIRS := library +COMPONENT_SRCDIRS := nopoll/src endif \ No newline at end of file diff --git a/components/nopoll/library/nopoll-regression-client.c b/components/nopoll/nopoll/src/nopoll-regression-client.c similarity index 99% rename from components/nopoll/library/nopoll-regression-client.c rename to components/nopoll/nopoll/src/nopoll-regression-client.c index f6ceca31..24af3918 100644 --- a/components/nopoll/library/nopoll-regression-client.c +++ b/components/nopoll/nopoll/src/nopoll-regression-client.c @@ -36,7 +36,7 @@ * Email address: * info@aspl.es - http://www.aspl.es/nopoll */ -#include +#include #include "esp_common.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" diff --git a/components/nopoll/library/nopoll.c b/components/nopoll/nopoll/src/nopoll.c similarity index 100% rename from components/nopoll/library/nopoll.c rename to components/nopoll/nopoll/src/nopoll.c diff --git a/components/nopoll/include/nopoll/nopoll.h b/components/nopoll/nopoll/src/nopoll.h similarity index 100% rename from components/nopoll/include/nopoll/nopoll.h rename to components/nopoll/nopoll/src/nopoll.h diff --git a/components/nopoll/library/nopoll_conn.c b/components/nopoll/nopoll/src/nopoll_conn.c similarity index 100% rename from components/nopoll/library/nopoll_conn.c rename to components/nopoll/nopoll/src/nopoll_conn.c diff --git a/components/nopoll/include/nopoll/nopoll_conn.h b/components/nopoll/nopoll/src/nopoll_conn.h similarity index 100% rename from components/nopoll/include/nopoll/nopoll_conn.h rename to components/nopoll/nopoll/src/nopoll_conn.h diff --git a/components/nopoll/library/nopoll_conn_opts.c b/components/nopoll/nopoll/src/nopoll_conn_opts.c similarity index 100% rename from components/nopoll/library/nopoll_conn_opts.c rename to components/nopoll/nopoll/src/nopoll_conn_opts.c diff --git a/components/nopoll/include/nopoll/nopoll_conn_opts.h b/components/nopoll/nopoll/src/nopoll_conn_opts.h similarity index 100% rename from components/nopoll/include/nopoll/nopoll_conn_opts.h rename to components/nopoll/nopoll/src/nopoll_conn_opts.h diff --git a/components/nopoll/library/nopoll_ctx.c b/components/nopoll/nopoll/src/nopoll_ctx.c similarity index 100% rename from components/nopoll/library/nopoll_ctx.c rename to components/nopoll/nopoll/src/nopoll_ctx.c diff --git a/components/nopoll/include/nopoll/nopoll_ctx.h b/components/nopoll/nopoll/src/nopoll_ctx.h similarity index 100% rename from components/nopoll/include/nopoll/nopoll_ctx.h rename to components/nopoll/nopoll/src/nopoll_ctx.h diff --git a/components/nopoll/library/nopoll_decl.c b/components/nopoll/nopoll/src/nopoll_decl.c similarity index 100% rename from components/nopoll/library/nopoll_decl.c rename to components/nopoll/nopoll/src/nopoll_decl.c diff --git a/components/nopoll/include/nopoll/nopoll_decl.h b/components/nopoll/nopoll/src/nopoll_decl.h similarity index 100% rename from components/nopoll/include/nopoll/nopoll_decl.h rename to components/nopoll/nopoll/src/nopoll_decl.h diff --git a/components/nopoll/include/nopoll/nopoll_handlers.h b/components/nopoll/nopoll/src/nopoll_handlers.h similarity index 100% rename from components/nopoll/include/nopoll/nopoll_handlers.h rename to components/nopoll/nopoll/src/nopoll_handlers.h diff --git a/components/nopoll/library/nopoll_io.c b/components/nopoll/nopoll/src/nopoll_io.c similarity index 100% rename from components/nopoll/library/nopoll_io.c rename to components/nopoll/nopoll/src/nopoll_io.c diff --git a/components/nopoll/include/nopoll/nopoll_io.h b/components/nopoll/nopoll/src/nopoll_io.h similarity index 100% rename from components/nopoll/include/nopoll/nopoll_io.h rename to components/nopoll/nopoll/src/nopoll_io.h diff --git a/components/nopoll/library/nopoll_listener.c b/components/nopoll/nopoll/src/nopoll_listener.c similarity index 100% rename from components/nopoll/library/nopoll_listener.c rename to components/nopoll/nopoll/src/nopoll_listener.c diff --git a/components/nopoll/include/nopoll/nopoll_listener.h b/components/nopoll/nopoll/src/nopoll_listener.h similarity index 100% rename from components/nopoll/include/nopoll/nopoll_listener.h rename to components/nopoll/nopoll/src/nopoll_listener.h diff --git a/components/nopoll/library/nopoll_log.c b/components/nopoll/nopoll/src/nopoll_log.c similarity index 100% rename from components/nopoll/library/nopoll_log.c rename to components/nopoll/nopoll/src/nopoll_log.c diff --git a/components/nopoll/include/nopoll/nopoll_log.h b/components/nopoll/nopoll/src/nopoll_log.h similarity index 100% rename from components/nopoll/include/nopoll/nopoll_log.h rename to components/nopoll/nopoll/src/nopoll_log.h diff --git a/components/nopoll/library/nopoll_loop.c b/components/nopoll/nopoll/src/nopoll_loop.c similarity index 100% rename from components/nopoll/library/nopoll_loop.c rename to components/nopoll/nopoll/src/nopoll_loop.c diff --git a/components/nopoll/include/nopoll/nopoll_loop.h b/components/nopoll/nopoll/src/nopoll_loop.h similarity index 100% rename from components/nopoll/include/nopoll/nopoll_loop.h rename to components/nopoll/nopoll/src/nopoll_loop.h diff --git a/components/nopoll/library/nopoll_msg.c b/components/nopoll/nopoll/src/nopoll_msg.c similarity index 100% rename from components/nopoll/library/nopoll_msg.c rename to components/nopoll/nopoll/src/nopoll_msg.c diff --git a/components/nopoll/include/nopoll/nopoll_msg.h b/components/nopoll/nopoll/src/nopoll_msg.h similarity index 100% rename from components/nopoll/include/nopoll/nopoll_msg.h rename to components/nopoll/nopoll/src/nopoll_msg.h diff --git a/components/nopoll/include/nopoll/nopoll_private.h b/components/nopoll/nopoll/src/nopoll_private.h similarity index 100% rename from components/nopoll/include/nopoll/nopoll_private.h rename to components/nopoll/nopoll/src/nopoll_private.h diff --git a/components/nopoll/library/nopoll_win32.c b/components/nopoll/nopoll/src/nopoll_win32.c similarity index 100% rename from components/nopoll/library/nopoll_win32.c rename to components/nopoll/nopoll/src/nopoll_win32.c diff --git a/components/nopoll/include/nopoll/nopoll_win32.h b/components/nopoll/nopoll/src/nopoll_win32.h similarity index 100% rename from components/nopoll/include/nopoll/nopoll_win32.h rename to components/nopoll/nopoll/src/nopoll_win32.h diff --git a/components/nopoll/include/nopoll/nopoll_config.h b/components/nopoll/port/include/nopoll_config.h similarity index 100% rename from components/nopoll/include/nopoll/nopoll_config.h rename to components/nopoll/port/include/nopoll_config.h diff --git a/examples/protocols/websocket/main/websocket.c b/examples/protocols/websocket/main/websocket.c index cc37acee..4f8eeb75 100644 --- a/examples/protocols/websocket/main/websocket.c +++ b/examples/protocols/websocket/main/websocket.c @@ -36,7 +36,7 @@ * Email address: * info@aspl.es - http://www.aspl.es/nopoll */ -#include +#include #include "esp_common.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h"