Skip to content
This repository was archived by the owner on Nov 9, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
Changelog
^^^^^^^^^

0.3.0 (2016-12-14)
------------------
* Updates for Kinetic release.

0.2.4 (2015-06-03)
------------------
* bugfix environment hooks for workspaces with spaces.
Expand Down
57 changes: 4 additions & 53 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,58 +1,9 @@
# NEEDS AN INDIGO UPDATE!!!
See [rosjava_core](https://github.com/rosjava/rosjava_core) readme.

Coming soon....ish.
## Moving ##

# RosJava Tools

Build tools for rosjava and android repositories. Currently includes some cmake macros and python creation
scripts.


## RosJava Build Demo


```
> mkdir -p ~/rosjava/src
> cd ~/rosjava/src
> catkin_init_workspace .
> wstool init .
> wstool set rosjava_build_tools --git https://github.com/rosjava/rosjava_build_tools -v hydro-devel
> wstool set rosjava_core --git https://github.com/rosjava/rosjava_core -v hydro-devel
> wstool update
> cd ~/rosjava
> catkin_make
```

The only changes made to the `rosjava_core` repo was to add a `package.xml` with a depends on `rosjava_build_tools` and a
changes to the `CMakeLists.txt` as follows:

```
...
find_package(catkin REQUIRED rosjava_build_tools)

catkin_rosjava_setup()
```

This cmake makro sets up dummy targets in the cmake configuration which call out to gradle in the actual make step.
It also parses the `package.xml` to add target dependencies from each `build_depends` tag (subsequently letting you
sequence builds across repositories).

It also adds a global and package `gradle-clean` target.

```
> catkin_make
# Clean a single gradle package
> cd ~/rosjava/build/rosjava_core
> make gradle-clean-rosjava_core
# Clean all gradle packages
> cd ~/rosjava/build
> make gradle-clean
```
This documentation will eventually merge with the rosjava_core and android_core documentation.

## Android Build Demo
## Usage ##

Refer to http://ros.org/wiki/rosjava_build_tools.

## Moving

This documentation will eventually merge with the rosjava_core and android_core documentation.
4 changes: 2 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<package>
<name>rosjava_build_tools</name>
<version>0.2.4</version>
<version>0.3.0</version>
<description>
Simple tools and catkin modules for rosjava development.
Simple tools and catkin modules for rosjava development.
</description>
<maintainer email="d.stonier@gmail.com">Daniel Stonier</maintainer>
<license>BSD</license>
Expand Down
2 changes: 1 addition & 1 deletion src/rosjava_build_tools/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
def scrape_for_release_message_packages(track):
url = rosdistro.get_index_url()
index = rosdistro.get_index(url)
cache = rosdistro.get_release_cache(index, 'indigo')
cache = rosdistro.get_release_cache(index, 'kinetic')
packages = []
for package_name, package_string in cache.package_xmls.iteritems():
package = catkin_pkg.package.parse_package_string(package_string)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ task wrapper(type: Wrapper) {
}

buildscript {
apply from: "https://github.com/rosjava/android_core/raw/indigo/buildscript.gradle"
apply from: "https://github.com/rosjava/android_core/raw/kinetic/buildscript.gradle"
}

apply plugin: 'catkin'
Expand All @@ -42,11 +42,11 @@ subprojects {
*
* To modify, or add repos to the default external maven repositories list, pull request against this code:
*
* https://github.com/rosjava/rosjava_bootstrap/blob/indigo/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy#L31
* https://github.com/rosjava/rosjava_bootstrap/blob/kinetic/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy#L31
*
* To modify the build tools version, pull request against this code:
*
* https://github.com/rosjava/rosjava_bootstrap/blob/indigo/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosAndroid.groovy#L14
* https://github.com/rosjava/rosjava_bootstrap/blob/kinetic/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosAndroid.groovy#L14
*/
apply plugin: 'ros-android'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ task wrapper(type: Wrapper) {
}

buildscript {
apply from: "https://github.com/rosjava/rosjava_bootstrap/raw/indigo/buildscript.gradle"
apply from: "https://github.com/rosjava/rosjava_bootstrap/raw/kinetic/buildscript.gradle"
}

apply plugin: 'catkin'
Expand All @@ -35,16 +35,16 @@ allprojects {
}

subprojects {
/*
/*
* The ros plugin configures a few things:
*
*
* - local deployment repository : where it dumps the jars and packaged artifacts)
* - local maven repositories : where it finds your locally installed/built artifacts)
* - external maven repositories : where it goes looking if it can't find dependencies locally
*
*
* To modify, or add repos to the default external maven repositories list, pull request against this code:
*
* https://github.com/rosjava/rosjava_bootstrap/blob/indigo/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy#L31
*
* https://github.com/rosjava/rosjava_bootstrap/blob/kinetic/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy#L31
*/
apply plugin: "ros-java"
/*
Expand Down