Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganizing DART library composition #652

Merged
merged 33 commits into from
Apr 16, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
26497a0
Execute assimp symbol tests quietly without messages in cmake time
jslee02 Mar 29, 2016
b259145
Remove dart-core library and split dart library into multiple compone…
jslee02 Mar 29, 2016
63a697c
Merge branch 'packaging/osgdart' into packaging/components
jslee02 Mar 29, 2016
30ca7fe
Include DART component files to coverage test
jslee02 Mar 29, 2016
eb00773
Merge remote-tracking branch 'origin/packaging/osgdart' into packagin…
jslee02 Apr 7, 2016
bb31f96
Quote list of files to pass it as a single list parameter
jslee02 Apr 7, 2016
75ab087
Remove BUILD_CORE_ONLY option from .travis.yml
jslee02 Apr 7, 2016
ecb5aff
Build using multicore by adding '-j4' option to make command
jslee02 Apr 7, 2016
1c4e747
Merge remote-tracking branch 'origin/packaging/osgdart' into packagin…
jslee02 Apr 13, 2016
9d00105
correct IPOPT_INCLUDE_DIRS --> NLOPT_INCLUDE_DIRS
mxgrey Apr 13, 2016
f767a9b
Merge remote-tracking branch 'origin/master' into packaging/components
jslee02 Apr 13, 2016
19d71b5
Removing OpenGL dep from main lib and fixes for installation
costashatz Apr 14, 2016
cb1a272
Merge pull request #667 from resibots/packaging/components
jslee02 Apr 14, 2016
fcb3fba
Fixes #666 - quick n dirty
costashatz Apr 14, 2016
05846ae
Merge `renderer` namespace into `gui` namespace
jslee02 Apr 14, 2016
2782aae
Make dependencies for component libraries as optional
jslee02 Apr 14, 2016
c4ae877
Remove unnecessary cmake script lines
jslee02 Apr 14, 2016
4309abe
Reverting #635: Keep using mesh for primitive shapes because FCL (eve…
jslee02 Apr 14, 2016
f084f49
Add OPENGL_FOUND to the condition of adding gui directory to build
jslee02 Apr 14, 2016
eeaebb7
Update debian files for DART 6.0 -- not tested
jslee02 Apr 14, 2016
3d26c2a
Reduce number of travis ci builds
jslee02 Apr 14, 2016
7513040
Merge pull request #668 from resibots/collision_fix
jslee02 Apr 14, 2016
46e9c03
Let ConstraintSolver set the colliding status of PointMass
jslee02 Apr 14, 2016
d22b556
Add simple regression test for #666
jslee02 Apr 14, 2016
5d0d9ff
Made changes according to the discussion in PR #668
mxgrey Apr 15, 2016
88dadaa
Function to access the last collision result of a World's constraint …
mxgrey Apr 15, 2016
8b27d82
created test for new CollisionResult function
mxgrey Apr 15, 2016
0cf7037
removed unnecessary printout
mxgrey Apr 15, 2016
7cfbb56
Return a const reference instead of a const value
mxgrey Apr 15, 2016
2eafa54
Add a comment to motivate asShapeNode()
mxgrey Apr 15, 2016
bb5ef56
Merge pull request #670 from dartsim/grey/CollisionResult
jslee02 Apr 16, 2016
aeedcbf
Suppress warnings
jslee02 Apr 16, 2016
9499a5a
Update DART_PKG_EXTERNAL_DEPS
jslee02 Apr 16, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,10 @@ compiler:
- clang

env:
- BUILD_CORE_ONLY=OFF BUILD_TYPE=Debug COVERALLS=OFF
- BUILD_CORE_ONLY=OFF BUILD_TYPE=Release COVERALLS=OFF
- BUILD_CORE_ONLY=ON BUILD_TYPE=Debug COVERALLS=OFF
- BUILD_CORE_ONLY=ON BUILD_TYPE=Release COVERALLS=OFF
- BUILD_TYPE=Debug COVERALLS=ON COVERALLS_REPO_TOKEN=FKh1HgwfV5uzNrYxIT6ZWjcFqybYZSUym
- BUILD_TYPE=Release COVERALLS=OFF

matrix:
include:
- os: linux
compiler: gcc
env: BUILD_CORE_ONLY=OFF BUILD_TYPE=Debug COVERALLS=ON COVERALLS_REPO_TOKEN=FKh1HgwfV5uzNrYxIT6ZWjcFqybYZSUym
exclude:
- os: osx
compiler: gcc
Expand All @@ -33,10 +27,9 @@ install:

script:
- mkdir build && cd build
- cmake -DBUILD_CORE_ONLY=$BUILD_CORE_ONLY -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDART_COVERALLS=$COVERALLS ..
- make all
- if [ $BUILD_CORE_ONLY = OFF ]; then make tutorials examples tests test; fi
- if [ $COVERALLS = ON ]; then make coveralls; fi
- cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDART_COVERALLS=$COVERALLS ..
- make -j4 all tutorials examples tests test
- if [ $COVERALLS = ON ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then make -j4 coveralls; fi

after_failure:
- cat Testing/Temporary/LastTest.log
Expand Down
Loading