clean up binding generation

bindings/CMakeLists.txt

@@ -8,8 +8,8 @@ if(ENABLE_BINDING_LUA)
                         COMMAND ${SWIG_EXECUTABLE} -lua
                         -I${PROJECT_SOURCE_DIR}/include
                         -o ${PROJECT_BINARY_DIR}/lua/lua_wrap.c
-                        ${CMAKE_CURRENT_SOURCE_DIR}/open62541.i
-                        DEPENDS open62541)
+                        ${PROJECT_SOURCE_DIR}/bindings/open62541.i
+                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/open62541.i)
     add_library(open62541-lua SHARED ${PROJECT_BINARY_DIR}/lua/lua_wrap.c)
     set_target_properties(open62541-lua PROPERTIES COMPILE_FLAGS "-Wno-error")
     target_include_directories(open62541-lua PUBLIC ${LUA_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include
@@ -26,8 +26,8 @@ if(ENABLE_BINDING_PYTHON)
                         COMMAND ${SWIG_EXECUTABLE} -python
                         -I${PROJECT_SOURCE_DIR}/include
                         -o ${PROJECT_BINARY_DIR}/python/python_wrap.c
-                        ${CMAKE_CURRENT_SOURCE_DIR}/open62541.i
-                        DEPENDS open62541)
+                        ${PROJECT_SOURCE_DIR}/bindings/open62541.i
+                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/open62541.i)
     add_library(open62541-python SHARED ${PROJECT_BINARY_DIR}/python/python_wrap.c)
     set_target_properties(open62541-python PROPERTIES COMPILE_FLAGS "-Wno-error")
     target_include_directories(open62541-python PUBLIC ${PYTHON_INCLUDE_DIR} ${PROJECT_SOURCE_DIR}/include

bindings/open62541.i

@@ -1,9 +1,3 @@
-/** building for lua
- swig -lua -I../include open62541.i
- gcc -fpic -c open62541_wrap.c -I/usr/include/lua5.2 -I../include -I../build/src_generated
- gcc -shared open62541_wrap.o ../build/libopen62541.a -llua5.2 -o open62541.so
-*/
-
 %module open62541
 %{
 #include "ua_types.h"
@@ -18,14 +12,6 @@
     UA_StatusCode TYPE##_copy(const TYPE *src, TYPE *dst);
 %enddef
 
-%define UA_TYPE_HANDLING_FUNCTIONS_AS_SWIG(TYPE)
-    TYPE * TYPE##_new(void);
-    void TYPE##_init(TYPE * p);
-    void TYPE##_delete(TYPE * p);
-    void TYPE##_deleteMembers(TYPE * p);
-    UA_StatusCode TYPE##_copy(const TYPE *src, TYPE *dst);
-%enddef
-
 %define UA_EXPORT
 %enddef
 
@@ -43,11 +29,11 @@ UA_TYPE_HANDLING_FUNCTIONS_SWIG(UA_Double)
 UA_TYPE_HANDLING_FUNCTIONS_SWIG(UA_String)
 UA_TYPE_HANDLING_FUNCTIONS_SWIG(UA_DateTime)
 UA_TYPE_HANDLING_FUNCTIONS_SWIG(UA_Guid)
-UA_TYPE_HANDLING_FUNCTIONS_AS_SWIG(UA_ByteString)
-UA_TYPE_HANDLING_FUNCTIONS_AS_SWIG(UA_XmlElement)
+UA_TYPE_HANDLING_FUNCTIONS_SWIG(UA_ByteString)
+UA_TYPE_HANDLING_FUNCTIONS_SWIG(UA_XmlElement)
 UA_TYPE_HANDLING_FUNCTIONS_SWIG(UA_NodeId)
 UA_TYPE_HANDLING_FUNCTIONS_SWIG(UA_ExpandedNodeId)
-UA_TYPE_HANDLING_FUNCTIONS_AS_SWIG(UA_StatusCode)
+UA_TYPE_HANDLING_FUNCTIONS_SWIG(UA_StatusCode)
 UA_TYPE_HANDLING_FUNCTIONS_SWIG(UA_QualifiedName)
 UA_TYPE_HANDLING_FUNCTIONS_SWIG(UA_LocalizedText)
 UA_TYPE_HANDLING_FUNCTIONS_SWIG(UA_ExtensionObject)