Rename python wrapper to ftdi1. Adapt examples with minimal code changes

diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index 3f25225..28061a6 100644 (file)
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -10,8 +10,8 @@ if(PYTHON_BINDINGS AND SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
     INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
     LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../src)
 
-    SWIG_ADD_MODULE(ftdi python ftdi.i)
-    SWIG_LINK_LIBRARIES(ftdi ftdi1 ${PYTHON_LIBRARIES})
+    SWIG_ADD_MODULE(ftdi1 python ftdi1.i)
+    SWIG_LINK_LIBRARIES(ftdi1 ftdi1 ${PYTHON_LIBRARIES})
 
     execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print '%d.%d' % ( sys.version_info[0], sys.version_info[1] )"
                       OUTPUT_VARIABLE PYTHON_VERSION
@@ -19,8 +19,8 @@ if(PYTHON_BINDINGS AND SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
 
     set ( SITEPACKAGE lib${LIB_SUFFIX}/python${PYTHON_VERSION}/site-packages )
 
-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/_ftdi.so DESTINATION ${SITEPACKAGE})
-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ftdi.py DESTINATION ${SITEPACKAGE})
+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/_ftdi1.so DESTINATION ${SITEPACKAGE})
+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ftdi1.py DESTINATION ${SITEPACKAGE})
 
     message(STATUS "Building python bindings via swig. Will be installed under ${CMAKE_INSTALL_PREFIX}/${SITEPACKAGE}")
 else(PYTHON_BINDINGS AND SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)

diff --git a/bindings/ftdi.i b/bindings/ftdi1.i
similarity index 97%
rename from bindings/ftdi.i
rename to bindings/ftdi1.i
index faf2022..17e2e81 100644 (file)
--- a/bindings/ftdi.i
+++ b/bindings/ftdi1.i
@@ -1,6 +1,6 @@
-/* File: ftdi.i */
+/* File: ftdi1.i */
 
-%module(docstring="Python interface to libftdi1") ftdi
+%module(docstring="Python interface to libftdi1") ftdi1
 
 %include <typemaps.i>
 %include <cstring.i>

diff --git a/examples/python/complete.py b/examples/python/complete.py
index cee917d..f1b737c 100644 (file)
--- a/examples/python/complete.py
+++ b/examples/python/complete.py
@@ -9,7 +9,7 @@ of the swig generated python wrapper
 You need to build and install the wrapper first"""
 
 import os
-import ftdi
+import ftdi1 as ftdi
 import time
 
 # initialize

diff --git a/examples/python/simple.py b/examples/python/simple.py
index ecd5c2f..82ef6bb 100644 (file)
--- a/examples/python/simple.py
+++ b/examples/python/simple.py
@@ -8,7 +8,7 @@ of the swig generated python wrapper
 
 You need to build and install the wrapper first"""
 
-import ftdi
+import ftdi1 as ftdi
 
 def main():
     """Main program"""