Commit eb6d00a7 authored by Brendan Long's avatar Brendan Long

Fix order of dependencies in circle.yml. GTEST_DIR needs to be available when building AllJoyn.

parent 7308a895
...@@ -7,13 +7,6 @@ dependencies: ...@@ -7,13 +7,6 @@ dependencies:
pre: pre:
- sudo apt-get update - sudo apt-get update
- sudo apt-get install libcap-dev scons libgtest-dev - sudo apt-get install libcap-dev scons libgtest-dev
- if [[ ! -e ~/alljoyn-15.09.00a-src ]] ; then
cd ~ ;
wget --no-check-certificate https://allseenalliance.org/releases/alljoyn/15.09/alljoyn-15.09.00a-src.tar.gz ;
tar -xf alljoyn-15.09.00a-src.tar.gz ;
cd alljoyn-15.09.00a-src ;
scons BINDINGS=cpp OS=linux CPU=x86_64 VARIANT=release BUILD_SERVICE_SAMPLES=off WS=off BT=off ICE=off -j4 ;
fi
- if [[ ! -e ~/gtest ]] ; then - if [[ ! -e ~/gtest ]] ; then
cd ~ ; cd ~ ;
cp -r /usr/src/gtest . ; cp -r /usr/src/gtest . ;
...@@ -21,6 +14,13 @@ dependencies: ...@@ -21,6 +14,13 @@ dependencies:
cmake -DCMAKE_BUILD_TYPE=RELEASE . ; cmake -DCMAKE_BUILD_TYPE=RELEASE . ;
make ; make ;
fi fi
- if [[ ! -e ~/alljoyn-15.09.00a-src ]] ; then
cd ~ ;
wget --no-check-certificate https://allseenalliance.org/releases/alljoyn/15.09/alljoyn-15.09.00a-src.tar.gz ;
tar -xf alljoyn-15.09.00a-src.tar.gz ;
cd alljoyn-15.09.00a-src ;
scons BINDINGS=cpp OS=linux CPU=x86_64 VARIANT=release BUILD_SERVICE_SAMPLES=off WS=off BT=off ICE=off -j4 ;
fi
post: post:
- make -j4 - make -j4
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment