Commit bbaab00f authored by Ivan Tyagov's avatar Ivan Tyagov

Remove amalgamation

See merge request !14
parents 873dcbce 39144fab
...@@ -5,7 +5,7 @@ EXTRA_FLAGS=$(C_COMPILER_EXTRA_FLAGS) ...@@ -5,7 +5,7 @@ EXTRA_FLAGS=$(C_COMPILER_EXTRA_FLAGS)
OUT_DIR= $(BINARY_OUT_DIR) OUT_DIR= $(BINARY_OUT_DIR)
server: server.c server: server.c
$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) -std=c99 $(OPEN62541_SOURCE_HOME)/open62541.c $(EXTRA_FLAGS) $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) -std=c99 $(EXTRA_FLAGS)
install: install:
@cp server $(OUT_DIR) @cp server $(OUT_DIR)
......
/* This work is licensed under a Creative Commons CCZero 1.0 Universal License. /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
* See http://creativecommons.org/publicdomain/zero/1.0/for more information. */ * See http://creativecommons.org/publicdomain/zero/1.0/for more information. */
#include "open62541.h" #include <open62541/server.h>
/* loadFile parses the certificate file. /* loadFile parses the certificate file.
* *
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
* OPC-UA code representation of MOD-IOs connected to a Lime2 * OPC-UA code representation of MOD-IOs connected to a Lime2
*/ */
#include <open62541/server.h>
void addIntegerVariableNode(UA_Server *server, char *node_id, char *node_description) void addIntegerVariableNode(UA_Server *server, char *node_id, char *node_description)
{ {
UA_Int32 myInteger = 0; UA_Int32 myInteger = 0;
......
...@@ -20,14 +20,18 @@ ...@@ -20,14 +20,18 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <unistd.h> #include <unistd.h>
#include <signal.h> #include <signal.h>
#include "open62541.h"
#include <argp.h> #include <argp.h>
#include <string.h> #include <string.h>
#include "common.h" #include "common.h"
#include "mod_io_i2c.h" #include "mod_io_i2c.h"
#include "mod_io_opc_ua.h" #include "mod_io_opc_ua.h"
#include <time.h> #include <time.h>
#include <open62541/plugin/log_stdout.h>
#include <open62541/server.h>
#include <open62541/server_config_default.h>
#include <open62541/plugin/accesscontrol_default.h>
#include <open62541/plugin/pubsub_ethernet.h>
#include <open62541/plugin/pubsub_udp.h>
// The default port of OPC-UA server // The default port of OPC-UA server
const int DEFAULT_OPC_UA_PORT = 4840; const int DEFAULT_OPC_UA_PORT = 4840;
......
...@@ -12,12 +12,11 @@ environment = ...@@ -12,12 +12,11 @@ environment =
OPEN62541_HOME = ${open62541:location} OPEN62541_HOME = ${open62541:location}
OPEN62541_SOURCE_HOME = ${open62541-source:location} OPEN62541_SOURCE_HOME = ${open62541-source:location}
BINARY_OUT_DIR = ${buildout:directory}/bin BINARY_OUT_DIR = ${buildout:directory}/bin
C_COMPILER_EXTRA_FLAGS = -L ${mbedtls:location}/lib -lmbedtls -lmbedx509 -lmbedcrypto C_COMPILER_EXTRA_FLAGS = -L ${mbedtls:location}/lib -lmbedtls -lmbedx509 -lmbedcrypto -l:libopen62541.so -L${open62541:location}/lib
# actually configure-command is useless here but needed by convention # actually configure-command is useless here but needed by convention
configure-command = configure-command =
${cmake:location}/bin/cmake ${cmake:location}/bin/cmake
# XXX: add own instance which is able to expose an environmental variable (I2C_VIRTUAL_MODE=1)
[instance-profile] [instance-profile]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance-opc-ua-virtual.cfg.in template = ${:_profile_base_location_}/instance-opc-ua-virtual.cfg.in
......
...@@ -33,13 +33,12 @@ configure-command = ...@@ -33,13 +33,12 @@ configure-command =
${git:location}/bin/git submodule update --init --recursive ${git:location}/bin/git submodule update --init --recursive
${cmake:location}/bin/cmake ${cmake:location}/bin/cmake
configure-options = configure-options =
-DBUILD_SHARED_LIBS=OFF -DBUILD_SHARED_LIBS=ON
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_BUILD_TYPE=RelWithDebInfo
-DCMAKE_INSTALL_PREFIX=@@LOCATION@@ -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
-DUA_ENABLE_PUBSUB=ON -DUA_ENABLE_PUBSUB=ON
-DUA_ENABLE_PUBSUB_MONITORING=ON -DUA_ENABLE_PUBSUB_MONITORING=ON
-DUA_NAMESPACE_ZERO=REDUCED -DUA_NAMESPACE_ZERO=REDUCED
-DUA_ENABLE_AMALGAMATION=ON
-DUA_ENABLE_ENCRYPTION=MBEDTLS -DUA_ENABLE_ENCRYPTION=MBEDTLS
-DUA_ENABLE_ENCRYPTION_MBEDTLS=ON -DUA_ENABLE_ENCRYPTION_MBEDTLS=ON
...@@ -58,7 +57,7 @@ environment = ...@@ -58,7 +57,7 @@ environment =
OPEN62541_HOME = ${open62541:location} OPEN62541_HOME = ${open62541:location}
OPEN62541_SOURCE_HOME = ${open62541-source:location} OPEN62541_SOURCE_HOME = ${open62541-source:location}
BINARY_OUT_DIR = ${buildout:directory}/bin BINARY_OUT_DIR = ${buildout:directory}/bin
C_COMPILER_EXTRA_FLAGS = -L ${mbedtls:location}/lib -lmbedtls -lmbedx509 -lmbedcrypto C_COMPILER_EXTRA_FLAGS = -L ${mbedtls:location}/lib -lmbedtls -lmbedx509 -lmbedcrypto -l:libopen62541.so -L${open62541:location}/lib
# actually configure-command is useless here but needed by convention # actually configure-command is useless here but needed by convention
configure-command = configure-command =
${cmake:location}/bin/cmake ${cmake:location}/bin/cmake
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment