Skip to content
This repository has been archived by the owner on Jun 13, 2019. It is now read-only.

Commit

Permalink
Build: Enable downloading/installing iotivity on OSX and in CI OSX
Browse files Browse the repository at this point in the history
  • Loading branch information
Gabriel Schulhof committed Aug 25, 2015
1 parent a00e601 commit 40adfbd
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 5 deletions.
13 changes: 9 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
sudo: false

language: node_js
language: cpp

node_js:
- "0.12"
- "0.10"
env:
- NODE_VERSION=0.10
- NODE_VERSION=0.12

os:
- linux
Expand All @@ -16,6 +16,11 @@ matrix:

install:
- export CXX="g++-4.8" CC="gcc-4.8"
- rm -rf ~/.nvm
- wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.26.1/install.sh | bash
- source ~/.nvm/nvm.sh
- nvm install "${NODE_VERSION}"
- test "x${TRAVIS_OS_NAME}x" = "xosxx" && brew install scons || true

addons:
apt:
Expand Down
8 changes: 8 additions & 0 deletions binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@
'<!@(echo "-I$(pwd)/deps/iotivity/include/iotivity/resource/csdk/stack/include -I$(pwd)/deps/iotivity/include/iotivity/resource/csdk/ocrandom/include")'
]
}
} ],
[ "OS=='mac' and '<(externalOCTBStack)'=='false'", {
"libraries+": [
"-lconnectivity_abstraction",
"-lcoap",
"-lc_common",
"-locsrm"
]
} ]
],
"cflags_cc": [ '-std=c++11' ]
Expand Down
2 changes: 1 addition & 1 deletion build-csdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cd ./depbuild || exit 1

# iotivity wants us to clone this before it'll do anything
git clone https://github.com/01org/tinycbor.git extlibs/tinycbor/tinycbor
scons $SCONS_FLAGS liboctbstack || { cat config.log; exit 1; }
scons $SCONS_FLAGS liboctbstack libconnectivity_abstraction libcoap c_common libocsrm || { cat config.log; exit 1; }
PREFIX="$(pwd)/../../deps/iotivity" NO_PC="true" "$(pwd)/../../install.sh" || exit 1

cd ../../ || exit 1
Expand Down

0 comments on commit 40adfbd

Please sign in to comment.