diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f750028dceee378ea1aa07f4891d28f1475ca025..fc0f4658dfcfd4f46cbeb73da17364ab50755e3b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -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. diff --git a/README.md b/README.md index 3c36a245b09e1e7c882982366c9316c3ac66b75f..07a3ee86b745a94cb08cd280d80ec3c442b8aa46 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/package.xml b/package.xml index cdbfc9365ba659adae8de41d488aa522869f662d..811a7a229efecc620ee2682849ce95e1fccaf969 100644 --- a/package.xml +++ b/package.xml @@ -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> diff --git a/src/rosjava_build_tools/release.py b/src/rosjava_build_tools/release.py index d6ccba6a55b94cc3aeab160d377c8eb431fe7ac2..8b4435cd4b411b0ff6f7f0cb6581ce13bc1d10d6 100644 --- a/src/rosjava_build_tools/release.py +++ b/src/rosjava_build_tools/release.py @@ -16,7 +16,7 @@ from . import catkin 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) diff --git a/src/rosjava_build_tools/templates/android_package/build.gradle.in b/src/rosjava_build_tools/templates/android_package/build.gradle.in index a7d6e513bf78b4cad7ad123a25eae876926dae00..951a6d4c79d0be14ee9aae8000ec1cdf45d4cd90 100644 --- a/src/rosjava_build_tools/templates/android_package/build.gradle.in +++ b/src/rosjava_build_tools/templates/android_package/build.gradle.in @@ -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' @@ -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' diff --git a/src/rosjava_build_tools/templates/rosjava_package/build.gradle.in b/src/rosjava_build_tools/templates/rosjava_package/build.gradle.in index 63456295454dadac20f2c8754e17d861e10d846a..9e3a6d85b8018d9112e180fa0a2f9ce6f7310fbb 100644 --- a/src/rosjava_build_tools/templates/rosjava_package/build.gradle.in +++ b/src/rosjava_build_tools/templates/rosjava_package/build.gradle.in @@ -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' @@ -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" /*