Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
portabledsb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
External Wiki
External Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
App_Technologies
portabledsb
Commits
eb6d00a7
Commit
eb6d00a7
authored
Jan 05, 2016
by
Brendan Long
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix order of dependencies in circle.yml. GTEST_DIR needs to be available when building AllJoyn.
parent
7308a895
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
circle.yml
circle.yml
+7
-7
No files found.
circle.yml
View file @
eb6d00a7
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment