Skip to content

Commit

Permalink
Merge pull request #4 from adamantivm/release-1.0
Browse files Browse the repository at this point in the history
Release 1.0
  • Loading branch information
Julian Cerruti committed Jan 29, 2014
2 parents 18bf9b8 + 5ea31ab commit 2c76f4f
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
16 changes: 8 additions & 8 deletions do_everything.sh
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
#!/bin/bash

my_loc="$(cd "$(dirname $0)" && pwd)"
source $my_loc/config.sh
source $my_loc/utils.sh
if [ $# != 1 || $# != 2 ] || [ $1 == '-h' ] || [ $1 == '--help' ]; then

if [[ $# -lt 1 ]] || [[ "$1" == '-h' ]] || [[ "$1" == '--help' ]]; then
echo "Usage: $0 prefix_path"
echo " example: $0 /home/user/my_workspace"
exit 1
fi

if [ ! -d $1 ]; then
mkdir -p $1
fi

prefix=$(cd $1 && pwd)

run_cmd() {
cmd=$1.sh
shift
$my_loc/$cmd $@ || die "$cmd $@ died with error code $?"
}

if [ -z $ANDROID_NDK ] ; then
die "ANDROID_NDK ENVIRONMENT NOT FOUND!"
fi
Expand Down Expand Up @@ -81,7 +81,7 @@ echo 'summary of what just happened:'
echo ' target/ was used to build static libraries for ros software'
echo ' include/ contains headers'
echo ' lib/ contains static libraries'
echo ' tf2_ndk/ is a NDK sub-project that can be imported into an NDK app'
echo ' roscpp_android_ndk/ is a NDK sub-project that can be imported into an NDK app'
echo ' sample_app/ is an example of such an app, a native activity that uses tf2'
echo
echo 'you might now cd into sample_app/, run "ant debug install", and if an'
Expand Down
32 changes: 16 additions & 16 deletions ndk.rosinstall
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@
uri: https://github.com/ros/roscpp_core
- git:
local-name: ros_comm
uri: https://github.com/chadrockey/ros_comm
uri: https://github.com/VikingX/ros_comm
version: android
- git:
local-name: bond
uri: https://github.com/ros-gbp/bond_core-release.git
version: release/hydro/bond/1.7.13-0
- git:
local-name: bondcpp
uri: https://github.com/chadrockey/bondcpp
uri: https://github.com/VikingX/bondcpp
version: android
- git:
local-name: class_loader
uri: https://github.com/chadrockey/class_loader.git
uri: https://github.com/VikingX/class_loader.git
version: android
- git:
local-name: depthimage_to_laserscan
Expand All @@ -62,27 +62,27 @@
version: release/hydro/std_msgs/0.5.8-0
- git:
local-name: dynamic_reconfigure
uri: https://github.com/chadrockey/dynamic_reconfigure.git
uri: https://github.com/VikingX/dynamic_reconfigure.git
version: android
- git:
local-name: image_geometry
uri: https://github.com/ros-gbp/vision_opencv-release.git
version: release/hydro/image_geometry/1.10.11-0
- git:
local-name: image_transport
uri: https://github.com/chadrockey/image_transport
uri: https://github.com/VikingX/image_transport
version: android
- git:
local-name: nodelet
uri: https://github.com/chadrockey/nodelet_core
uri: https://github.com/VikingX/nodelet_core
version: android
- git:
local-name: pluginlib
uri: https://github.com/chadrockey/pluginlib
uri: https://github.com/VikingX/pluginlib
version: android
- git:
local-name: roslib
uri: https://github.com/chadrockey/roslib
uri: https://github.com/VikingX/roslib
version: master
- git:
local-name: common_msgs
Expand All @@ -94,23 +94,23 @@
version: release/hydro/smclib/1.7.13-0
- git:
local-name: rospack
uri: https://github.com/chadrockey/rospack
uri: https://github.com/VikingX/rospack
version: android
- git:
local-name: geometry_experiemental
uri: https://github.com/chadrockey/geometry_experimental
uri: https://github.com/VikingX/geometry_experimental
version: android_cpp
- git:
local-name: navigation
uri: https://github.com/chadrockey/navigation
uri: https://github.com/VikingX/navigation
version: no_plugins
- git:
local-name: actionlib
uri: https://github.com/tulku/actionlib
uri: https://github.com/VikingX/actionlib
version: android
- git:
local-name: tf
uri: https://github.com/tulku/tf
uri: https://github.com/VikingX/tf
version: android
- git:
local-name: angles
Expand All @@ -125,7 +125,7 @@
version: hydro-devel
- git:
local-name: perception_pcl
uri: https://github.com/chadrockey/perception_pcl
uri: https://github.com/VikingX/perception_pcl
version: android
- git:
local-name: laser_geometry
Expand All @@ -145,15 +145,15 @@
version: hydro-devel
- git:
local-name: diagnostics
uri: https://github.com/chadrockey/diagnostics
uri: https://github.com/VikingX/diagnostics
version: android
- git:
local-name: laser_proc
uri: https://github.com/ros-perception/laser_proc
version: hydro-devel
- git:
local-name: graft
uri: https://github.com/chadrockey/graft
uri: https://github.com/VikingX/graft
version: android-husky
- git:
local-name: nav_goal_manager
Expand Down

0 comments on commit 2c76f4f

Please sign in to comment.