From 40d3d86ba268593b82c178aaad53a97ada91d44e Mon Sep 17 00:00:00 2001
From: Greg Foss <gregory.foss@uconn.edu>
Date: Tue, 28 Jan 2020 13:18:51 -0500
Subject: [PATCH] Reconfiguring build path and main folder to handle multiple
 compiled executables

---
 breadcrumbs/CMakeLists.txt                           | 12 ++++++++----
 breadcrumbs/scripts/startbfs.py                      |  3 ++-
 breadcrumbs/src/io/IOProcessor.cpp                   |  4 ----
 breadcrumbs/src/io/in_procs/.blank                   |  0
 breadcrumbs/src/io/out_procs/.blank                  |  0
 .../src/io/out_procs/VirtualOutputProcessor.cpp      |  8 --------
 breadcrumbs/src/{ => main}/Breadcrumbs.cpp           |  0
 breadcrumbs/src/main/VirtualOutputProcessor.cpp      |  5 +++++
 8 files changed, 15 insertions(+), 17 deletions(-)
 delete mode 100644 breadcrumbs/src/io/IOProcessor.cpp
 delete mode 100644 breadcrumbs/src/io/in_procs/.blank
 delete mode 100644 breadcrumbs/src/io/out_procs/.blank
 delete mode 100644 breadcrumbs/src/io/out_procs/VirtualOutputProcessor.cpp
 rename breadcrumbs/src/{ => main}/Breadcrumbs.cpp (100%)
 create mode 100644 breadcrumbs/src/main/VirtualOutputProcessor.cpp

diff --git a/breadcrumbs/CMakeLists.txt b/breadcrumbs/CMakeLists.txt
index 94f900a..d21bf8c 100644
--- a/breadcrumbs/CMakeLists.txt
+++ b/breadcrumbs/CMakeLists.txt
@@ -23,7 +23,7 @@ message("Source directory:      ${CMAKE_SOURCE_DIR}")
 message("Build directory:       ${CMAKE_BINARY_DIR}")
 message("Executable directory:  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
 message("Library directory:     ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
-message("Header file directory: ${INCLUDES_DIRECTORY}")
+message("Header file directory: ${INCLUSDES_DIRECTORY}")
 
 # Configure a header file to pass some of the CMake settings to the source code
 set (Bfs_ALGORITHM_SERVER_PORT \"27634\")
@@ -40,8 +40,12 @@ include_directories("${CMAKE_SOURCE_DIR}")
 
 # puts all .cpp files inside src to the SOURCES variable
 # TODO: replace this with a script for collecting cpp files 
-file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/*.cpp")
-message("Source files: ${SOURCES}")
+file(GLOB_RECURSE ALGOS CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/algos/*.cpp")
+file(GLOB_RECURSE COMMS CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/comms/*.cpp")
+file(GLOB_RECURSE CONFIG CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/config/*.cpp")
+file(GLOB_RECURSE LOG CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/logging/*.cpp")
+message("Source files: ${ALGOS}")
 
 # Adding executables
-add_executable(Breadcrumbs ${SOURCES})
+add_executable(Breadcrumbs "${CMAKE_SOURCE_DIR}/main/Breadcrumbs.cpp" ${ALGOS} ${COMMS} ${CONFIG} ${LOG})
+add_executable(VirtualOutputProcessor "${CMAKE_SOURCE_DIR}/main/VirtualOutputProcessor.cpp" ${ALGOS} ${COMMS} ${CONFIG} ${LOG})
diff --git a/breadcrumbs/scripts/startbfs.py b/breadcrumbs/scripts/startbfs.py
index 618e877..e9eab98 100644
--- a/breadcrumbs/scripts/startbfs.py
+++ b/breadcrumbs/scripts/startbfs.py
@@ -17,7 +17,8 @@ def start_program_no_hang(command):
 
 
 def main():
-    start_program_no_hang("start cmd.exe /k \"..\\bin\\Breadcrumbs.exe\"")
+    os.system("cmd /c ..\\bin\\Breadcrumbs.exe")
+    print("DONE")
 
 
 if __name__ == "__main__":
diff --git a/breadcrumbs/src/io/IOProcessor.cpp b/breadcrumbs/src/io/IOProcessor.cpp
deleted file mode 100644
index 437de23..0000000
--- a/breadcrumbs/src/io/IOProcessor.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "IOProcessor.hpp"
-
-
diff --git a/breadcrumbs/src/io/in_procs/.blank b/breadcrumbs/src/io/in_procs/.blank
deleted file mode 100644
index e69de29..0000000
diff --git a/breadcrumbs/src/io/out_procs/.blank b/breadcrumbs/src/io/out_procs/.blank
deleted file mode 100644
index e69de29..0000000
diff --git a/breadcrumbs/src/io/out_procs/VirtualOutputProcessor.cpp b/breadcrumbs/src/io/out_procs/VirtualOutputProcessor.cpp
deleted file mode 100644
index 01bf3cc..0000000
--- a/breadcrumbs/src/io/out_procs/VirtualOutputProcessor.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-
-#include "VirtualOutputProcessor.hpp"
-
-
-void VirtualOutputProcessor::threadRuntime(IOProcessor* ioProc)
-{
-	printf("VirtualOutputProcessor started.\n");
-}
diff --git a/breadcrumbs/src/Breadcrumbs.cpp b/breadcrumbs/src/main/Breadcrumbs.cpp
similarity index 100%
rename from breadcrumbs/src/Breadcrumbs.cpp
rename to breadcrumbs/src/main/Breadcrumbs.cpp
diff --git a/breadcrumbs/src/main/VirtualOutputProcessor.cpp b/breadcrumbs/src/main/VirtualOutputProcessor.cpp
new file mode 100644
index 0000000..e5da27c
--- /dev/null
+++ b/breadcrumbs/src/main/VirtualOutputProcessor.cpp
@@ -0,0 +1,5 @@
+
+int main()
+{
+	return 0;
+}