Parcourir la source

Update doc and remove `UA_ENABLE_GENERATE_NAMESPACE0`. Fixes #1857

Superseeded by `UA_ENABLE_FULL_NS0`
Stefan Profanter il y a 6 ans
Parent
commit
c40228e18a
3 fichiers modifiés avec 9 ajouts et 8 suppressions
  1. 9 3
      doc/building.rst
  2. 0 1
      include/ua_config.h.in
  3. 0 4
      src/server/ua_server.c

+ 9 - 3
doc/building.rst

@@ -188,6 +188,12 @@ This group contains build options related to the supported OPC UA features.
    Enable multi-threading support
    Enable multi-threading support
 **UA_ENABLE_COVERAGE**
 **UA_ENABLE_COVERAGE**
    Measure the coverage of unit tests
    Measure the coverage of unit tests
+**UA_ENABLE_DISCOVERY**
+   Enable Discovery Service (LDS)
+**UA_ENABLE_DISCOVERY_MULTICAST**
+   Enable Discovery Service with multicast support (LDS-ME)
+**UA_ENABLE_DISCOVERY_SEMAPHORE**
+   Enable Discovery Semaphore support
 
 
 Some options are marked as advanced. The advanced options need to be toggled to
 Some options are marked as advanced. The advanced options need to be toggled to
 be visible in the cmake GUIs.
 be visible in the cmake GUIs.
@@ -196,9 +202,9 @@ be visible in the cmake GUIs.
    Add the type and member names to the UA_DataType structure. Enabled by default.
    Add the type and member names to the UA_DataType structure. Enabled by default.
 **UA_ENABLE_STATUSCODE_DESCRIPTIONS**
 **UA_ENABLE_STATUSCODE_DESCRIPTIONS**
    Compile the human-readable name of the StatusCodes into the binary. Enabled by default.
    Compile the human-readable name of the StatusCodes into the binary. Enabled by default.
-**UA_ENABLE_GENERATE_NAMESPACE0**
-   Generate and load UA XML Namespace 0 definition
-   ``UA_GENERATE_NAMESPACE0_FILE`` is used to specify the file for NS0 generation from namespace0 folder. Default value is ``Opc.Ua.NodeSet2.xml``
+**UA_ENABLE_FULL_NS0**
+   Use the full NS0 instead of a minimal Namespace 0 nodeset
+   ``UA_FILE_NS0`` is used to specify the file for NS0 generation from namespace0 folder. Default value is ``Opc.Ua.NodeSet2.xml``
 **UA_ENABLE_NONSTANDARD_UDP**
 **UA_ENABLE_NONSTANDARD_UDP**
    Enable udp extension
    Enable udp extension
 
 

+ 0 - 1
include/ua_config.h.in

@@ -33,7 +33,6 @@ extern "C" {
 #cmakedefine UA_ENABLE_STATUSCODE_DESCRIPTIONS
 #cmakedefine UA_ENABLE_STATUSCODE_DESCRIPTIONS
 #cmakedefine UA_ENABLE_TYPENAMES
 #cmakedefine UA_ENABLE_TYPENAMES
 #cmakedefine UA_ENABLE_DETERMINISTIC_RNG
 #cmakedefine UA_ENABLE_DETERMINISTIC_RNG
-#cmakedefine UA_ENABLE_GENERATE_NAMESPACE0
 #cmakedefine UA_ENABLE_NONSTANDARD_UDP
 #cmakedefine UA_ENABLE_NONSTANDARD_UDP
 #cmakedefine UA_ENABLE_DISCOVERY
 #cmakedefine UA_ENABLE_DISCOVERY
 #cmakedefine UA_ENABLE_DISCOVERY_MULTICAST
 #cmakedefine UA_ENABLE_DISCOVERY_MULTICAST

+ 0 - 4
src/server/ua_server.c

@@ -18,10 +18,6 @@
 #include "ua_types.h"
 #include "ua_types.h"
 #include "ua_server_internal.h"
 #include "ua_server_internal.h"
 
 
-#ifdef UA_ENABLE_GENERATE_NAMESPACE0
-#include "ua_namespaceinit_generated.h"
-#endif
-
 /**********************/
 /**********************/
 /* Namespace Handling */
 /* Namespace Handling */
 /**********************/
 /**********************/