Merge branch 'support-3367-part2' into 'master'

Support 3367

See merge request !22

CMakeLists.txt

@@ -13,7 +13,7 @@ set(CMAKE_C_STANDARD 11)
 set(Python_ADDITIONAL_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4)
 find_package (PythonLibs REQUIRED)
 include_directories(${PYTHON_INCLUDE_DIR} include/)
-file(GLOB PYTHON_CELLFRAME_SRCS src/*.c)
+file(GLOB PYTHON_CELLFRAME_SRCS CellFrame/*.c)
 file(GLOB PYTHON_CELLFRAME_HEADERS include/*.h)
 
 set(SUBMODULES_NO_BUILD ON)
@@ -105,8 +105,8 @@ else()
     #python_extension_module(${PROJECT_NAME} LINKED_MODULES_VAR dap_crypto_python_module)
     #python_extension_module(${PROJECT_NAME} LINKED_MODULES_VAR DapServerCore)
     install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${PROJECT_NAME})
-    install(FILES src/__init__.py DESTINATION ${PROJECT_NAME})
-    install(FILES src/PublicNetworks/* DESTINATION ${PROJECT_NAME})
+    install(FILES CellFrame/__init__.py DESTINATION ${PROJECT_NAME})
+    install(FILES CellFrame/PublicNetworks/* DESTINATION ${PROJECT_NAME})
     #    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdap-python/libdap_python_module.so DESTINATION CellFrame/lib)
     #    install(TARGETS dap_python_module LIBRARY DESTINATION CellFrame)
     #    install(TARGETS dap_crypto_python_module LIBRARY DESTINATION CellFrame)
@@ -149,6 +149,9 @@ target_compile_options(dap_chain_cs_dag_poa PRIVATE "-fpic")
 target_compile_options(dap_chain_cs_dag_pos PRIVATE "-fpic")
 
 
+if (WIN32)
+    set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".pyd")
+endif()
 
 
 target_link_libraries(${PROJECT_NAME} cellframe-sdk dap_python_module

CellFrame

-.
\ No newline at end of file

CellFrame/__init__.py

+from .libCellFrame import *

README.md

@@ -36,9 +36,20 @@ sudo apt-get install libverto-dev
 sudo apt-get install lldb-7
 sudo apt-get install libmemcached-dev
 sudo apt-get install libldb-dev
-sudo apt-get install libtalloc-dev
 sudo apt-get install libtevent-dev
 sudo apt-get install libpython3-dev
-sudo apt-get install traceroute
 
-```
\ No newline at end of file
+```
+
+
+## Windows Build
+First of all you need to install msys2. It provides 3 shells.
+To install dependencies, run from MSYS shell:
+```
+pacman -S base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-file mingw-w64-x86_64-json-c mingw-w64-x86_64-python-pip
+```
+
+To start a build, run from MinGW 64bit shell (don't forget to change dir to python-cellframe repo):
+```
+python setup.py install
+```

src/__init__.py

-#from .libCellFrame import *