Private
Public Access
2
0
Commit Graph

41 Commits

Author SHA1 Message Date
Nicolas Oliver
c6d49f6255 src/javascript/CMakeLists.txt: codestyle update for yuidoc task
Signed-off-by: Nicolas Oliver dario.n.oliver@intel.com
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2017-10-04 13:18:39 +02:00
Nicolas Oliver
3f3f657887 docs: require specific version of doc tools
Signed-off-by: Nicolas Oliver <dario.n.oliver@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2017-10-04 13:18:39 +02:00
Brendan Le Foll
e2f964a280 swig: use swig_add_modules if cmake > 3.7
swig_add_module has been deprecated

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2017-09-06 11:11:10 +02:00
Nicolas Oliver
e0a1862ce3 Travis CI and Documentation Generation improvements
* Use docker images from docker hub instead of building them on Travis
* Fix doxygen warnings for C/C++ Documentation
* Fix examples inclusion in documentation
* Modify Travis build matrix to include stages and additional jobs
* Update doxygen2jsdoc submodule
* Add doxyport submodule
* Generate documentation for each language in Travis
* Add sonar.java.binaries to sonar-scan.sh

Signed-off-by: Nicolas Oliver <dario.n.oliver@intel.com>
2017-08-10 10:47:11 -03:00
Brendan Le Foll
68e9399c4c cmake: use TARGETS instead of FILES for js module install
This strips the local RPATH when doing a `make install` rather than running
from the build/ dir

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2016-11-23 17:59:04 +00:00
Noel Eck
14de175425 mraajs: Allow user to override node module install path.
Currently, node modules install under the current environment's
node install path.  This happens even if cmake is passed a
CMAKE_INSTALL_PREFIX.

This change checks if a CMAKE_INSTALL_PREFIX has been provided,
in which case it prepens the install path to the NODE_MODULE_INSTALL_PATH.
If a CMAKE_INSTALL_PREFIX has NOT been provided, the the mraa node
modules get install according to the NODE_ROOT_DIR.

This fixes a problem with an install case where the caller does not
have write access to the NODE_ROOT_DIR.

Signed-off-by: Noel Eck <noel.eck@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2016-03-24 09:04:54 +00:00
Brendan Le Foll
a17079c460 firmata: install node_modules to where cmake guessed node was
This does now mean that modules won't go to /usr/local with the default prefix
but may instead try to install in /usr/lib. However if using nvm they should go
to the right place as long as NODE_ROOT_DIR is set correctly. This commit
changes NODE_ROOT_DIR to actually refer to the root directory of node rather
than the include dir which is what FindNodejs gets

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2016-03-22 18:12:30 +00:00
Brendan Le Foll
5789f5001d javascript/CMakeLists.txt: change SEND_ERROR for workaround to WARNING
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2016-03-22 18:12:30 +00:00
Brendan Le Foll
edd554b606 cmake: Fix message handling
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2016-03-22 18:12:29 +00:00
Brendan Le Foll
168764481a cmake: Use correct message modes
INFO is not a valid cmake message mode, this commit cleans up a few messages to
use the correct cmake modes

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2016-03-22 18:12:29 +00:00
Henry Bruce
0633cd4145 javascript: Updated cmake so that mraa.node dynamically links to libmraa
mraa.node was statically linking to mraa object files causing duplicate
mraa platform instances if a upm node.js module was also loaded.

Signed-off-by: Henry Bruce <henry.bruce@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2016-03-22 18:04:57 +00:00
Henry Bruce
3924070171 nodejs: Updated FindNodejs.cmake so exported variables match package name
Signed-off-by: Henry Bruce <henry.bruce@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2016-01-28 14:21:20 +00:00
Henry Bruce
ff31d6763c nodejs: cmake updates to more thoroughly check Node.js configuration
Signed-off-by: Henry Bruce <henry.bruce@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2016-01-28 14:21:05 +00:00
Eugene Bolshakov
2e5e3eaea2 mraajs: Check for CMAKE version > 3.1 or use workaround
Older cmake versions don't support the CXX_STANDARD property. Remove doubled
CMAKE_CXX_FLAGS in mraajs COMPILE_FLAGS

Closes #411

Signed-off-by: Eugene Bolshakov <pub@relvarsoft.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2016-01-24 16:56:41 +00:00
Brendan Le Foll
80024ff184 javascript: Fix build for nodejs v5 which has smaller version string
SWIG uses SWIG_V8_VERSION made of
0x0${V8_VERSION_MAJOR}${V8_VERSION_MINOR}${V8_VERSION_PATCH}. Because newer v8
versions don't seem to have a patch version that is padded the version string
ends up too small ending with using the node.js 0.10.x paths. This fix pads the
version string to 8chars which (we assume) is always correct. Fixes #358

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2015-11-11 13:47:43 +00:00
xbolshe
3059c06fa0 javascript: Add nodejs 4.1.1 support
API changes in V8 API mean that node.js 4 needs some changes both in mraajs.i
but also require a C++11 compiler

Signed-off-by: Eugene Bolshakov <pub@relvarsoft.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2015-10-03 17:36:54 +01:00
Brendan Le Foll
eb5a3ac5d2 cmake: add ${mraa_LIBS} to linker for swig libraries
This means that the correct libraries are added when mraa_LIBS is appended,
fixes ft4222 handling with SWIG APIs

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2015-09-08 14:42:04 +01:00
Brendan Le Foll
9c0753cb18 npm: Fix npm builds for ARM hosts
NPM builds don't support cross compiling and will always compile for the host.
Binding.gyp now uses mraa_NPM_SRCS instead of mraa_LIB_SRCS_NOAUTO which
contains all platforms. Cmake now uses mraa_LIB_PLAT_SRCS_NOAUTO to provide all
the sources. NPM builds will build objects for all platforms reguardless of
space which does meann slightly bigger binaries.

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2015-07-24 14:04:48 +01:00
Brendan Le Foll
d6b33a9cbf cmake: add yuidoc documentation generation
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2015-06-01 15:16:42 +01:00
Brendan Le Foll
6aa601cd1d javascript/CMakeLists.txt: stop requiring doc_i files for node.js
These files are required when building docs for python but are never used for
the node.js module

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2015-04-02 14:01:06 +01:00
Brendan Le Foll
128f0a22da nodejs: add infra to detect nodejs version
This introduces FindNodes.cmake which finds the v8 version and the nodejs
interp version and passes the information to SWIG via SWIG_V8_VERSION

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2015-03-19 18:26:05 +00:00
Brendan Le Foll
008184c305 nodejs: Add isr support to node.js
This commit adds isr support to node.js mraa module, it also forces
SWIGJAVASCRIPT to be set at compile time by cmake (SWIG uses SWIGJAVASCRIPT and
not SWIGNODE in it's preprocessor). This uses libuv uv_queue_work to call v8isr
and is all done at a C++ level unlike the python isr, so this reuses the
mraa_gpio_isr call. This closes #110

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2015-02-18 16:41:01 +00:00
yoneken
2965665fee Add options for nodejs include directory
Signed-off-by: Kenta Yonekura <yoneken@ieee.org>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2015-02-15 21:15:24 +00:00
Brendan Le Foll
36e24bade8 npmpkg: Fix package.json having invalid main property
Fixes #48

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2014-12-01 13:59:47 +00:00
Brendan Le Foll
abd538dc4b cmake: fix indentation
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2014-11-24 18:03:36 +00:00
Brendan Le Foll
a38c07f7b1 npm: add node-gyp build support
This commit adds all the infrastructure necessary for doing node-gyp builds of
mraa. Note this will only build the mraa js bindings and will dirty your git
tree whilst doing it. It also assumes the user does not have SWIG installed on
their machines and so the swig wrapper is static. The target to use this
feature is 'npmpkg'.

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2014-11-24 15:20:19 +00:00
Brendan Le Foll
d4552fdc5e javascript: add a generated package.json with versioning
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2014-11-24 11:19:05 +00:00
Thomas Ingleby
181ba35f4d javascript: dont't wipe other cxx flags
Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
2014-09-09 17:29:42 +01:00
Brendan Le Foll
c821c84e4a mraa: pymraa becomes mraa and mraajs becomes mraa
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2014-06-25 17:49:07 +01:00
Thomas Ingleby
6853997a92 mraa: rename from maa to mraa
Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
2014-06-24 17:24:54 +01:00
Thomas Ingleby
be1248930b js-swig: remove whitespace
Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
2014-06-10 20:17:09 +01:00
Brendan Le Foll
2c278acfcd cmake: install python & node.js modules correctly
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2014-06-04 12:06:04 +01:00
Brendan Le Foll
28fc9f97c9 swig: use C++ generated class doc and include directly from maa.i
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2014-05-30 10:28:21 +01:00
Brendan Le Foll
bd1fabab5e nodejs: define BUILDING_NODE_EXTENSION in CXXFLAGS for upstream swig
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2014-05-22 11:40:59 +01:00
Brendan Le Foll
9387c943d9 cmake: fix hard includ of node headers for cross compile
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2014-05-15 16:40:40 +01:00
Brendan Le Foll
0450c2e159 doxygen: generic and more reliable doxygen/swig autodoc integration
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2014-04-30 10:50:44 +01:00
Brendan Le Foll
804c4a437d javascript: fix swig generation of node.js api
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2014-04-29 18:44:09 +01:00
Brendan Le Foll
a5a407e4b5 MAA version 0.2.0 moves to a standard C API
* Removed all C++ code and renamed all .cxx extensions to .c
* All functions are renamed to maa_ and modules are for example called maa_pwm
* Cmake can now 'make doc' using a Doxyfile.in to create documentation
* examples/ have been updated but swig generated API is untested

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2014-04-27 21:17:54 +01:00
Brendan Le Foll
9994ea855c maa: Refactor maa build system and partly implement i2c
* API headers moved to api/
* smbus file added from libi2c and kernel i2c header cleaned up
* fix compilation of swig and use i2c.h header

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
2014-04-10 16:53:19 +01:00
Brendan Le Foll
b7d42d470f maa.i: remove dependancy on -includeall and specifiy which headers to include in maa.i 2014-04-10 11:05:40 +01:00
Brendan Le Foll
00ba95bac0 maa: Initial commit of maa, a python and nodejs I2C skeleton only 2014-04-08 18:45:30 +01:00