Skip to content

Commit f0a3da8

Browse files
stonierstonier
committed
rosjava_tools -> rosjava_build_tools
1 parent 1fb7c5f commit f0a3da8

26 files changed

+34
-36
lines changed

‎.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>rosjava_tools</name>
3+
<name>rosjava_build_tools</name>
44
<comment></comment>
55
<projects>
66
</projects>

‎.pydevproject

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<?eclipse-pydev version="1.0"?>
3-
4-
<pydev_project>
2+
<?eclipse-pydev version="1.0"?><pydev_project>
53
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
6-
<path>/rosjava_tools/src</path>
4+
<path>/rosjava_build_tools/src</path>
75
</pydev_pathproperty>
86
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
97
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>

‎CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
##############################################################################
44

55
cmake_minimum_required(VERSION 2.8.3)
6-
project(rosjava_tools)
6+
project(rosjava_build_tools)
77

88
##############################################################################
99
# Catkin
@@ -22,12 +22,12 @@ catkin_add_env_hooks(15.rosjava SHELLS bash DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR
2222
# Have to install gradle here so we can retain executable permissions
2323
# If we do via setup.py with the data subsection, it loses permissions
2424
install(
25-
PROGRAMS src/rosjava_tools/gradle/gradlew
25+
PROGRAMS src/rosjava_build_tools/gradle/gradlew
2626
DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}/gradle
2727
)
2828

2929
install(
30-
DIRECTORY src/rosjava_tools/gradle/gradle
30+
DIRECTORY src/rosjava_build_tools/gradle/gradle
3131
DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}/gradle
3232
)
3333

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ scripts.
1212
> cd ~/rosjava/src
1313
> catkin_init_workspace .
1414
> wstool init .
15-
> wstool set rosjava_tools --git https://github.com/ros-java/rosjava_tools -v hydro-devel
15+
> wstool set rosjava_build_tools --git https://github.com/rosjava/rosjava_build_tools -v hydro-devel
1616
> wstool set rosjava_core --git https://github.com/rosjava/rosjava_core -v hydro-devel
1717
> wstool update
1818
> cd ~/rosjava
1919
> catkin_make
2020
```
2121

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

2525
```
2626
...
27-
find_package(catkin REQUIRED rosjava_tools)
27+
find_package(catkin REQUIRED rosjava_build_tools)
2828
2929
catkin_rosjava_setup()
3030
```
@@ -47,7 +47,7 @@ It also adds a global and package `gradle-clean` target.
4747

4848
## Android Build Demo
4949

50-
Refer to http://ros.org/wiki/rosjava_tools.
50+
Refer to http://ros.org/wiki/rosjava_build_tools.
5151

5252
## Moving
5353

‎android_apps.rosinstall

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Prerequistes: https://raw.github.com/ros-java/rosjava_tools/hydro-devel/rosjava.rosinstall
2+
# Prerequistes: https://raw.github.com/rosjava/rosjava_build_tools/hydro-devel/rosjava.rosinstall
33
#
44
# Take out for now - awful dependencies on create and follower messages
55
# {'git': {'local-name': 'turtlebot_android', 'version': 'hydro-devel', 'uri':'https://github.com/turtlebot/turtlebot_android'}},

‎android_core.rosinstall

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Prerequistes: https://raw.github.com/ros-java/rosjava_tools/hydro-devel/rosjava.rosinstall
2+
# Prerequistes: https://raw.github.com/rosjava/rosjava_build_tools/hydro-devel/rosjava.rosinstall
33
#
44
[
55
{'git': {'local-name': 'android_core', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/android_core'}},

‎env-hooks/15.rosjava.bash.em

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
export ROS_MAVEN_PATH=`python @(CMAKE_CURRENT_SOURCE_DIR)/generate_ros_maven_path.py`
55
export ROS_MAVEN_DEPLOYMENT_PATH=`python @(CMAKE_CURRENT_SOURCE_DIR)/generate_ros_maven_path.py --deployment-repository`
66
@[else]@
7-
export ROS_MAVEN_PATH=`python @(CMAKE_INSTALL_PREFIX)/share/rosjava_tools/generate_ros_maven_path.py`
7+
export ROS_MAVEN_PATH=`python @(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_ros_maven_path.py`
88
@[end if]@
99

1010

‎package.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<package>
2-
<name>rosjava_tools</name>
2+
<name>rosjava_build_tools</name>
33
<version>0.1.12</version>
44
<description>
55
Simple tools and catkin modules for rosjava development.
66
</description>
77
<maintainer email="[email protected]">Daniel Stonier</maintainer>
88
<license>BSD</license>
9-
<url type="website">http://ros.org/wiki/rosjava_tools</url>
10-
<url type="repository">https://github.com/ros-java/rosjava_tools</url>
11-
<url type="bugtracker">https://github.com/ros-java/rosjava_tools/issues</url>
9+
<url type="website">http://ros.org/wiki/rosjava_build_tools</url>
10+
<url type="repository">https://github.com/ros-java/rosjava_build_tools</url>
11+
<url type="bugtracker">https://github.com/ros-java/rosjava_build_tools/issues</url>
1212
<author email="[email protected]">Daniel Stonier</author>
1313

1414
<buildtool_depend>catkin</buildtool_depend>

‎rosjava.rosinstall

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# rocon_msgs is currently included since it is still changing reasonably often in source and less so in deb.
77
[
8-
{'git': {'local-name': 'rosjava_tools', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/rosjava_tools.git'}},
8+
{'git': {'local-name': 'rosjava_build_tools', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/rosjava_build_tools.git'}},
99
{'git': {'local-name': 'rosjava_core', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/rosjava_core.git'}},
1010
{'git': {'local-name': 'zeroconf_jmdns_suite', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/zeroconf_jmdns_suite.git'}},
1111
{'git': {'local-name': 'rosjava_extras', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/rosjava_extras.git'}},

‎scripts/catkin_create_android_library_pkg

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import argparse
1111
import os
1212
import sys
1313

14-
from rosjava_tools import create_android_package
15-
import rosjava_tools.console as console
14+
from rosjava_build_tools import create_android_package
15+
import rosjava_build_tools.console as console
1616

1717
##############################################################################
1818
# Main

‎scripts/catkin_create_android_pkg

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import argparse
1111
import os
1212
import sys
1313

14-
from rosjava_tools import create_android_package
15-
import rosjava_tools.console as console
14+
from rosjava_build_tools import create_android_package
15+
import rosjava_build_tools.console as console
1616

1717
##############################################################################
1818
# Main

‎scripts/catkin_create_android_repo

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import argparse
1111
import os
1212
import sys
1313

14-
from rosjava_tools import init_android_repo
15-
import rosjava_tools.console as console
14+
from rosjava_build_tools import init_android_repo
15+
import rosjava_build_tools.console as console
1616

1717
##############################################################################
1818
# Main

‎setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
from catkin_pkg.python_setup import generate_distutils_setup
55

66
d = generate_distutils_setup(
7-
packages=['rosjava_tools'],
7+
packages=['rosjava_build_tools'],
88
package_dir={'': 'src'},
99
scripts=['scripts/catkin_create_android_repo',
1010
'scripts/catkin_create_android_pkg',
1111
'scripts/catkin_create_android_library_pkg'
1212
],
13-
package_data = {'rosjava_tools': [
13+
package_data = {'rosjava_build_tools': [
1414
'templates/android_package/*',
1515
'templates/init_repo/*',
1616
]},

‎src/rosjava_tools/__init__.py renamed to ‎src/rosjava_build_tools/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
#
33
# License: Apache 2.0
4-
# https://raw.github.com/rosjava/rosjava_tools/license/LICENSE
4+
# https://raw.github.com/rosjava/rosjava_build_tools/license/LICENSE
55
#
66

77
##############################################################################

‎src/rosjava_tools/console.py renamed to ‎src/rosjava_build_tools/console.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
#
33
# License: Apache 2.0
4-
# https://raw.github.com/rosjava/rosjava_tools/license/LICENSE
4+
# https://raw.github.com/rosjava/rosjava_build_tools/license/LICENSE
55
#
66

77
##############################################################################

‎src/rosjava_tools/create_package.py renamed to ‎src/rosjava_build_tools/create_package.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
#
33
# License: Apache 2.0
4-
# https://raw.github.com/rosjava/rosjava_tools/license/LICENSE
4+
# https://raw.github.com/rosjava/rosjava_build_tools/license/LICENSE
55
#
66

77
##############################################################################

‎src/rosjava_tools/gradle/Readme.md renamed to ‎src/rosjava_build_tools/gradle/Readme.md

File renamed without changes.

‎src/rosjava_tools/gradle/gradle/wrapper/gradle-wrapper.jar renamed to ‎src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.jar

File renamed without changes.

‎src/rosjava_tools/gradle/gradle/wrapper/gradle-wrapper.properties renamed to ‎src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.properties

File renamed without changes.

‎src/rosjava_tools/gradle/gradlew renamed to ‎src/rosjava_build_tools/gradle/gradlew

File renamed without changes.

‎src/rosjava_tools/init_repo.py renamed to ‎src/rosjava_build_tools/init_repo.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
#
33
# License: Apache 2.0
4-
# https://raw.github.com/rosjava/rosjava_tools/license/LICENSE
4+
# https://raw.github.com/rosjava/rosjava_build_tools/license/LICENSE
55
#
66

77
##############################################################################
@@ -120,8 +120,8 @@ def create_catkin_package_files(package_name, package_path, args):
120120
'''
121121
try:
122122
build_depends = []
123-
if 'rosjava_tools' not in args.dependencies:
124-
build_depends.append(catkin_pkg.package.Dependency('rosjava_tools'))
123+
if 'rosjava_build_tools' not in args.dependencies:
124+
build_depends.append(catkin_pkg.package.Dependency('rosjava_build_tools'))
125125
for depend_name in args.dependencies:
126126
build_depends.append(catkin_pkg.package.Dependency(depend_name))
127127
package_template = PackageTemplate._create_package_template(

‎src/rosjava_tools/templates/android_package/build.gradle.in renamed to ‎src/rosjava_build_tools/templates/android_package/build.gradle.in

File renamed without changes.

‎src/rosjava_tools/templates/init_repo/CMakeLists.txt.in renamed to ‎src/rosjava_build_tools/templates/init_repo/CMakeLists.txt.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ project(%(repo_name)s)
99
# Catkin
1010
##############################################################################
1111

12-
find_package(catkin REQUIRED rosjava_tools)
12+
find_package(catkin REQUIRED rosjava_build_tools)
1313
catkin_android_setup()
1414
catkin_package()

‎src/rosjava_tools/templates/init_repo/build.gradle.in renamed to ‎src/rosjava_build_tools/templates/init_repo/build.gradle.in

File renamed without changes.

‎src/rosjava_tools/templates/init_repo/settings.gradle renamed to ‎src/rosjava_build_tools/templates/init_repo/settings.gradle

File renamed without changes.

‎src/rosjava_tools/utils.py renamed to ‎src/rosjava_build_tools/utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
#
33
# License: Apache 2.0
4-
# https://raw.github.com/rosjava/rosjava_tools/license/LICENSE
4+
# https://raw.github.com/rosjava/rosjava_build_tools/license/LICENSE
55
#
66

77
##############################################################################

0 commit comments

Comments
 (0)