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.

Sign up for GitHub

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

Jump to bottom

split jsk_common into jsk_common_msgs and jsk_3rdparty https://github.com/jsk-ros-pkg/jsk_common/issues/919 #1

Merged
merged 4 commits into from
Jun 12, 2015
Merged

split jsk_common into jsk_common_msgs and jsk_3rdparty https://github.com/jsk-ros-pkg/jsk_common/issues/919 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90b0793
image_view2 and multi_map_server is kept in jsk_common
k-okada Jun 12, 2015
2b05913
add jsk_3rdparty meta package
k-okada Jun 12, 2015
c59d67f
[.travis.yml] add .travis and .travis.yml
k-okada Jun 12, 2015
733acd8
[ff/package.xml] add mk to build_depend
k-okada Jun 12, 2015
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
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule ".travis"]
path = .travis
url = git://github.com/jsk-ros-pkg/jsk_travis
1 change: 1 addition & 0 deletions .travis
Open in desktop
Submodule .travis added at 889eed
16 changes: 16 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
language:
- cpp
- python
python:
- "2.7"
compiler:
- gcc
sudo: required
env:
- ROS_DISTRO=hydro ROSWS=wstool BUILDER=catkin USE_DEB=true ROS_PARALLEL_JOBS="-j2 -l2"
- ROS_DISTRO=indigo ROSWS=wstool BUILDER=catkin USE_DEB=true ROS_PARALLEL_JOBS="-j8"
script: source .travis/travis.sh
notifications:
email:
on_success: always
on_failure: always
1 change: 1 addition & 0 deletions 3rdparty/ff/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

<buildtool_depend>catkin</buildtool_depend>

<build_depend>mk</build_depend>
<build_depend>flex</build_depend>
<build_depend>bison</build_depend>
<build_depend>unzip</build_depend>
Expand Down
4 changes: 4 additions & 0 deletions jsk_3rdprty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
project(jsk_3rdparty)
find_package(catkin REQUIRED)
catkin_metapackage()
39 changes: 39 additions & 0 deletions jsk_3rdprty/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0"?>
<package>
<name>jsk_3rdparty</name>
<version>1.0.72</version>
<description>
<p>Metapackage that contains commonly used 3rdparty toolset for jsk-ros-pkg</p>
</description>

<maintainer email="k-okada@jsk.t.u-tokyo.ac.jp">Kei Okada</maintainer>
<author email="k-okada@jsk.t.u-tokyo.ac.jp">Kei Okada</author>

<license>BSD</license>
<url type="website">http://ros.org/wiki/jsk_3rdparty</url>
<url type="repository">https://github.com/jsk-ros-pkg/jsk_3rdparty</url>
<url type="bugtracker">https://github.com/jsk-ros-pkg/jsk_3rdparty/issues</url>

<buildtool_depend>catkin</buildtool_depend>

<run_depend>opt_camera</run_depend>
<run_depend>rosping</run_depend>
<run_depend>rospatlite</run_depend>
<run_depend>nlopt</run_depend>
<run_depend>voice_text</run_depend>
<run_depend>sklearn</run_depend>
<run_depend>assimp_devel</run_depend>
<run_depend>ff</run_depend>
<run_depend>mini_maxwell</run_depend>
<run_depend>libsiftfast</run_depend>
<run_depend>ffha</run_depend>
<run_depend>downward</run_depend>
<run_depend>rostwitter</run_depend>
<run_depend>bayesian_belief_networks</run_depend>
<run_depend>julius</run_depend>
<run_depend>collada_urdf_jsk_patch</run_depend>
<run_depend>laser_filters_jsk_patch</run_depend>
<export>
<metapackage/>
</export>
</package>
Loading