temporarily remove output library, update for epanet 2.3.3

Author: Sam Hatchett

owa-epanet/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.8)
 
-project(owa-epanet)
+project(owa-epanet LANGUAGES C CXX)
 set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
 
 if(SKBUILD)
@@ -18,8 +18,8 @@ endif()
 find_package(SWIG REQUIRED)
 cmake_policy(SET CMP0078 NEW)
 cmake_policy(SET CMP0086 NEW)
+set(CMAKE_SWIG_FLAGS -c++)
 include(${SWIG_USE_FILE})
-set(CMAKE_SWIG_FLAGS -py3)
 
 message("PYTHONLIBS_VERSION_STRING: ${PYTHONLIBS_VERSION_STRING}")
 message("CMAKE_SWIG_FLAGS: ${CMAKE_SWIG_FLAGS}")
@@ -50,7 +50,17 @@ set_property(TARGET epanet2
     PROPERTY
         USE_TARGET_INCLUDE_DIRECTORIES TRUE
 )
+#set_property(SOURCE wrapper/output.i
+#    PROPERTY
+#        USE_TARGET_INCLUDE_DIRECTORIES TRUE
+#)
+#set_property(TARGET epanet-output
+#    PROPERTY
+#        USE_TARGET_INCLUDE_DIRECTORIES TRUE
+#)
 
+
+set_property(SOURCE wrapper/toolkit.i PROPERTY CPLUSPLUS ON)
 # Create cmake target
 swig_add_library(toolkit
     TYPE
@@ -71,14 +81,37 @@ target_link_options(toolkit
         $<$<BOOL:${APPLE}>:-undefined dynamic_lookup>
 )
 
-
-
 swig_link_libraries(toolkit
     PUBLIC
         $<$<BOOL:$<C_COMPILER_ID:MSVC>>:Python3::Module>
         epanet2
 )
 
+#swig_add_library(output
+#    TYPE
+#        MODULE
+#    LANGUAGE
+#        python
+#    SOURCES
+#        wrapper/output.i
+#)
+
+#target_include_directories(output
+#    PUBLIC
+#        ${Python3_INCLUDE_DIRS}
+#)
+
+#target_link_options(output
+#    PUBLIC
+#        $<$<BOOL:${APPLE}>:-undefined dynamic_lookup>
+#)
+
+#swig_link_libraries(output
+#    PUBLIC
+#        $<$<BOOL:$<C_COMPILER_ID:MSVC>>:Python3::Module>
+#        epanet-output
+#)
+
 set_target_properties(toolkit
     PROPERTIES
         SWIG_COMPILE_DEFINITIONS EXPORT_OUT_API
@@ -89,7 +122,20 @@ set_target_properties(toolkit
         INSTALL_RPATH_USE_LINK_PATH TRUE
 )
 
+
+#set_target_properties(output
+#    PROPERTIES
+#        MACOSX_RPATH TRUE
+#        SKIP_BUILD_RPATH FALSE
+#       BUILD_WITH_INSTALL_RPATH FALSE
+#       INSTALL_RPATH "${PACKAGE_RPATH}"
+#       INSTALL_RPATH_USE_LINK_PATH TRUE
+#
+
+
 install(TARGETS toolkit LIBRARY DESTINATION packages/epanet)
+#install(TARGETS output LIBRARY DESTINATION packages/epanet)
+
 
 add_custom_command(
     TARGET toolkit
@@ -102,3 +148,15 @@ add_custom_command(
         ${CMAKE_SOURCE_DIR}/packages/epanet
 )
 
+
+#add_custom_command(
+#    TARGET output
+#    POST_BUILD
+#    COMMAND ${CMAKE_COMMAND} -E copy
+#        "${CMAKE_CURRENT_BINARY_DIR}/output.py"
+#        $<$<BOOL:${WIN32}>:${CMAKE_CURRENT_BINARY_DIR}/_output.pyd>
+#        $<$<BOOL:${WIN32}>:${CMAKE_CURRENT_BINARY_DIR}/bin/epanet-output.dll>
+#        $<$<NOT:$<BOOL:${WIN32}>>:${CMAKE_CURRENT_BINARY_DIR}/lib/libepanet-output.*>
+#        ${CMAKE_SOURCE_DIR}/packages/epanet
+#)
+

owa-epanet/EPANET

@@ -6,7 +6,7 @@
 
 setup(
     name = "owa-epanet",
-    version = "2.2.4",
+    version = "2.3.3",
     author = "Sam Hatchett",
     author_email = "samhatchett@gmail.com",
     description = "a thin wrapper for epanet hydraulic toolkit",

owa-epanet/setup.py

@@ -1,10 +1,11 @@
 %include "typemaps.i"
 %include "cstring.i"
+%include "carrays.i"
 
 /* epanet simple python wrapper */
 %module (package="epanet") output
 %{
-#define SHARED_EXPORTS_BUILT_AS_STATIC
+#define EXPORT_OUT_API
 #include <epanet_output.h>
 %}
 %include <epanet_output_enums.h>
@@ -91,6 +92,7 @@
 
 %feature("autodoc", "2");
 #define SHARED_EXPORTS_BUILT_AS_STATIC
+#define EXPORT_OUT_API
 %include <epanet_output.h>
 
 %exception;

owa-epanet/wrapper/output.i

@@ -22,6 +22,39 @@
 %typemap(argout) EN_Project* {
   %append_output(SWIG_NewPointerObj(*$1, SWIGTYPE_p_Project, SWIG_POINTER_NEW));
 }
+/*
+This is the same logic applied in swmm toolkit to handle a breaking change
+introduced in the version 4.3 of SWIG. Credit: karosc
+
+See https://github.com/karosc/swmm-python/commit/1ef854ac469c1e2df29f9bb1ed718361df79cc95
+*/
+%header %{
+SWIGINTERN PyObject*
+Custom_SWIG_Python_AppendOutput(PyObject* result, PyObject* obj, int is_void) {
+    if (!result) {
+    result = obj;
+    } else if (result == Py_None) {
+    SWIG_Py_DECREF(result);
+    result = obj;
+    } else {
+    if (!PyList_Check(result)) {
+        PyObject *o2 = result;
+        result = PyList_New(1);
+        if (result) {
+        PyList_SET_ITEM(result, 0, o2);
+        } else {
+        SWIG_Py_DECREF(obj);
+        return o2;
+        }
+    }
+    PyList_Append(result,obj);
+    SWIG_Py_DECREF(obj);
+    }
+    return result;
+}
+#define SWIG_Python_AppendOutput Custom_SWIG_Python_AppendOutput
+%}
+
 
 /* TYPEMAP FOR IGNORING INT ERROR CODE RETURN VALUE */
 %typemap(out) int {