Merge 192.168.1.79:github/yap-6.3

2018-03-26 11:03:08 +01:00
parent 9b86a7869b e02884a94f
commit 05356df347
119 changed files with 47950 additions and 1288 deletions
--- a/packages/swig/python/CMakeLists.txt
+++ b/packages/swig/python/CMakeLists.txt
@@ -0,0 +1,83 @@
+
+  # This is a CMake example for Python
+
+  INCLUDE( NewUseSWIG     )
+
+  if (PYTHONLIBS_FOUND)
+
+    include(FindPythonModule)
+
+    INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
+
+    INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/CXX" )
+
+
+    SET_SOURCE_FILES_PROPERTIES(../yap.i PROPERTIES CPLUSPLUS ON)
+    SET_SOURCE_FILES_PROPERTIES(../yap.i PROPERTIES SWIG_FLAGS "-O;-py3")
+    SET_SOURCE_FILES_PROPERTIES(../yap.i PROPERTIES SWIG_MODULE_NAME yap )
+    SET_SOURCE_FILES_PROPERTIES(../yap.i PROPERTIES OUTPUT_NAME yap )
+
+    configure_file ("setup.py.cmake"  ${CMAKE_CURRENT_BINARY_DIR}/setup.py )
+    # configure_file ("../yap.i"  "yap.i" )
+
+    SWIG_ADD_LIBRARY(Py2YAP LANGUAGE python  SHARED SOURCES ../yap.i )
+      if (WIN32)
+        SWIG_LINK_LIBRARIES(Py2YAP YAPPython libYap ${PYTHON_LIBRARIES} )
+          else()
+          SWIG_LINK_LIBRARIES(  Py2YAP  libYap YAP++ YAPPython ${PYTHON_LIBRARIES} )
+        endif()
+  set_target_properties ( ${SWIG_MODULE_Py2YAP_REAL_NAME}
+    PROPERTIES
+   NO_SONAME ON
+  OUTPUT_NAME _yap
+  LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"  )
+  # inform we are compiling YAP
+  # s used in MSYS
+
+  execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "import sysconfig; print( sysconfig.get_path( 'platlib' ) )"
+  OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH
+  OUTPUT_STRIP_TRAILING_WHITESPACE )
+  get_filename_component ( ABS_PYTHON_MODULE_PATH ${_ABS_PYTHON_MODULE_PATH} ABSOLUTE )
+  file ( RELATIVE_PATH _REL_PYTHON_MODULE_PATH ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH} )
+
+  set ( PYTHON_MODULE_PATH
+    ${ABS_PYTHON_MODULE_PATH}
+  )
+
+
+  INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/yap.py DESTINATION ${PYTHON_MODULE_PATH} )
+  INSTALL ( FILES ${CMAKE_SOURCE_DIR}/packages/python/yapex.py DESTINATION ${PYTHON_MODULE_PATH} )
+
+
+  INSTALL ( TARGETS  ${SWIG_MODULE_Py2YAP_REAL_NAME}
+  RUNTIME  DESTINATION ${PYTHON_MODULE_PATH}
+  	ARCHIVE DESTINATION ${PYTHON_MODULE_PATH}
+  	LIBRARY DESTINATION ${PYTHON_MODULE_PATH}
+  	)
+
+
+
+  if ( DOCUMENTATION AND DOXYGEN_FOUND )
+
+    set(CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
+
+    # Run doxygen to only generate the xml
+    add_custom_command ( OUTPUT ${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/doc
+      COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile.xml
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      DEPENDS ${c_headers};${c_sources};${cpp_sources};${cpp_headers}
+    )
+
+    # generate .i from doxygen .xml
+    add_custom_command ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ftdi1_doc.i
+      COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/doxy2swig.py -n
+      ${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml
+      ${CMAKE_CURRENT_BINARY_DIR}/ftdi1_doc.i
+      DEPENDS ${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml
+    )
+    add_custom_target ( doc_i DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ftdi1_doc.i )
+    add_dependencies( ${SWIG_MODULE_ftdi1_REAL_NAME} doc_i )
+
+  ENDIF()
+  ENDIF()
--- a/packages/swig/python/_yap.c
+++ b/packages/swig/python/_yap.c
@@ -0,0 +1,3 @@
+
+// make Python happy...
+
--- a/packages/swig/python/setup.py.cmake
+++ b/packages/swig/python/setup.py.cmake
@@ -0,0 +1,38 @@
+from distutils.core import setup, Extension
+import sys
+import os
+import platform
+
+if platform.system() == 'Darwin':
+    my_extra_link_args = ['-Wl,-rpath','-Wl,${dlls}']
+else:
+    my_extra_link_args = []
+ 
+python_sources = ['${CMAKE_CURRENT_SOURCE_DIR}/../yap.i']
+
+setup(
+    name = "yap",
+    version = "0.1",
+ext_modules=[Extension('_yap', python_sources,
+                             define_macros = [('MAJOR_VERSION', '1'),
+                                              ('MINOR_VERSION', '0'),
+                            ('_YAP_NOT_INSTALLED_', '1'),
+                            ('YAP_PYTHON', '1')],
+                            runtime_library_dirs=[,'$(bindir)'],
+			    swig_opts=['-modern','-outcurrentdir', '-c++', '-py3','-I${CMAKE_SOURCE_DIR}/CXX'],
+                             library_dirs=["${dlls}","${bindir}",
+					'.'],
+					extra_link_args=my_extra_link_args,
+					libraries=['Yap','{GMP_LIBRARIES}'],
+                             include_dirs=['../../..',
+                                         '${GMP_INCLUDE_DIRS}',
+                                         '${CMAKE_SOURCE_DIR}/H',
+                                         '${CMAKE_SOURCE_DIR}/H/generated',
+                                         '${CMAKE_SOURCE_DIR}/OPTYap',
+                                         '${CMAKE_SOURCE_DIR}/os',
+                                         '${CMAKE_SOURCE_DIR}/include',
+                                         '${CMAKE_SOURCE_DIR}/CXX', '.']
+    )],
+py_modules = ['yap', '${CMAKE_SOURCE_DIR}/packages/python/yapex']
+)
+
--- a/packages/swig/python/yap.egg-info/PKG-INFO
+++ b/packages/swig/python/yap.egg-info/PKG-INFO
@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: yap
+Version: 0.1
+Summary: UNKNOWN
+Home-page: UNKNOWN
+Author: UNKNOWN
+Author-email: UNKNOWN
+License: UNKNOWN
+Description: UNKNOWN
+Platform: UNKNOWN
--- a/packages/swig/python/yap.egg-info/SOURCES.txt
+++ b/packages/swig/python/yap.egg-info/SOURCES.txt
@@ -0,0 +1,14 @@
+setup.py
+yapPYTHON_wrap.cxx
+/Users/vsc/github/yap-6.3/packages/python/pl2pl.c
+/Users/vsc/github/yap-6.3/packages/python/pl2py.c
+/Users/vsc/github/yap-6.3/packages/python/py2pl.c
+/Users/vsc/github/yap-6.3/packages/python/pybips.c
+/Users/vsc/github/yap-6.3/packages/python/pypreds.c
+/Users/vsc/github/yap-6.3/packages/python/python.c
+/Users/vsc/github/yap-6.3/packages/swig/yap.i
+/Users/vsc/github/yap-6.3/packages/swig/python/yapex.py
+/Users/vsc/github/yap-6.3/packages/swig/python/yap.egg-info/PKG-INFO
+/Users/vsc/github/yap-6.3/packages/swig/python/yap.egg-info/SOURCES.txt
+/Users/vsc/github/yap-6.3/packages/swig/python/yap.egg-info/dependency_links.txt
+/Users/vsc/github/yap-6.3/packages/swig/python/yap.egg-info/top_level.txt
--- a/packages/swig/python/yap.egg-info/dependency_links.txt
+++ b/packages/swig/python/yap.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
--- a/packages/swig/python/yap.egg-info/top_level.txt
+++ b/packages/swig/python/yap.egg-info/top_level.txt
@@ -0,0 +1,2 @@
+yap
+yapex
--- a/packages/swig/python/yapex.egg-info/PKG-INFO
+++ b/packages/swig/python/yapex.egg-info/PKG-INFO
@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: yapex
+Version: 0.1
+Summary: UNKNOWN
+Home-page: UNKNOWN
+Author: UNKNOWN
+Author-email: UNKNOWN
+License: UNKNOWN
+Description: UNKNOWN
+Platform: UNKNOWN
--- a/packages/swig/python/yapex.egg-info/SOURCES.txt
+++ b/packages/swig/python/yapex.egg-info/SOURCES.txt
@@ -0,0 +1,12 @@
+setup.py
+/Users/vsc/github/yap-6.3/packages/python/pl2pl.c
+/Users/vsc/github/yap-6.3/packages/python/pl2py.c
+/Users/vsc/github/yap-6.3/packages/python/py2pl.c
+/Users/vsc/github/yap-6.3/packages/python/pybips.c
+/Users/vsc/github/yap-6.3/packages/python/pypreds.c
+/Users/vsc/github/yap-6.3/packages/python/python.c
+/Users/vsc/github/yap-6.3/packages/swig/python/yapex.py
+/Users/vsc/github/yap-6.3/packages/swig/python/yapex.egg-info/PKG-INFO
+/Users/vsc/github/yap-6.3/packages/swig/python/yapex.egg-info/SOURCES.txt
+/Users/vsc/github/yap-6.3/packages/swig/python/yapex.egg-info/dependency_links.txt
+/Users/vsc/github/yap-6.3/packages/swig/python/yapex.egg-info/top_level.txt
--- a/packages/swig/python/yapex.egg-info/dependency_links.txt
+++ b/packages/swig/python/yapex.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
--- a/packages/swig/python/yapex.egg-info/top_level.txt
+++ b/packages/swig/python/yapex.egg-info/top_level.txt
@@ -0,0 +1 @@
+yapex