From c821c84e4ae86415f9e90422def51b2b8d94d4de Mon Sep 17 00:00:00 2001 From: Brendan Le Foll Date: Wed, 25 Jun 2014 17:49:27 +0100 Subject: [PATCH] mraa: pymraa becomes mraa and mraajs becomes mraa Signed-off-by: Brendan Le Foll --- CMakeLists.txt | 3 +++ examples/javascript/example.js | 2 +- examples/python/aio.py | 2 +- examples/python/blink-io8.py | 2 +- examples/python/cycle-pwm3.py | 2 +- examples/python/hello_gpio.py | 8 ++++---- examples/python/hello_isr.py | 2 +- examples/python/rgblcd.py | 2 +- src/javascript/CMakeLists.txt | 5 +++-- src/javascript/mraajs.i | 2 +- src/javascript/package.json | 4 ++-- src/python/CMakeLists.txt | 22 +++++++++++++--------- src/python/pymraa.i | 6 ------ src/python/python-mraa.i | 6 ++++++ 14 files changed, 38 insertions(+), 30 deletions(-) delete mode 100644 src/python/pymraa.i create mode 100644 src/python/python-mraa.i diff --git a/CMakeLists.txt b/CMakeLists.txt index 9640fd3..dee9b80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,9 @@ set (mraa_VERSION_STRING ${mraa_VERSION_MAJOR}.${mraa_VERSION_MINOR}.${mraa_VERS set (CMAKE_SWIG_FLAGS "") +find_path (SYSTEM_USR_DIR "stdlib.h") +include_directories (${SYSTEM_USR_DIR}) + option (GTEST "Build all gtests." OFF) option (BUILDDOC "Build all doc." OFF) option (BUILDSWIG "Build swig modules." ON) diff --git a/examples/javascript/example.js b/examples/javascript/example.js index c29cb1c..80cc921 100644 --- a/examples/javascript/example.js +++ b/examples/javascript/example.js @@ -22,7 +22,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -var m = require("mraajs") +var m = require("mraa") console.log("mraa version: " + m.getVersion()); var x = new m.Gpio(8) diff --git a/examples/python/aio.py b/examples/python/aio.py index af47857..cc9e604 100644 --- a/examples/python/aio.py +++ b/examples/python/aio.py @@ -22,7 +22,7 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -import pymraa as mraa +import mraa print (mraa.getVersion()) x = mraa.Aio(0) diff --git a/examples/python/blink-io8.py b/examples/python/blink-io8.py index 896d2a8..0e56ae9 100644 --- a/examples/python/blink-io8.py +++ b/examples/python/blink-io8.py @@ -22,7 +22,7 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -import pymraa as mraa +import mraa import time x = mraa.Gpio(8) diff --git a/examples/python/cycle-pwm3.py b/examples/python/cycle-pwm3.py index 53852f0..538f697 100644 --- a/examples/python/cycle-pwm3.py +++ b/examples/python/cycle-pwm3.py @@ -22,7 +22,7 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -import pymraa as mraa +import mraa import time x = mraa.PWM(0,3) diff --git a/examples/python/hello_gpio.py b/examples/python/hello_gpio.py index 6add4bf..69ec0c7 100644 --- a/examples/python/hello_gpio.py +++ b/examples/python/hello_gpio.py @@ -22,9 +22,9 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -import pymraa +import mraa -print (pymraa.getVersion()) -x = pymraa.Gpio(13) -x.dir(pymraa.DIR_OUT) +print (mraa.getVersion()) +x = mraa.Gpio(13) +x.dir(mraa.DIR_OUT) x.write(1) diff --git a/examples/python/hello_isr.py b/examples/python/hello_isr.py index d86802a..bc330ff 100644 --- a/examples/python/hello_isr.py +++ b/examples/python/hello_isr.py @@ -22,7 +22,7 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE -import pymraa as mraa +import mraa def test(args): print("wooo") diff --git a/examples/python/rgblcd.py b/examples/python/rgblcd.py index 6a05931..1497a4d 100644 --- a/examples/python/rgblcd.py +++ b/examples/python/rgblcd.py @@ -22,7 +22,7 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE -import pymraa as mraa +import mraa # This example will change the LCD backlight on the Grove-LCD RGB backlight # to a nice shade of purple diff --git a/src/javascript/CMakeLists.txt b/src/javascript/CMakeLists.txt index 253e13f..da08fb4 100644 --- a/src/javascript/CMakeLists.txt +++ b/src/javascript/CMakeLists.txt @@ -28,9 +28,10 @@ endif () set_target_properties (mraajs PROPERTIES PREFIX "" + OUTPUT_NAME mraa SUFFIX ".node" ) install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.json - ${CMAKE_CURRENT_BINARY_DIR}/mraajs.node - DESTINATION lib/node_modules/mraajs) + ${CMAKE_CURRENT_BINARY_DIR}/mraa.node + DESTINATION lib/node_modules/mraa) diff --git a/src/javascript/mraajs.i b/src/javascript/mraajs.i index 59ff5fe..7db1285 100644 --- a/src/javascript/mraajs.i +++ b/src/javascript/mraajs.i @@ -1,4 +1,4 @@ -%module (docstring="Javascript interface to libmraa") mraajs +%module (docstring="Javascript interface to libmraa") mraa %feature("autodoc", "3"); diff --git a/src/javascript/package.json b/src/javascript/package.json index 9938da7..15d388e 100644 --- a/src/javascript/package.json +++ b/src/javascript/package.json @@ -1,6 +1,6 @@ { - "name" : "mraajs", - "main" : "./mraajs.node", + "name" : "mraa", + "main" : "./mraa.node", "engines": { "node": ">= 1.0.x" }, diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index 98b1dd1..0ae80b2 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -6,33 +6,37 @@ include_directories( ${PYTHON_INCLUDE_DIRS} ) -set_source_files_properties (pymraa.i PROPERTIES CPLUSPLUS ON) -set_source_files_properties (pymraa.i PROPERTIES SWIG_FLAGS "-I${CMAKE_BINARY_DIR}/src") -swig_add_module (pymraa python pymraa.i ${mraa_LIB_SRCS}) -swig_link_libraries (pymraa ${PYTHON_LIBRARIES}) +set_source_files_properties (python-mraa.i PROPERTIES CPLUSPLUS ON) +set_source_files_properties (python-mraa.i PROPERTIES SWIG_FLAGS "-I${CMAKE_BINARY_DIR}/src") +swig_add_module (python-mraa python python-mraa.i ${mraa_LIB_SRCS}) +swig_link_libraries (python-mraa ${PYTHON_LIBRARIES}) set (CMAKE_C_FLAGS -DSWIGPYTHON=${SWIG_FOUND}) if (DOXYGEN_FOUND) foreach (_file ${DOCCLASSES}) - add_dependencies (${SWIG_MODULE_pymraa_REAL_NAME} ${_file}class_doc_i) + add_dependencies (${SWIG_MODULE_python-mraa_REAL_NAME} ${_file}class_doc_i) endforeach () - add_dependencies (${SWIG_MODULE_pymraa_REAL_NAME} commondoc_i) + add_dependencies (${SWIG_MODULE_python-mraa_REAL_NAME} commondoc_i) add_custom_target (pydoc - pydoc -w ${CMAKE_CURRENT_BINARY_DIR}/pymraa.py ${CMAKE_CURRENT_BINARY_DIR}/ + pydoc -w ${CMAKE_CURRENT_BINARY_DIR}/mraa.py ${CMAKE_CURRENT_BINARY_DIR}/ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating API documentation with pydoc" VERBATIM ) endif () +set_target_properties (${SWIG_MODULE_python-mraa_REAL_NAME} PROPERTIES + OUTPUT_NAME _mraa +) + # Essentially do seperate_arguments but with "." instead of " " string (REPLACE "." ";" PYTHON_VERSION_LIST ${PYTHONLIBS_VERSION_STRING}) list (GET PYTHON_VERSION_LIST 0 PYTHON_VERSION_MAJOR) list (GET PYTHON_VERSION_LIST 1 PYTHON_VERSION_MINOR) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/_pymraa.so - ${CMAKE_CURRENT_BINARY_DIR}/pymraa.py +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/_mraa.so + ${CMAKE_CURRENT_BINARY_DIR}/mraa.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/) add_subdirectory (docs) diff --git a/src/python/pymraa.i b/src/python/pymraa.i deleted file mode 100644 index 98bbc24..0000000 --- a/src/python/pymraa.i +++ /dev/null @@ -1,6 +0,0 @@ -%module(docstring="Python interface to libmraa") pymraa - -%feature("autodoc", "3"); - -%include ../mraa.i - diff --git a/src/python/python-mraa.i b/src/python/python-mraa.i new file mode 100644 index 0000000..e64ee71 --- /dev/null +++ b/src/python/python-mraa.i @@ -0,0 +1,6 @@ +%module(docstring="Python interface to libmraa") mraa + +%feature("autodoc", "3"); + +%include ../mraa.i + -- 2.7.4