Successful build on Windows (VOLTTRON#13)

* Successful build on Windows

* Only set visibilify flag when not running MSVC

* Automatically patch imasteroperations if required

Author: Garret Fick

.gitattributes

@@ -0,0 +1 @@
+*.patch      text eol=lf

.gitignore

@@ -100,4 +100,8 @@ ENV/
 
 # mypy
 .mypy_cache/
-*.pytest_cache/
+*.pytest_cache/
+
+# VisualStudio and VisualStudio Code project settings
+.vscode/
+.vs/

CMakeLists.txt

@@ -28,7 +28,10 @@ option(PROFILE "Builds the libraries with profiling support (gcc only)" OFF)
 set(CMAKE_REQUIRED_FLAGS ${CMAKE_CXX_FLAGS})
 
 set(STATICLIBS ON)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+
+if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+endif()
 
 add_subdirectory(deps/pybind11)
 add_subdirectory(deps/dnp3)
@@ -41,7 +44,7 @@ include_directories(deps/dnp3/cpp/libs/src)
 include_directories(deps/dnp3/deps/asio/asio/include)
 add_definitions(-DASIO_STANDALONE)
 
-pybind11_add_module(pydnp3 MODULE src/pydnp3.cpp)
+pybind11_add_module(pydnp3 MODULE src/pydnp3.cpp src/pydnp3asiodnp3.cpp src/pydnp3asiopal.cpp src/pydnp3opendnp3.cpp src/pydnp3openpal.cpp)
 target_link_libraries(pydnp3 PRIVATE asiopal asiodnp3 openpal opendnp3)
 
 

imasteroperations.patch

@@ -0,0 +1,12 @@
+diff --git a/cpp/libs/include/asiodnp3/IMasterOperations.h b/cpp/libs/include/asiodnp3/IMasterOperations.h
+index f056323e4..75cad0273 100644
+--- a/cpp/libs/include/asiodnp3/IMasterOperations.h
++++ b/cpp/libs/include/asiodnp3/IMasterOperations.h
+@@ -40,6 +40,7 @@
+ 
+ #include <vector>
+ #include <memory>
++#include <string>
+ 
+ namespace asiodnp3
+ {

setup.py

@@ -55,6 +55,14 @@ def build_extension(self, ext):
                                                               self.distribution.get_version())
         if not os.path.exists(self.build_temp):
             os.makedirs(self.build_temp)
+
+        setup_path = os.path.dirname(os.path.abspath(__file__))
+        if not "<string>" in open(os.path.join(setup_path, 'deps', 'dnp3', 'cpp', 'libs', 'include', 'asiodnp3', 'IMasterOperations.h')).read():
+            dnp3_path = os.path.join(setup_path, 'deps', 'dnp3')
+            patch_path = os.path.join(setup_path, 'imasteroperations.patch')
+
+            subprocess.check_call(['git', 'apply', patch_path], cwd=dnp3_path)
+
         subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env)
         subprocess.check_call(['cmake', '--build', '.'] + build_args, cwd=self.build_temp)
 

src/AllHeaders.h

@@ -0,0 +1,65 @@
+/*
+ * -*- coding: utf-8 -*- {{{
+ * vim: set fenc=utf-8 ft=python sw=4 ts=4 sts=4 et:
+ *
+ * Copyright 2018, Kisensum.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Neither Kisensum, nor any of its employees, nor any jurisdiction or
+ * organization that has cooperated in the development of these materials,
+ * makes any warranty, express or implied, or assumes any legal liability
+ * or responsibility for the accuracy, completeness, or usefulness or any
+ * information, apparatus, product, software, or process disclosed, or
+ * represents that its use would not infringe privately owned rights.
+ * Reference herein to any specific commercial product, process, or service
+ * by trade name, trademark, manufacturer, or otherwise does not necessarily
+ * constitute or imply its endorsement, recommendation, or favoring by Kisensum.
+ * }}}
+ */
+
+#ifndef PYDNP3_ASIODNP3_ALLHEADERS_H
+#define PYDNP3_ASIODNP3_ALLHEADERS_H
+
+// For this compilation unit, include the header file
+// related to asiodnp3
+#define PYDNP3_ASIODNP3
+
+// ---------- ASIODNP3 HEADERS ----------
+#include "ConsoleLogger.h"
+#include "DatabaseConfig.h"
+#include "DefaultListenCallbacks.h"
+#include "DefaultMasterApplication.h"
+#include "DNP3Manager.h"
+#include "ErrorCodes.h"
+#include "IChannel.h"
+#include "IChannelListener.h"
+#include "IListenCallbacks.h"
+#include "IMaster.h"
+#include "IMasterOperations.h"
+#include "IMasterScan.h"
+#include "IMasterSession.h"
+#include "IOutstation.h"
+#include "ISessionAcceptor.h"
+#include "IStack.h"
+#include "MasterStackConfig.h"
+#include "MasterTCPServer.h"
+#include "OutstationStackConfig.h"
+#include "PrintingChannelListener.h"
+#include "PrintingCommandCallback.h"
+#include "PrintingSOEHandler.h"
+#include "UpdateBuilder.h"
+#include "Updates.h"
+#include "X509Info.h"
+
+#endif