You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/07/14 16:47:32 UTC
[plc4x] branch develop updated (9ba4032 -> 4625982)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from 9ba4032 - Make the cmake-maven-plugin use a manually downloaded and newer version of CMake to avoid problems with the thrift build.
add 365c22b Builder PlcReadRequest
add ae932f9 Modified CMakeLists, new Class SystemConfiguration und S7ControllerType
add 9779dc0 first stand with dll and all necessary lib of boost
add 0edaaff Modify Top-Level CMakeLists
add 135e42e - Removed the maven sub-structure - Switched to CMake as central build system.feature/s7-cpp
add 87b3c06 - Added missing Apache headers
add 41a88cc - Changed the import statement to use slashes instead of backslashes
add f8cf558 - Added the building of boost back.
add 5436ac8 - Continued working on the c++ build -- Switched to Boost 3.14.0 in order to get boost 1.70.0 support
add 986f311 - Fixed some compilation issues (Some missing underscores)
add 7104446 - Added linking of ws2_32 for mingw builds - Set the BOOST_LIBRARYDIR
add 2302d55 - Tried to get CMake to find the 64 bit versions of the boost libs
add 86b812d - Cleaned up the CMakeLists.txt files
add b51002b - Added the "target_link_libraries" to the logger (No idea why it's needed)
add c840b96 - Added a missing target_link_libraries rule to the driver-base
add 71c2333 - Moved the boost location settings from the pom into the CMakeLists.txt file
add f4847a8 - Make the build work correctly on Ubuntu Linux
add 050f661 - Added some documentation for CLion usage - Streamlined the example CMakeLists.txt - Fixed some typos in the documentation of the pom.xml
add 1452678 Updated the feature branch with the latest state of develop.
add 595b3a8 Merge branch 'develop' of github.com:apache/plc4x into feature/s7-cpp
add 7d4ecf6 - Make the cmake-maven-plugin use a manually downloaded and newer version of CMake to avoid problems with the thrift build.
add 960a6a3 - Forcefully disable BOOST as having newer Boost versions (Such as: 1.70.0) available on your system would break the build
add ac02d0e - Fixed some final issues in the build ... - Moved the build of boost out of a self-activating profile (When doing a "mvn clean install" the lib/boost directory would initially exist, therefore maven would skip building it, unfortunately the clean would then delete it and the profile would not be re-enabled, causing the build to fail)
add 2b9ff5c - Moved the build of Boost into a separate module located under tools (It's no longer in plc4cpp), which is built when enabling the "with-boost" profile. - We are now packing up the libs and includes into an zip assembly which is unpacked if needed (in case of plc4cpp it is needed) - Added a check to the prerequisiteCheck.groovy to check if boost is locally available only if the "with-cpp" profile is enabled and the "with-boost" profile is NOT enabled too.
add 03f0560 Add linux Support Modify Filename helloplc4x Modify Cmake to Include libs to load DLLs
add a3bdf0d Remove Comment TODO Windows only
add 4625982 - Added a 'proxy' driver skeleton which will be using thrift for communication with a plc4x proxy server. - Fine-tuned the assembly of the thrift cpp library.
No new revisions were added by this update.
Summary of changes:
Jenkinsfile | 10 +-
plc4cpp/CMakeLists.txt | 30 +-
plc4cpp/README.md | 8 +
plc4cpp/api/CMakeLists.txt | 18 +-
plc4cpp/api/pom.xml | 144 ------
plc4cpp/api/src/assembly/cpp.xml | 47 --
.../cpp/org/apache/plc4x/cpp/PlcConnection.cpp | 82 ++++
.../main/cpp/org/apache/plc4x/cpp/PlcConnection.h | 169 +++++++
.../cpp/org/apache/plc4x/cpp/PlcDriverManager.cpp | 187 ++++++++
.../cpp/org/apache/plc4x/cpp/PlcDriverManager.h | 71 +++
.../cpp/org/apache/plc4x/cpp/api/PlcConnection.cpp | 93 +++-
.../cpp/org/apache/plc4x/cpp/api/PlcConnection.h | 228 ++++++----
.../plc4x/cpp/api/messages/PlcFieldRequest.h | 10 +-
.../plc4x/cpp/api/messages/PlcReadRequest.cpp | 6 -
.../apache/plc4x/cpp/api/messages/PlcReadRequest.h | 10 +-
.../plc4x/cpp/api/messages/PlcRequestBuilder.h | 1 -
.../apache-mynewt => drivers}/CMakeLists.txt | 8 +-
plc4cpp/drivers/proxy/CMakeLists.txt | 47 ++
.../cpp/org/apache/plc4x/cpp/proxy/ProxyDriver.cpp | 89 ++++
.../cpp/org/apache/plc4x/cpp/proxy/ProxyDriver.h} | 26 +-
.../cpp/proxy/connection/ProxyConnection.cpp} | 52 +--
.../plc4x/cpp/proxy/connection/ProxyConnection.h | 137 ++++++
.../cpp/org/apache/plc4x/cpp/proxy/dllexports.cpp} | 44 +-
.../cpp/org/apache/plc4x/cpp/proxy/dllexports.h} | 27 +-
plc4cpp/drivers/s7/CMakeLists.txt | 43 ++
.../cpp/org/apache/plc4x/cpp/s7/S7PlcDriver.cpp | 93 ++++
.../cpp/org/apache/plc4x/cpp/s7/S7PlcDriver.h} | 26 +-
.../plc4x/cpp/s7/connection/S7PlcConnection.cpp | 133 ++++++
.../plc4x/cpp/s7/connection/S7PlcConnection.h | 149 ++++++
.../cpp/org/apache/plc4x/cpp/s7/dllexports.cpp} | 44 +-
.../main/cpp/org/apache/plc4x/cpp/s7/dllexports.h} | 27 +-
plc4cpp/examples/CMakeLists.txt | 2 +-
.../hello-world-plc4x}/CMakeLists.txt | 21 +-
.../plc4x/cpp/examples/helloplc4x/helloplc4x.cpp | 122 +++++
plc4cpp/examples/pom.xml | 55 ---
plc4cpp/integrations/apache-mynewt/CMakeLists.txt | 2 +-
plc4cpp/integrations/apache-mynewt/pom.xml | 40 --
plc4cpp/integrations/edgex-foundry/CMakeLists.txt | 2 +-
plc4cpp/integrations/edgex-foundry/pom.xml | 38 --
plc4cpp/integrations/pom.xml | 40 --
plc4cpp/libs/boost/src/assembly/cpp-windows.xml | 47 --
plc4cpp/libs/pom.xml | 40 --
plc4cpp/pom.xml | 304 ++++++++++++-
plc4cpp/protocols/driver-bases/base/CMakeLists.txt | 23 +-
plc4cpp/protocols/driver-bases/base/pom.xml | 149 ------
.../driver-bases/base/src/assembly/cpp.xml | 47 --
.../cpp/base/connection/AbstractPlcConnection.cpp | 31 +-
.../cpp/base/connection/AbstractPlcConnection.h | 5 +-
.../plc4x/cpp/base/connection/BoostConnection.cpp | 504 +++++++++++++++++++++
.../plc4x/cpp/base/connection/BoostConnection.h | 120 +++++
.../plc4x/cpp/base/connection/PlcFieldHandler.h | 2 +-
.../cpp/base/messages/DefaultPlcReadRequest.cpp | 100 ++--
.../cpp/base/messages/DefaultPlcReadRequest.h | 35 +-
.../cpp/base/messages/DefaultPlcWriteRequest.cpp | 127 +++---
.../cpp/base/messages/DefaultPlcWriteRequest.h | 11 +-
.../cpp/base/messages/InternalPlcFieldRequest.h | 2 +-
.../cpp/base/messages/items/BaseDefaultFieldItem.h | 2 +-
plc4cpp/protocols/driver-bases/pom.xml | 40 --
plc4cpp/protocols/pom.xml | 40 --
.../apache/plc4x/cpp/s7/types/S7ControllerType.h | 65 +++
plc4cpp/utils/CMakeLists.txt | 2 +
plc4cpp/utils/logger/CMakeLists.txt | 15 +-
plc4cpp/utils/logger/pom.xml | 150 ------
plc4cpp/utils/logger/src/assembly/cpp.xml | 47 --
plc4cpp/utils/pom.xml | 40 --
.../systemconfig}/CMakeLists.txt | 7 +-
.../utils/systemconfig/SystemConfiguration.cpp} | 50 +-
.../cpp/utils/systemconfig/SystemConfiguration.h} | 44 +-
pom.xml | 8 +-
sandbox/code-gen/pom.xml | 5 +
sandbox/test-java-knxnetip-driver/pom.xml | 5 +
src/main/script/prerequisiteCheck.groovy | 32 +-
{plc4cpp/libs => tools}/boost/pom.xml | 70 ++-
.../cpp.xml => tools/boost/src/assembly/bundle.xml | 8 +-
tools/pom.xml | 6 +
tools/thrift/pom.xml | 7 +-
tools/thrift/src/assembly/cpp.xml | 17 +-
77 files changed, 3061 insertions(+), 1527 deletions(-)
delete mode 100644 plc4cpp/api/pom.xml
delete mode 100644 plc4cpp/api/src/assembly/cpp.xml
create mode 100644 plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcConnection.cpp
create mode 100644 plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcConnection.h
create mode 100644 plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcDriverManager.cpp
create mode 100644 plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/PlcDriverManager.h
copy plc4cpp/{integrations/apache-mynewt => drivers}/CMakeLists.txt (80%)
create mode 100644 plc4cpp/drivers/proxy/CMakeLists.txt
create mode 100644 plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/ProxyDriver.cpp
copy plc4cpp/{api/src/main/cpp/org/apache/plc4x/cpp/spi/PlcDriver.h => drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/ProxyDriver.h} (78%)
copy plc4cpp/{api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcReadRequest.h => drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/connection/ProxyConnection.cpp} (51%)
mode change 100755 => 100644
create mode 100644 plc4cpp/drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/connection/ProxyConnection.h
copy plc4cpp/{api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcMessage.h => drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/dllexports.cpp} (65%)
mode change 100755 => 100644
copy plc4cpp/{api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.cpp => drivers/proxy/src/main/cpp/org/apache/plc4x/cpp/proxy/dllexports.h} (74%)
mode change 100755 => 100644
create mode 100644 plc4cpp/drivers/s7/CMakeLists.txt
create mode 100644 plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/S7PlcDriver.cpp
copy plc4cpp/{api/src/main/cpp/org/apache/plc4x/cpp/spi/PlcDriver.h => drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/S7PlcDriver.h} (78%)
create mode 100644 plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/connection/S7PlcConnection.cpp
create mode 100644 plc4cpp/drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/connection/S7PlcConnection.h
copy plc4cpp/{api/src/main/cpp/org/apache/plc4x/cpp/api/messages/PlcMessage.h => drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/dllexports.cpp} (65%)
mode change 100755 => 100644
copy plc4cpp/{api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcNotImplementedException.cpp => drivers/s7/src/main/cpp/org/apache/plc4x/cpp/s7/dllexports.h} (74%)
mode change 100755 => 100644
copy plc4cpp/{ => examples/hello-world-plc4x}/CMakeLists.txt (64%)
create mode 100644 plc4cpp/examples/hello-world-plc4x/src/main/cpp/org/apache/plc4x/cpp/examples/helloplc4x/helloplc4x.cpp
delete mode 100644 plc4cpp/examples/pom.xml
delete mode 100644 plc4cpp/integrations/apache-mynewt/pom.xml
delete mode 100644 plc4cpp/integrations/edgex-foundry/pom.xml
delete mode 100644 plc4cpp/integrations/pom.xml
delete mode 100644 plc4cpp/libs/boost/src/assembly/cpp-windows.xml
delete mode 100644 plc4cpp/libs/pom.xml
delete mode 100644 plc4cpp/protocols/driver-bases/base/pom.xml
delete mode 100644 plc4cpp/protocols/driver-bases/base/src/assembly/cpp.xml
create mode 100644 plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/BoostConnection.cpp
create mode 100644 plc4cpp/protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/connection/BoostConnection.h
delete mode 100644 plc4cpp/protocols/driver-bases/pom.xml
delete mode 100644 plc4cpp/protocols/pom.xml
create mode 100644 plc4cpp/protocols/s7/src/main/cpp/org/apache/plc4x/cpp/s7/types/S7ControllerType.h
delete mode 100644 plc4cpp/utils/logger/pom.xml
delete mode 100644 plc4cpp/utils/logger/src/assembly/cpp.xml
delete mode 100644 plc4cpp/utils/pom.xml
copy plc4cpp/{integrations => utils/systemconfig}/CMakeLists.txt (78%)
copy plc4cpp/{api/src/main/cpp/org/apache/plc4x/cpp/api/exceptions/PlcProtocolPayloadTooBigException.h => utils/systemconfig/src/main/cpp/org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.cpp} (53%)
mode change 100755 => 100644
copy plc4cpp/{protocols/driver-bases/base/src/main/cpp/org/apache/plc4x/cpp/base/events/ConnectEvent.h => utils/systemconfig/src/main/cpp/org/apache/plc4x/cpp/utils/systemconfig/SystemConfiguration.h} (54%)
rename {plc4cpp/libs => tools}/boost/pom.xml (70%)
rename plc4cpp/libs/boost/src/assembly/cpp.xml => tools/boost/src/assembly/bundle.xml (83%)