Change root directory of source files

CMakeLists.txt

@@ -22,11 +22,11 @@ SET(PARADEVS_NAME_COMPLETE "${PARADEVS_NAME}-${PARADEVS_COMPLETE}")
  # Installation variables
 #
 
-SET(PARADEVS_LIBRARY_DIRS "lib/vle-${PARADEVS_VERSION_SHORT}")
-SET(PARADEVS_INCLUDE_DIRS "include/vle-${PARADEVS_VERSION_SHORT}/vle")
-SET(PARADEVS_INCLUDE_DIR "include/vle-${PARADEVS_VERSION_SHORT}")
+SET(PARADEVS_LIBRARY_DIRS "lib/paradevs-${PARADEVS_VERSION_SHORT}")
+SET(PARADEVS_INCLUDE_DIRS "include/paradevs-${PARADEVS_VERSION_SHORT}/paradevs")
+SET(PARADEVS_INCLUDE_DIR "include/paradevs-${PARADEVS_VERSION_SHORT}")
 SET(PARADEVS_MANPAGE_PATH "share/man/man1")
-SET(PARADEVS_SHARE_DIRS "share/vle-${PARADEVS_VERSION_SHORT}")
+SET(PARADEVS_SHARE_DIRS "share/paradevs-${PARADEVS_VERSION_SHORT}")
 
 #
  # Append the library version information to the library target
@@ -161,7 +161,6 @@ MESSAGE(STATUS "- - - -")
 MESSAGE(STATUS "${PARADEVS_NAME_COMPLETE} configured successfully")
 MESSAGE(STATUS "Using ${CMAKE_INSTALL_PREFIX} for installation")
 MESSAGE(STATUS "Build type ${CMAKE_BUILD_TYPE}")
-MESSAGE(STATUS "Boost timer = ${Boost_TIMER_LIBRARY}")
 IF (PARADEVS_HAVE_GCC_ABI_DEMANGLE)
   MESSAGE(STATUS "Build with GCC ABI Demangle...: yes")
 ENDIF (PARADEVS_HAVE_GCC_ABI_DEMANGLE)

src/CMakeLists.txt

@@ -5,7 +5,6 @@ ELSE ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
   message("TRACE off")
 ENDIF ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
 
-ADD_SUBDIRECTORY(apps)
-ADD_SUBDIRECTORY(common)
-ADD_SUBDIRECTORY(kernel)
-ADD_SUBDIRECTORY(tests)
+#ADD_SUBDIRECTORY(apps)
+ADD_SUBDIRECTORY(paradevs)
+#ADD_SUBDIRECTORY(tests)

src/paradevs.pc.in

@@ -9,4 +9,4 @@ Requires: libxml-2.0 glibmm-2.4
 Version: @PARADEVS_VERSION@
 Libs:	-L${libdir} \
     -lpdevs-@PARADEVS_VERSION_SHORT@
-Cflags: -I${includedir}/vle-@PARADEVS_VERSION_SHORT@ -I@PARADEVS_PKGCONFIG_BOOSTINCLUDE_DIRS@
+Cflags: -I${includedir}/paradevs-@PARADEVS_VERSION_SHORT@ -I@PARADEVS_PKGCONFIG_BOOSTINCLUDE_DIRS@

src/paradevs/CMakeLists.txt

@@ -0,0 +1,2 @@
+ADD_SUBDIRECTORY(common)
+ADD_SUBDIRECTORY(kernel)

src/common/Bag.hpp

@@ -27,7 +27,7 @@
 #ifndef COMMON_BAG
 #define COMMON_BAG 1
 
-#include <common/ExternalEvent.hpp>
+#include <paradevs/common/ExternalEvent.hpp>
 
 #include <sstream>
 #include <string>

src/common/CMakeLists.txt

@@ -10,8 +10,8 @@ LINK_DIRECTORIES(
   ${LIBXML_LIBRARY_DIR}
   ${Boost_LIBRARY_DIRS})
 
-SET(COMMON_HPP Bag.hpp ExternalEvent.hpp InternalEvent.hpp Links.hpp Node.hpp
-  Parameters.hpp RootCoordinator.hpp)
+SET(COMMON_HPP Bag.hpp Coordinator.hpp ExternalEvent.hpp InternalEvent.hpp
+  Links.hpp Model.hpp Node.hpp Parameters.hpp RootCoordinator.hpp Simulator.hpp)
 
 INSTALL(FILES ${COMMON_HPP} DESTINATION ${PARADEVS_INCLUDE_DIRS}/common)
 

src/common/Coordinator.hpp

@@ -27,11 +27,11 @@
 #ifndef COMMON_COORDINATOR
 #define COMMON_COORDINATOR 1
 
-#include <common/Bag.hpp>
-#include <common/ExternalEvent.hpp>
-#include <common/Links.hpp>
-#include <common/Model.hpp>
-#include <common/Node.hpp>
+#include <paradevs/common/Bag.hpp>
+#include <paradevs/common/ExternalEvent.hpp>
+#include <paradevs/common/Links.hpp>
+#include <paradevs/common/Model.hpp>
+#include <paradevs/common/Node.hpp>
 
 #include <sstream>
 

src/common/ExternalEvent.hpp

@@ -27,8 +27,8 @@
 #ifndef COMMON_EXTERNAL_EVENT
 #define COMMON_EXTERNAL_EVENT 1
 
-#include <common/Model.hpp>
-#include <common/Node.hpp>
+#include <paradevs/common/Model.hpp>
+#include <paradevs/common/Node.hpp>
 
 #include <sstream>
 #include <string>

src/common/InternalEvent.hpp

@@ -27,7 +27,7 @@
 #ifndef COMMON_INTERNAL_EVENT
 #define COMMON_INTERNAL_EVENT 1
 
-#include <common/Model.hpp>
+#include <paradevs/common/Model.hpp>
 
 #include <functional>
 

src/common/Links.hpp

@@ -27,8 +27,8 @@
 #ifndef COMMON_LINKS
 #define COMMON_LINKS 1
 
-#include <common/Node.hpp>
-#include <common/utils/String.hpp>
+#include <paradevs/common/Node.hpp>
+#include <paradevs/common/utils/String.hpp>
 
 #include <map>
 #include <sstream>

src/common/Model.hpp

@@ -27,9 +27,9 @@
 #ifndef COMMON_MODEL
 #define COMMON_MODEL 1
 
-#include <common/Bag.hpp>
-#include <common/ExternalEvent.hpp>
-#include <common/InternalEvent.hpp>
+#include <paradevs/common/Bag.hpp>
+#include <paradevs/common/ExternalEvent.hpp>
+#include <paradevs/common/InternalEvent.hpp>
 
 #include <algorithm>
 #include <cassert>

src/common/Node.hpp

@@ -27,7 +27,7 @@
 #ifndef COMMON_NODE
 #define COMMON_NODE 1
 
-#include <common/Model.hpp>
+#include <paradevs/common/Model.hpp>
 
 #include <string>
 

src/common/RootCoordinator.hpp

@@ -27,7 +27,7 @@
 #ifndef COMMON_ROOT_COORDINATOR
 #define COMMON_ROOT_COORDINATOR 1
 
-#include <common/Parameters.hpp>
+#include <paradevs/common/Parameters.hpp>
 
 #include <sstream>
 #include <string>

src/common/Simulator.hpp

@@ -27,7 +27,7 @@
 #ifndef COMMON_SIMULATOR
 #define COMMON_SIMULATOR 1
 
-#include <common/Model.hpp>
+#include <paradevs/common/Model.hpp>
 
 #include <sstream>
 

src/common/scheduler/HeapScheduler.hpp

@@ -27,7 +27,7 @@
 #ifndef COMMON_SCHEDULER_HEAP_SCHEDULER_HPP
 #define COMMON_SCHEDULER_HEAP_SCHEDULER_HPP 1
 
-#include <common/InternalEvent.hpp>
+#include <paradevs/common/InternalEvent.hpp>
 
 #include <boost/heap/fibonacci_heap.hpp>
 

src/common/scheduler/VectorScheduler.hpp

@@ -27,9 +27,8 @@
 #ifndef COMMON_SCHEDULER_VECTOR_SCHEDULER_HPP
 #define COMMON_SCHEDULER_VECTOR_SCHEDULER_HPP 1
 
-#include <common/InternalEvent.hpp>
-
-#include <common/scheduler/SchedulerHandle.hpp>
+#include <paradevs/common/InternalEvent.hpp>
+#include <paradevs/common/scheduler/SchedulerHandle.hpp>
 
 #include <algorithm>
 #include <sstream>

src/common/time/CMakeLists.txt

@@ -10,7 +10,7 @@ LINK_DIRECTORIES(
   ${LIBXML_LIBRARY_DIR}
   ${Boost_LIBRARY_DIRS})
 
-SET(COMMON_TIME_HPP Time.hpp)
+SET(COMMON_TIME_HPP DoubleTime.hpp Time.hpp)
 
 INSTALL(FILES ${COMMON_TIME_HPP} DESTINATION
   ${PARADEVS_INCLUDE_DIRS}/common/time)

src/common/time/DoubleTime.hpp

@@ -27,7 +27,7 @@
 #ifndef COMMON_TIME_DOUBLE_TIME
 #define COMMON_TIME_DOUBLE_TIME 1
 
-#include <common/time/Time.hpp>
+#include <paradevs/common/time/Time.hpp>
 
 #include <limits>
 

src/kernel/dtss/CMakeLists.txt

@@ -11,4 +11,4 @@ LINK_DIRECTORIES(
 
 SET(DTSS_HPP Coordinator.hpp Dynamics.hpp GraphManager.hpp Simulator.hpp)
 
-INSTALL(FILES ${DTSS_HPP} DESTINATION ${PARADEVS_INCLUDE_DIRS}/dtss)
+INSTALL(FILES ${DTSS_HPP} DESTINATION ${PARADEVS_INCLUDE_DIRS}/kernel/dtss)

src/kernel/dtss/Coordinator.hpp

@@ -27,9 +27,9 @@
 #ifndef DTSS_COORDINATOR
 #define DTSS_COORDINATOR 1
 
-#include <common/Coordinator.hpp>
-#include <common/Parameters.hpp>
-#include <common/utils/Trace.hpp>
+#include <paradevs/common/Coordinator.hpp>
+#include <paradevs/common/Parameters.hpp>
+#include <paradevs/common/utils/Trace.hpp>
 
 #include <cassert>
 #include <iostream>

src/kernel/dtss/Dynamics.hpp

@@ -27,9 +27,9 @@
 #ifndef DTSS_DYNAMICS
 #define DTSS_DYNAMICS 1
 
-#include <common/Bag.hpp>
-#include <common/ExternalEvent.hpp>
-#include <common/Parameters.hpp>
+#include <paradevs/common/Bag.hpp>
+#include <paradevs/common/ExternalEvent.hpp>
+#include <paradevs/common/Parameters.hpp>
 
 namespace paradevs { namespace dtss {
 

src/kernel/dtss/GraphManager.hpp

@@ -27,10 +27,10 @@
 #ifndef DTSS_GRAPH_MANANGER
 #define DTSS_GRAPH_MANANGER 1
 
-#include <common/Coordinator.hpp>
-#include <common/Links.hpp>
-#include <common/Model.hpp>
-#include <common/Parameters.hpp>
+#include <paradevs/common/Coordinator.hpp>
+#include <paradevs/common/Links.hpp>
+#include <paradevs/common/Model.hpp>
+#include <paradevs/common/Parameters.hpp>
 
 namespace paradevs { namespace dtss {
 

src/kernel/dtss/Simulator.hpp

@@ -27,10 +27,10 @@
 #ifndef DTSS_SIMULATOR
 #define DTSS_SIMULATOR 1
 
-#include <common/Coordinator.hpp>
-#include <common/Parameters.hpp>
-#include <common/Simulator.hpp>
-#include <common/utils/Trace.hpp>
+#include <paradevs/common/Coordinator.hpp>
+#include <paradevs/common/Parameters.hpp>
+#include <paradevs/common/Simulator.hpp>
+#include <paradevs/common/utils/Trace.hpp>
 
 #include <cassert>
 

src/kernel/pdevs/CMakeLists.txt

@@ -11,6 +11,6 @@ LINK_DIRECTORIES(
 
 SET(PDEVS_HPP Coordinator.hpp Dynamics.hpp GraphManager.hpp Simulator.hpp)
 
-INSTALL(FILES ${PDEVS_HPP} DESTINATION ${PARADEVS_INCLUDE_DIRS}/pdevs)
+INSTALL(FILES ${PDEVS_HPP} DESTINATION ${PARADEVS_INCLUDE_DIRS}/kernel/pdevs)
 
 ADD_SUBDIRECTORY(multithreading)

src/kernel/pdevs/Coordinator.hpp

@@ -27,10 +27,10 @@
 #ifndef PDEVS_COORDINATOR
 #define PDEVS_COORDINATOR 1
 
-#include <common/Coordinator.hpp>
-#include <common/Parameters.hpp>
-#include <common/utils/String.hpp>
-#include <common/utils/Trace.hpp>
+#include <paradevs/common/Coordinator.hpp>
+#include <paradevs/common/Parameters.hpp>
+#include <paradevs/common/utils/String.hpp>
+#include <paradevs/common/utils/Trace.hpp>
 
 #include <cassert>
 #include <iostream>

src/kernel/pdevs/Dynamics.hpp

@@ -27,9 +27,9 @@
 #ifndef PDEVS_DYNAMICS
 #define PDEVS_DYNAMICS 1
 
-#include <common/Bag.hpp>
-#include <common/ExternalEvent.hpp>
-#include <common/Parameters.hpp>
+#include <paradevs/common/Bag.hpp>
+#include <paradevs/common/ExternalEvent.hpp>
+#include <paradevs/common/Parameters.hpp>
 
 #include <string>
 #include <vector>

src/kernel/pdevs/GraphManager.hpp

@@ -27,11 +27,11 @@
 #ifndef PDEVS_GRAPH_MANANGER
 #define PDEVS_GRAPH_MANANGER 1
 
-#include <common/Coordinator.hpp>
-#include <common/Links.hpp>
-#include <common/Model.hpp>
-#include <common/Parameters.hpp>
-#include <common/utils/String.hpp>
+#include <paradevs/common/Coordinator.hpp>
+#include <paradevs/common/Links.hpp>
+#include <paradevs/common/Model.hpp>
+#include <paradevs/common/Parameters.hpp>
+#include <paradevs/common/utils/String.hpp>
 
 #include <sstream>
 

src/kernel/pdevs/Simulator.hpp

@@ -27,11 +27,11 @@
 #ifndef PDEVS_SIMULATOR
 #define PDEVS_SIMULATOR 1
 
-#include <common/Coordinator.hpp>
-#include <common/Parameters.hpp>
-#include <common/Simulator.hpp>
-#include <common/utils/String.hpp>
-#include <common/utils/Trace.hpp>
+#include <paradevs/common/Coordinator.hpp>
+#include <paradevs/common/Parameters.hpp>
+#include <paradevs/common/Simulator.hpp>
+#include <paradevs/common/utils/String.hpp>
+#include <paradevs/common/utils/Trace.hpp>
 
 #include <cassert>
 

src/kernel/pdevs/multithreading/CMakeLists.txt

@@ -12,4 +12,4 @@ LINK_DIRECTORIES(
 SET(PDEVS_MULTITHREADING_HPP Coordinator.hpp)
 
 INSTALL(FILES ${PDEVS_MULTITHREADING_HPP} DESTINATION
-  ${PARADEVS_INCLUDE_DIRS}/pdevs/multithreading)
+  ${PARADEVS_INCLUDE_DIRS}/kernel/pdevs/multithreading)

src/kernel/pdevs/multithreading/Coordinator.hpp

@@ -27,8 +27,8 @@
 #ifndef PDEVS_MULTITHREADING_COORDINATOR
 #define PDEVS_MULTITHREADING_COORDINATOR 1
 
-#include <common/utils/Multithreading.hpp>
-#include <kernel/pdevs/Coordinator.hpp>
+#include <paradevs/common/utils/Multithreading.hpp>
+#include <paradevs/kernel/pdevs/Coordinator.hpp>
 
 #include <thread>