Browse Source

rename src_extra folder to plugins

Julius Pfrommer 9 years ago
parent
commit
4e529ea850

+ 5 - 5
CMakeLists.txt

@@ -172,8 +172,8 @@ set(exported_headers ${PROJECT_BINARY_DIR}/src_generated/ua_config.h
                      ${PROJECT_SOURCE_DIR}/include/ua_server_external_ns.h
                      ${PROJECT_SOURCE_DIR}/include/ua_client.h
                      ${PROJECT_SOURCE_DIR}/include/ua_client_highlevel.h
-                     ${PROJECT_SOURCE_DIR}/src_extra/networklayer_tcp.h
-                     ${PROJECT_SOURCE_DIR}/src_extra/logger_stdout.h)
+                     ${PROJECT_SOURCE_DIR}/plugins/networklayer_tcp.h
+                     ${PROJECT_SOURCE_DIR}/plugins/logger_stdout.h)
 set(internal_headers ${PROJECT_SOURCE_DIR}/deps/queue.h
                      ${PROJECT_SOURCE_DIR}/deps/pcg_basic.h
                      ${PROJECT_SOURCE_DIR}/deps/libc_time.h
@@ -212,8 +212,8 @@ set(lib_sources ${PROJECT_SOURCE_DIR}/src/ua_types.c
                 ${PROJECT_SOURCE_DIR}/src/server/ua_services_view.c
                 ${PROJECT_SOURCE_DIR}/src/client/ua_client.c
                 ${PROJECT_SOURCE_DIR}/src/client/ua_client_highlevel.c
-                ${PROJECT_SOURCE_DIR}/src_extra/networklayer_tcp.c
-                ${PROJECT_SOURCE_DIR}/src_extra/logger_stdout.c
+                ${PROJECT_SOURCE_DIR}/plugins/networklayer_tcp.c
+                ${PROJECT_SOURCE_DIR}/plugins/logger_stdout.c
                 ${PROJECT_SOURCE_DIR}/deps/libc_time.c
                 ${PROJECT_SOURCE_DIR}/deps/pcg_basic.c)
                 ##TODO: make client stuff optional
@@ -355,7 +355,7 @@ else()
     add_library(open62541-object OBJECT ${lib_sources} ${internal_headers} ${exported_headers})
     include_directories(${PROJECT_SOURCE_DIR}/include)
     include_directories(${PROJECT_SOURCE_DIR}/src)
-    include_directories(${PROJECT_SOURCE_DIR}/src_extra)
+    include_directories(${PROJECT_SOURCE_DIR}/plugins)
     include_directories(${PROJECT_SOURCE_DIR}/deps)
 endif()
 target_compile_definitions(open62541-object PRIVATE -DUA_DYNAMIC_LINKING)

+ 1 - 1
doc/tutorial_server_firstSteps.rst

@@ -101,7 +101,7 @@ Let's build a very rudimentary server. Create a separate folder for your applica
    :> cd myApp
    :myApp> mkdir include
    :myApp> cp ../open62541/include/* ./include
-   :myApp> cp ../open62541/src_extra/*.h ./include
+   :myApp> cp ../open62541/plugins/*.h ./include
    :myApp> cp ../open62541/build/src_generated/*.h ./include
    :myApp> cp ../open62541/build/*.so .
    :myApp> tree

src_extra/logger_stdout.c → plugins/logger_stdout.c


src_extra/logger_stdout.h → plugins/logger_stdout.h


src_extra/networklayer_tcp.c → plugins/networklayer_tcp.c


src_extra/networklayer_tcp.h → plugins/networklayer_tcp.h


src_extra/networklayer_udp.c → plugins/networklayer_udp.c


src_extra/networklayer_udp.h → plugins/networklayer_udp.h


+ 1 - 1
tests/CMakeLists.txt

@@ -1,7 +1,7 @@
 include_directories(${PROJECT_SOURCE_DIR}/include)
 include_directories(${PROJECT_SOURCE_DIR}/deps)
 include_directories(${PROJECT_SOURCE_DIR}/src)
-include_directories(${PROJECT_SOURCE_DIR}/src_extra)
+include_directories(${PROJECT_SOURCE_DIR}/plugins)
 include_directories(${PROJECT_BINARY_DIR}/src_generated)
 
 find_package(Check REQUIRED)

+ 1 - 1
tools/travis_linux_script.sh

@@ -16,7 +16,7 @@ if [ $ANALYZE = "true" ]; then
             --enable=style --force --std=c++11 -j 8 \
             --suppress=incorrectStringBooleanError \
             --suppress=invalidscanf --inline-suppr \
-            -I include src src_extra 2> cppcheck.txt
+            -I include src plugins 2> cppcheck.txt
         if [ -s cppcheck.txt ]; then
         	echo "\n\n====== CPPCHECK Static Analysis Errors ======"
             cat cppcheck.txt