alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

npm: added more potential sources to packages and other improvements

Browse Source 
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Mihai Tudor Panu 2016-10-26 10:52:17 -07:00
parent 510df0fb15
commit e3c5042a5a
3 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/CMakeLists.txt
View File

@ -306,6 +306,11 @@ if (BUILDSWIGNODE)
) )
macro(createpackagejson) macro(createpackagejson)
if (NPM) if (NPM)
# Dependency to generate wrappers before packing, skip modules that depend on 3rd party libs
if (NOT DEFINED reqlibname)
set (reqlibname "")
endif ()
if (reqlibname STREQUAL "" OR reqlibname MATCHES "mraa")
# Grab all module sources and headers, also add sources to gyp list # Grab all module sources and headers, also add sources to gyp list
file (GLOB srcfiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" file (GLOB srcfiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}/*.c" "${CMAKE_CURRENT_SOURCE_DIR}/*.c"
@ -330,16 +335,25 @@ if (BUILDSWIGNODE)
file (COPY ${CMAKE_SOURCE_DIR}/include DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname}) file (COPY ${CMAKE_SOURCE_DIR}/include DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname})
set (upm_LIB_INCLUDE_DIRS_GYP "'.',\n${upm_LIB_INCLUDE_DIRS_GYP}") set (upm_LIB_INCLUDE_DIRS_GYP "'.',\n${upm_LIB_INCLUDE_DIRS_GYP}")
# Dependency to generate wrappers before packing # Utilities and interfaces
add_dependencies (npmpkg jsupm_${libname}) file (COPY ${CMAKE_SOURCE_DIR}/src/utilities DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname})
file (COPY ${CMAKE_SOURCE_DIR}/src/upm DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname})
set (upm_LIB_SRCS_GYP "'utilities/upm_utilities.c',\n${upm_LIB_SRCS_GYP}")
set (upm_LIB_INCLUDE_DIRS_GYP "'utilities',\n${upm_LIB_INCLUDE_DIRS_GYP}")
set (upm_LIB_INCLUDE_DIRS_GYP "'upm',\n${upm_LIB_INCLUDE_DIRS_GYP}")
# Add readme for NPM and node-gyp config file # Add readme, package.json for NPM and node-gyp config file
configure_file (${PROJECT_SOURCE_DIR}/src/binding.gyp.in ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname}/binding.gyp @ONLY) configure_file (${PROJECT_SOURCE_DIR}/src/binding.gyp.in ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname}/binding.gyp @ONLY)
configure_file (${PROJECT_SOURCE_DIR}/src/package.json.in ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname}/package.json @ONLY) configure_file (${PROJECT_SOURCE_DIR}/src/package.json.npm.in ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname}/package.json @ONLY)
configure_file (${PROJECT_SOURCE_DIR}/doxy/README.npm.md ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname}/README.md) configure_file (${PROJECT_SOURCE_DIR}/doxy/README.npm.md ${CMAKE_CURRENT_BINARY_DIR}/jsupm_${libname}/README.md)
add_dependencies (npmpkg jsupm_${libname})
else ()
message ("Skipping jsupm_${libname}, needs ${reqlibname}")
endif ()
endif (NPM) endif (NPM)
# package.json is required for any kind of install # package.json for regular install
configure_file (${PROJECT_SOURCE_DIR}/src/package.json.in ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY) configure_file (${PROJECT_SOURCE_DIR}/src/package.json.in ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY)
# If a CMAKE_INSTALL_PREFIX has NOT been provided, set NODE_MODULE_INSTALL_PATH # If a CMAKE_INSTALL_PREFIX has NOT been provided, set NODE_MODULE_INSTALL_PATH

2
src/package.json.in
View File

@ -15,7 +15,7 @@
"url" : "http://github.com/intel-iot-devkit/upm/issues" "url" : "http://github.com/intel-iot-devkit/upm/issues"
}, },
"dependencies": { "dependencies": {
"mraa": ">=@MRAA_MINIMUM@" "mraa": ">=@MRAA_MINIMUM@"
}, },
"license": "MIT", "license": "MIT",
"version" : "@upm_VERSION_STRING@", "version" : "@upm_VERSION_STRING@",

20
src/package.json.npm.in Normal file
View File

@ -0,0 +1,20 @@
{
"name" : "jsupm_@libname@",
"description": "Sensor library based on MRAA that allows you to use various sensors on platforms such as the Intel Galileo, Intel Edison, Minnowboard MAX and others.",
"keywords":["intel", "edison", "galileo", "minnow", "io", "mraajs", "upmjs", "gpio", "spi", "i2c", "uart", "aio", "sensor", "actuator"],
"homepage": "http://github.com/intel-iot-devkit/upm",
"main" : "./build/Release/jsupm_@libname@.node",
"repository": {
"type": "git",
"url": "https://github.com/intel-iot-devkit/upm"
},
"engines" : {
"node": ">= 0.10.x"
},
"bugs": {
"url" : "http://github.com/intel-iot-devkit/upm/issues"
},
"license": "MIT",
"version" : "@upm_VERSION_STRING@",
"authors": "See http://github.com/intel-iot-devkit/upm/graphs/contributors"
}