From 92c3d3adb822a885c4f38a822c2811ee5f7b5f98 Mon Sep 17 00:00:00 2001 From: Albert ARIBAUD Date: Fri, 26 Oct 2018 10:39:30 +0200 Subject: [PATCH 1/2] Fixed Python 3 bindings support 1. Allow specifying Python interpreter version with BUILD_PYTHON_VERSION 2. Fix Python modules install path generation (would produce spurious line feed which would cause destination directory to be /usr/lib/python*/dist-packages\n -- note the final \n! --- pyiec61850/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyiec61850/CMakeLists.txt b/pyiec61850/CMakeLists.txt index b6b2cb4a..159ef4bc 100644 --- a/pyiec61850/CMakeLists.txt +++ b/pyiec61850/CMakeLists.txt @@ -5,7 +5,7 @@ find_package(SWIG REQUIRED) include(${SWIG_USE_FILE}) -find_package(PythonInterp REQUIRED) +find_package(PythonInterp ${BUILD_PYTHON_VERSION} REQUIRED) find_package(PythonLibs ${PYTHON_VERSION_STRING} EXACT REQUIRED) include_directories(${PYTHON_INCLUDE_PATH}) @@ -34,7 +34,7 @@ swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) # Finding python modules install path execute_process( COMMAND ${PYTHON_EXECUTABLE} -c - "from distutils.sysconfig import get_python_lib; print(get_python_lib())" + "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())" OUTPUT_VARIABLE PYTHON_SITE_DIR ) From 832bb5e9f178497515b2dead9318369d22424dce Mon Sep 17 00:00:00 2001 From: Davide Andreuzza Date: Thu, 20 Dec 2018 15:28:17 +0100 Subject: [PATCH 2/2] fix bufOvfl typo in parsing OptionFields --- .../src/com/libiec61850/scl/model/OptionFields.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/model_generator/src/com/libiec61850/scl/model/OptionFields.java b/tools/model_generator/src/com/libiec61850/scl/model/OptionFields.java index 226f1188..28b3d453 100644 --- a/tools/model_generator/src/com/libiec61850/scl/model/OptionFields.java +++ b/tools/model_generator/src/com/libiec61850/scl/model/OptionFields.java @@ -94,7 +94,7 @@ public class OptionFields { if (boolVal != null) this.configRef = boolVal; - boolVal = ParserUtils.parseBooleanAttribute(optFieldsNode, "bufOvlf"); + boolVal = ParserUtils.parseBooleanAttribute(optFieldsNode, "bufOvfl"); if (boolVal != null) this.bufOvfl = boolVal; }