Skip to content
This repository was archived by the owner on Nov 9, 2022. It is now read-only.

Commit 662c622

Browse files
authored
Merge pull request #26 from adamantivm/kinetic-update
Bump version and replace readme file
2 parents a6522a4 + 81b5b49 commit 662c622

File tree

6 files changed

+20
-65
lines changed

6 files changed

+20
-65
lines changed

CHANGELOG.rst

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Changelog
33
^^^^^^^^^
44

5+
0.3.0 (2016-12-14)
6+
------------------
7+
* Updates for Kinetic release.
8+
59
0.2.4 (2015-06-03)
610
------------------
711
* bugfix environment hooks for workspaces with spaces.

README.md

+4-53
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,9 @@
1-
# NEEDS AN INDIGO UPDATE!!!
1+
See [rosjava_core](https://github.com/rosjava/rosjava_core) readme.
22

3-
Coming soon....ish.
3+
## Moving ##
44

5-
# RosJava Tools
6-
7-
Build tools for rosjava and android repositories. Currently includes some cmake macros and python creation
8-
scripts.
9-
10-
11-
## RosJava Build Demo
12-
13-
14-
```
15-
> mkdir -p ~/rosjava/src
16-
> cd ~/rosjava/src
17-
> catkin_init_workspace .
18-
> wstool init .
19-
> wstool set rosjava_build_tools --git https://github.com/rosjava/rosjava_build_tools -v hydro-devel
20-
> wstool set rosjava_core --git https://github.com/rosjava/rosjava_core -v hydro-devel
21-
> wstool update
22-
> cd ~/rosjava
23-
> catkin_make
24-
```
25-
26-
The only changes made to the `rosjava_core` repo was to add a `package.xml` with a depends on `rosjava_build_tools` and a
27-
changes to the `CMakeLists.txt` as follows:
28-
29-
```
30-
...
31-
find_package(catkin REQUIRED rosjava_build_tools)
32-
33-
catkin_rosjava_setup()
34-
```
35-
36-
This cmake makro sets up dummy targets in the cmake configuration which call out to gradle in the actual make step.
37-
It also parses the `package.xml` to add target dependencies from each `build_depends` tag (subsequently letting you
38-
sequence builds across repositories).
39-
40-
It also adds a global and package `gradle-clean` target.
41-
42-
```
43-
> catkin_make
44-
# Clean a single gradle package
45-
> cd ~/rosjava/build/rosjava_core
46-
> make gradle-clean-rosjava_core
47-
# Clean all gradle packages
48-
> cd ~/rosjava/build
49-
> make gradle-clean
50-
```
5+
This documentation will eventually merge with the rosjava_core and android_core documentation.
516

52-
## Android Build Demo
7+
## Usage ##
538

549
Refer to http://ros.org/wiki/rosjava_build_tools.
55-
56-
## Moving
57-
58-
This documentation will eventually merge with the rosjava_core and android_core documentation.

package.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<package>
22
<name>rosjava_build_tools</name>
3-
<version>0.2.4</version>
3+
<version>0.3.0</version>
44
<description>
5-
Simple tools and catkin modules for rosjava development.
5+
Simple tools and catkin modules for rosjava development.
66
</description>
77
<maintainer email="[email protected]">Daniel Stonier</maintainer>
88
<license>BSD</license>

src/rosjava_build_tools/release.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
def scrape_for_release_message_packages(track):
1717
url = rosdistro.get_index_url()
1818
index = rosdistro.get_index(url)
19-
cache = rosdistro.get_release_cache(index, 'indigo')
19+
cache = rosdistro.get_release_cache(index, 'kinetic')
2020
packages = []
2121
for package_name, package_string in cache.package_xmls.iteritems():
2222
package = catkin_pkg.package.parse_package_string(package_string)

src/rosjava_build_tools/templates/android_package/build.gradle.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ task wrapper(type: Wrapper) {
1919
}
2020

2121
buildscript {
22-
apply from: "https://github.com/rosjava/android_core/raw/indigo/buildscript.gradle"
22+
apply from: "https://github.com/rosjava/android_core/raw/kinetic/buildscript.gradle"
2323
}
2424

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

src/rosjava_build_tools/templates/rosjava_package/build.gradle.in

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ task wrapper(type: Wrapper) {
1919
}
2020

2121
buildscript {
22-
apply from: "https://github.com/rosjava/rosjava_bootstrap/raw/indigo/buildscript.gradle"
22+
apply from: "https://github.com/rosjava/rosjava_bootstrap/raw/kinetic/buildscript.gradle"
2323
}
2424

2525
apply plugin: 'catkin'
@@ -35,16 +35,16 @@ allprojects {
3535
}
3636

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

0 commit comments

Comments
 (0)