Merge pull request #35 from michaeltryby/dev

update library from epanet2 to epanet_py

Author: michaeltryby

before_build.bat

@@ -15,18 +15,18 @@ set OUTPUT_PATH=\epanet_python\output\epanet\output
 
 mkdir buildlib
 cd buildlib
-git clone --branch=dev-swig-redux https://github.com/michaeltryby/EPANET.git
+git clone --branch=dev https://github.com/michaeltryby/EPANET.git
 cd epanet
 
 
 mkdir buildprod
 cd buildprod
-cmake -G"Visual Studio 14 2015 Win64" -DBUILD_TESTS=0 ..
+cmake -G"Visual Studio 14 2015 Win64" -DBUILD_PY_LIB=ON -DBUILD_TESTS=OFF ..
 cmake --build . --config Release
 
 
-copy /Y .\bin\Release\epanet2.dll  %PROJECT_PATH%\%TOOLKIT_PATH%
-copy /Y .\lib\Release\epanet2.lib  %PROJECT_PATH%\%TOOLKIT_PATH%
+copy /Y .\bin\Release\epanet_py.dll  %PROJECT_PATH%\%TOOLKIT_PATH%
+copy /Y .\lib\Release\epanet_py.lib  %PROJECT_PATH%\%TOOLKIT_PATH%
 copy /Y ..\include\*.h  %PROJECT_PATH%\%TOOLKIT_PATH%
 
 copy /Y .\bin\Release\epanet-output.dll  %PROJECT_PATH%\%OUTPUT_PATH%

epanet_python/toolkit/epanet/toolkit/toolkit.i

@@ -166,8 +166,8 @@ int node_getindex(Handle ph, char *id, int *OUTPUT);
 int node_getid(Handle ph, int index, char *id_out);
 int node_setid(Handle ph, int index, char *newid);
 int node_gettype(Handle ph, int index, int *OUTPUT);
-int node_getvalue(Handle ph, int index, int code, double *OUTPUT);
-int node_setvalue(Handle ph, int index, int code, double value);
+int node_getvalue(Handle ph, int index, EN_NodeProperty code, double *OUTPUT);
+int node_setvalue(Handle ph, int index, EN_NodeProperty code, double value);
 int node_getcoord(Handle ph, int index, double *OUTPUT, double *OUTPUT);
 int node_setcoord(Handle ph, int index, double x, double y);
 

epanet_python/toolkit/setup.py

@@ -23,22 +23,21 @@
 
 setup(
     name = microlib_name,
-    version = "0.0.2a0",
+    version = "0.0.3a0",
     ext_modules = [
         Extension("epanet.toolkit._toolkit",
             sources = ['epanet/toolkit/toolkit.i'],
             swig_opts = ['-py3'],
             include_dirs = ['epanet/toolkit'],
             library_dirs = ['epanet/toolkit'],
-            libraries = ['epanet2'],
-            extra_compile_args = ["/D WITH_GENX"],
+            libraries = ['epanet_py'],
             language = 'C'
         )
     ],
     namespace_packages = ['epanet'],
     packages = {microlib_name},
     py_modules = ['toolkit'],
 #    include_package_data=True
-    package_data = {microlib_name:['*epanet2.dll', '*epanet2.so']},
+    package_data = {microlib_name:['*epanet_py.dll', '*epanet_py.so']},
 
 )