From 59c9251f3584e8d016c41305ec272bfbf662405a Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Mon, 22 Feb 2016 17:34:21 +0100 Subject: src: Rename daemons and add tools folder This renames the daemons to end with a 'd', as is common for UNIX daemons. It also adds a tools folder, that will hold the tools of the Ouroboros prototype. Examples are a simple echo application, an application to instruct the IRM ... --- src/CMakeLists.txt | 7 ++++--- src/da/CMakeLists.txt | 16 ---------------- src/da/main.c | 10 ---------- src/dad/CMakeLists.txt | 16 ++++++++++++++++ src/dad/main.c | 10 ++++++++++ src/ipcp/CMakeLists.txt | 16 ---------------- src/ipcp/main.c | 10 ---------- src/ipcpd/CMakeLists.txt | 16 ++++++++++++++++ src/ipcpd/main.c | 10 ++++++++++ src/irm/CMakeLists.txt | 16 ---------------- src/irm/main.c | 10 ---------- src/irmd/CMakeLists.txt | 16 ++++++++++++++++ src/irmd/main.c | 10 ++++++++++ src/tools/CMakeLists.txt | 1 + src/tools/irm/CMakeLists.txt | 16 ++++++++++++++++ src/tools/irm/main.c | 32 ++++++++++++++++++++++++++++++++ 16 files changed, 131 insertions(+), 81 deletions(-) delete mode 100644 src/da/CMakeLists.txt delete mode 100644 src/da/main.c create mode 100644 src/dad/CMakeLists.txt create mode 100644 src/dad/main.c delete mode 100644 src/ipcp/CMakeLists.txt delete mode 100644 src/ipcp/main.c create mode 100644 src/ipcpd/CMakeLists.txt create mode 100644 src/ipcpd/main.c delete mode 100644 src/irm/CMakeLists.txt delete mode 100644 src/irm/main.c create mode 100644 src/irmd/CMakeLists.txt create mode 100644 src/irmd/main.c create mode 100644 src/tools/CMakeLists.txt create mode 100644 src/tools/irm/CMakeLists.txt create mode 100644 src/tools/irm/main.c (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ca434d8a..b0732f08 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,5 @@ -add_subdirectory(ipcp) -add_subdirectory(irm) -add_subdirectory(da) +add_subdirectory(ipcpd) +add_subdirectory(irmd) +add_subdirectory(dad) add_subdirectory(lib) +add_subdirectory(tools) diff --git a/src/da/CMakeLists.txt b/src/da/CMakeLists.txt deleted file mode 100644 index 050b0f80..00000000 --- a/src/da/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -include_directories(${CMAKE_SOURCE_DIR}/include) -include_directories(${CMAKE_BINARY_DIR}/include) - -set(SOURCE_FILES - # Add source files here - main.c -) - -add_executable (da ${SOURCE_FILES}) - -target_link_libraries (da LINK_PUBLIC ouroboros) - -install(TARGETS da RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) diff --git a/src/da/main.c b/src/da/main.c deleted file mode 100644 index e2971dca..00000000 --- a/src/da/main.c +++ /dev/null @@ -1,10 +0,0 @@ -#define OUROBOROS_PREFIX "da" - -#include - -int main() -{ - LOG_DBG("Test of the DA"); - - return 0; -} diff --git a/src/dad/CMakeLists.txt b/src/dad/CMakeLists.txt new file mode 100644 index 00000000..3d4b8ea7 --- /dev/null +++ b/src/dad/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +include_directories(${CMAKE_SOURCE_DIR}/include) +include_directories(${CMAKE_BINARY_DIR}/include) + +set(SOURCE_FILES + # Add source files here + main.c +) + +add_executable (dad ${SOURCE_FILES}) + +target_link_libraries (dad LINK_PUBLIC ouroboros) + +install(TARGETS dad RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) diff --git a/src/dad/main.c b/src/dad/main.c new file mode 100644 index 00000000..e2971dca --- /dev/null +++ b/src/dad/main.c @@ -0,0 +1,10 @@ +#define OUROBOROS_PREFIX "da" + +#include + +int main() +{ + LOG_DBG("Test of the DA"); + + return 0; +} diff --git a/src/ipcp/CMakeLists.txt b/src/ipcp/CMakeLists.txt deleted file mode 100644 index 845f5b7b..00000000 --- a/src/ipcp/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -include_directories(${CMAKE_SOURCE_DIR}/include) -include_directories(${CMAKE_BINARY_DIR}/include) - -set(SOURCE_FILES - # Add source files here - main.c -) - -add_executable (ipcp ${SOURCE_FILES}) - -target_link_libraries (ipcp LINK_PUBLIC ouroboros) - -install(TARGETS ipcp RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) diff --git a/src/ipcp/main.c b/src/ipcp/main.c deleted file mode 100644 index b67b0af9..00000000 --- a/src/ipcp/main.c +++ /dev/null @@ -1,10 +0,0 @@ -#define OUROBOROS_PREFIX "ipcp" - -#include - -int main() -{ - LOG_DBG("Test of the IPCP"); - - return 0; -} diff --git a/src/ipcpd/CMakeLists.txt b/src/ipcpd/CMakeLists.txt new file mode 100644 index 00000000..b16413cc --- /dev/null +++ b/src/ipcpd/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +include_directories(${CMAKE_SOURCE_DIR}/include) +include_directories(${CMAKE_BINARY_DIR}/include) + +set(SOURCE_FILES + # Add source files here + main.c +) + +add_executable (ipcpd ${SOURCE_FILES}) + +target_link_libraries (ipcpd LINK_PUBLIC ouroboros) + +install(TARGETS ipcpd RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) diff --git a/src/ipcpd/main.c b/src/ipcpd/main.c new file mode 100644 index 00000000..b67b0af9 --- /dev/null +++ b/src/ipcpd/main.c @@ -0,0 +1,10 @@ +#define OUROBOROS_PREFIX "ipcp" + +#include + +int main() +{ + LOG_DBG("Test of the IPCP"); + + return 0; +} diff --git a/src/irm/CMakeLists.txt b/src/irm/CMakeLists.txt deleted file mode 100644 index 82c73e38..00000000 --- a/src/irm/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -include_directories(${CMAKE_SOURCE_DIR}/include) -include_directories(${CMAKE_BINARY_DIR}/include) - -set(SOURCE_FILES - # Add source files here - main.c -) - -add_executable (irm ${SOURCE_FILES}) - -target_link_libraries (irm LINK_PUBLIC ouroboros) - -install(TARGETS irm RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) diff --git a/src/irm/main.c b/src/irm/main.c deleted file mode 100644 index 8ab071e0..00000000 --- a/src/irm/main.c +++ /dev/null @@ -1,10 +0,0 @@ -#define OUROBOROS_PREFIX "irm" - -#include - -int main() -{ - LOG_DBG("Test of the IRM"); - - return 0; -} diff --git a/src/irmd/CMakeLists.txt b/src/irmd/CMakeLists.txt new file mode 100644 index 00000000..bda793b7 --- /dev/null +++ b/src/irmd/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +include_directories(${CMAKE_SOURCE_DIR}/include) +include_directories(${CMAKE_BINARY_DIR}/include) + +set(SOURCE_FILES + # Add source files here + main.c +) + +add_executable (irmd ${SOURCE_FILES}) + +target_link_libraries (irmd LINK_PUBLIC ouroboros) + +install(TARGETS irmd RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) diff --git a/src/irmd/main.c b/src/irmd/main.c new file mode 100644 index 00000000..8ab071e0 --- /dev/null +++ b/src/irmd/main.c @@ -0,0 +1,10 @@ +#define OUROBOROS_PREFIX "irm" + +#include + +int main() +{ + LOG_DBG("Test of the IRM"); + + return 0; +} diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt new file mode 100644 index 00000000..6e00c17b --- /dev/null +++ b/src/tools/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(irm) diff --git a/src/tools/irm/CMakeLists.txt b/src/tools/irm/CMakeLists.txt new file mode 100644 index 00000000..82c73e38 --- /dev/null +++ b/src/tools/irm/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +include_directories(${CMAKE_SOURCE_DIR}/include) +include_directories(${CMAKE_BINARY_DIR}/include) + +set(SOURCE_FILES + # Add source files here + main.c +) + +add_executable (irm ${SOURCE_FILES}) + +target_link_libraries (irm LINK_PUBLIC ouroboros) + +install(TARGETS irm RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) diff --git a/src/tools/irm/main.c b/src/tools/irm/main.c new file mode 100644 index 00000000..bad1000e --- /dev/null +++ b/src/tools/irm/main.c @@ -0,0 +1,32 @@ +/* + * Ouroboros - Copyright (C) 2016 + * + * A tool to instruct the IRM + * + * Sander Vrijders + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#define OUROBOROS_PREFIX "irm" + +#include + +int main () { + + LOG_DBG("Test of the IRM tool"); + + return 0; +} -- cgit v1.2.3