Merge pull request #4 from CTZS/opensource_cleanup_1

README.md updated

README.md

@@ -34,19 +34,21 @@ Update gcc to 5.3.x or newer and install cmake.
 
 Install the following third party dependencies:
 
-  • ASIO
+  • asio (https://think-async.com/Asio/)
 
-  • TCLAP
+  • tclap (http://tclap.sourceforge.net/)
 
-  • Tinyxml2
+  • simpleini (https://github.com/brofield/simpleini)
 
-  • Protobuf
+  • protobuf (https://developers.google.com/protocol-buffers/)
+
+If you want to use the fastrtps transport layer:
 
-  • FastCDR (if you need fastRTPS layer support)
+  • FastCDR (https://github.com/eProsima/Fast-CDR)
 
-  • FastRTPS (if you need fastRTPS layer support)
+  • FastRTPS (https://github.com/eProsima/Fast-RTPS)
 
-#### Install eCAL
+#### Install eCAL communication core
 
 Build eCAL, let CMake create a debian package and install that one
 
@@ -59,11 +61,11 @@ cpack -G DEB
 sudo dpkg -i eCAL*
 ```
 
-### Installation eCAL Full
+### Installation eCAL full
 
 #### Install dependencies
 
-Install the following third party dependencies:
+Install the following additional third party dependencies:
 
   • Gtk2
 
@@ -73,7 +75,7 @@ Install the following third party dependencies:
 
 #### Install eCAL
 
-Checkout http://github.com/Continental/ecal.git, navigate to the folder and build and install eCAL with the following commands:
+Checkout http://github.com/continental/ecal.git, navigate to the folder and build and install eCAL with the following commands:
 
 ```bash
 mkdir _build
@@ -84,7 +86,7 @@ cpack -G DEB
 sudo dpkg -i eCAL*
 ```
 
-If you need the eCAL builtin fastRTPS layer support please add the 
+If you need the eCAL builtin fastRTPS transport layer support please add the 
 
 ```bash
   -DECAL_LAYER_FASTRTPS=ON
@@ -100,13 +102,6 @@ If you want to generate the doxygen based documentation please install doxygen a
 
 cmake option.
 
-In order to run the MachineMonitoringAgent (mma) addon the following packages need to be installed:
-
-```bash
-sudo apt-get install sysstat
-sudo apt-get install ifstat
-```
-
 ### UDP network configuration
 
 setup the correct ip address - here for adapter eth0, ip address 192.168.0.1
@@ -148,7 +143,7 @@ to create the Visual Studio eCAL solution, to build it and to create a windows s
 
 #### Install dependencies
 
-Checkout ??? and follow the install instructions for windows.
+Checkout and build all needed dependencies (siehe linux build instructions).
 
 #### Qt 5
 
@@ -208,8 +203,7 @@ In the network.ini file configure the udp ttl (time to live) parameter according
 communicate in a network set a value greater then 1 (depends how many network devices should be passed).
 For local communication use 0 for ttl. 
 
-You can find the network.ini configuration file under %APPDATA%\eCAL or by simply using the windows start menu entry
-"eCAL/Configuration/Edit Network".
+You can find the network.ini configuration file under %APPDATA%\eCAL.
 
 Don't forget to disable any windows firewall.
 

cmake/eCALConfig.cmake.in

@@ -20,7 +20,6 @@
 
 # Set some build relevant variables to build samples appropriately
 set(ECAL_LAYER_FASTRTPS      "@ECAL_LAYER_FASTRTPS@")
-set(HAS_HDF5                 "@HAS_HDF5@")
 set(eCAL_install_samples_dir "@eCAL_install_samples_dir@")
 
 set(eCAL_VERSION_MAYOR  @eCAL_VERSION_MAYOR@)
@@ -36,7 +35,6 @@ include("@PACKAGE_eCAL_install_cmake_dir@/helper_functions/ecal_add_functions.cm
 include("@PACKAGE_eCAL_install_cmake_dir@/helper_functions/ecal_helper_functions.cmake")
 include("@PACKAGE_eCAL_install_cmake_dir@/helper_functions/ecal_install_functions.cmake")
 include("@PACKAGE_eCAL_install_cmake_dir@/eCALTargets.cmake")
-include("@PACKAGE_eCAL_install_cmake_dir@/eCALMetalTargets.cmake")
 
 # careful, this is a Windows hack to find protobuf etc. with the eCAL installation
 # To be removed if there is a better solution like Conan e.g.
@@ -47,11 +45,6 @@ endif()
 
 find_package(CMakeFunctions REQUIRED)
 
-if(HAS_HDF5 AND WIN32)
-  find_package(HDF5 REQUIRED)
-  create_targets_hdf5()
-endif()
-
 find_package(Protobuf REQUIRED)
 create_targets_protobuf()
 find_package(Threads REQUIRED)

ecal/core/cfg/network.ini

@@ -19,9 +19,6 @@
 ;  
 ; multicast_rcvbuf    = 1024 * x              UDP receive buffer in bytes
 ;  
-; multicast_group_mtl = 239.0.0.1             UDP multicast group base for eCAL metal
-; multicast_port_mtl  = 14100                 UDP multicast port number for eCAL metal
-; 
 ; unicast_ipaddr      = 127.0.0.1             UDP unicast group for eCAL unicast
 ; unicast_port        = 15000                 UDP unicast port number for eCAL unicast
 ;