Skip to content
Snippets Groups Projects
Commit f0a3da89 authored by Daniel Stonier's avatar Daniel Stonier
Browse files

rosjava_tools -> rosjava_build_tools

parent 1fb7c5f7
No related branches found
No related tags found
No related merge requests found
Showing
with 29 additions and 31 deletions
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>rosjava_tools</name>
<name>rosjava_build_tools</name>
<comment></comment>
<projects>
</projects>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?>
<pydev_project>
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/rosjava_tools/src</path>
<path>/rosjava_build_tools/src</path>
</pydev_pathproperty>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
......
......@@ -3,7 +3,7 @@
##############################################################################
cmake_minimum_required(VERSION 2.8.3)
project(rosjava_tools)
project(rosjava_build_tools)
##############################################################################
# Catkin
......@@ -22,12 +22,12 @@ catkin_add_env_hooks(15.rosjava SHELLS bash DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR
# Have to install gradle here so we can retain executable permissions
# If we do via setup.py with the data subsection, it loses permissions
install(
PROGRAMS src/rosjava_tools/gradle/gradlew
PROGRAMS src/rosjava_build_tools/gradle/gradlew
DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}/gradle
)
install(
DIRECTORY src/rosjava_tools/gradle/gradle
DIRECTORY src/rosjava_build_tools/gradle/gradle
DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}/gradle
)
......@@ -12,19 +12,19 @@ scripts.
> cd ~/rosjava/src
> catkin_init_workspace .
> wstool init .
> wstool set rosjava_tools --git https://github.com/ros-java/rosjava_tools -v hydro-devel
> 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_tools` and a
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_tools)
find_package(catkin REQUIRED rosjava_build_tools)
catkin_rosjava_setup()
```
......@@ -47,7 +47,7 @@ It also adds a global and package `gradle-clean` target.
## Android Build Demo
Refer to http://ros.org/wiki/rosjava_tools.
Refer to http://ros.org/wiki/rosjava_build_tools.
## Moving
......
#
# Prerequistes: https://raw.github.com/ros-java/rosjava_tools/hydro-devel/rosjava.rosinstall
# Prerequistes: https://raw.github.com/rosjava/rosjava_build_tools/hydro-devel/rosjava.rosinstall
#
# Take out for now - awful dependencies on create and follower messages
# {'git': {'local-name': 'turtlebot_android', 'version': 'hydro-devel', 'uri':'https://github.com/turtlebot/turtlebot_android'}},
......
#
# Prerequistes: https://raw.github.com/ros-java/rosjava_tools/hydro-devel/rosjava.rosinstall
# Prerequistes: https://raw.github.com/rosjava/rosjava_build_tools/hydro-devel/rosjava.rosinstall
#
[
{'git': {'local-name': 'android_core', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/android_core'}},
......
......@@ -4,7 +4,7 @@
export ROS_MAVEN_PATH=`python @(CMAKE_CURRENT_SOURCE_DIR)/generate_ros_maven_path.py`
export ROS_MAVEN_DEPLOYMENT_PATH=`python @(CMAKE_CURRENT_SOURCE_DIR)/generate_ros_maven_path.py --deployment-repository`
@[else]@
export ROS_MAVEN_PATH=`python @(CMAKE_INSTALL_PREFIX)/share/rosjava_tools/generate_ros_maven_path.py`
export ROS_MAVEN_PATH=`python @(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_ros_maven_path.py`
@[end if]@
<package>
<name>rosjava_tools</name>
<name>rosjava_build_tools</name>
<version>0.1.12</version>
<description>
Simple tools and catkin modules for rosjava development.
</description>
<maintainer email="d.stonier@gmail.com">Daniel Stonier</maintainer>
<license>BSD</license>
<url type="website">http://ros.org/wiki/rosjava_tools</url>
<url type="repository">https://github.com/ros-java/rosjava_tools</url>
<url type="bugtracker">https://github.com/ros-java/rosjava_tools/issues</url>
<url type="website">http://ros.org/wiki/rosjava_build_tools</url>
<url type="repository">https://github.com/ros-java/rosjava_build_tools</url>
<url type="bugtracker">https://github.com/ros-java/rosjava_build_tools/issues</url>
<author email="d.stonier@gmail.com">Daniel Stonier</author>
<buildtool_depend>catkin</buildtool_depend>
......
......@@ -5,7 +5,7 @@
#
# rocon_msgs is currently included since it is still changing reasonably often in source and less so in deb.
[
{'git': {'local-name': 'rosjava_tools', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/rosjava_tools.git'}},
{'git': {'local-name': 'rosjava_build_tools', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/rosjava_build_tools.git'}},
{'git': {'local-name': 'rosjava_core', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/rosjava_core.git'}},
{'git': {'local-name': 'zeroconf_jmdns_suite', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/zeroconf_jmdns_suite.git'}},
{'git': {'local-name': 'rosjava_extras', 'version': 'hydro-devel', 'uri':'https://github.com/rosjava/rosjava_extras.git'}},
......
......@@ -11,8 +11,8 @@ import argparse
import os
import sys
from rosjava_tools import create_android_package
import rosjava_tools.console as console
from rosjava_build_tools import create_android_package
import rosjava_build_tools.console as console
##############################################################################
# Main
......
......@@ -11,8 +11,8 @@ import argparse
import os
import sys
from rosjava_tools import create_android_package
import rosjava_tools.console as console
from rosjava_build_tools import create_android_package
import rosjava_build_tools.console as console
##############################################################################
# Main
......
......@@ -11,8 +11,8 @@ import argparse
import os
import sys
from rosjava_tools import init_android_repo
import rosjava_tools.console as console
from rosjava_build_tools import init_android_repo
import rosjava_build_tools.console as console
##############################################################################
# Main
......
......@@ -4,13 +4,13 @@ from distutils.core import setup
from catkin_pkg.python_setup import generate_distutils_setup
d = generate_distutils_setup(
packages=['rosjava_tools'],
packages=['rosjava_build_tools'],
package_dir={'': 'src'},
scripts=['scripts/catkin_create_android_repo',
'scripts/catkin_create_android_pkg',
'scripts/catkin_create_android_library_pkg'
],
package_data = {'rosjava_tools': [
package_data = {'rosjava_build_tools': [
'templates/android_package/*',
'templates/init_repo/*',
]},
......
#!/usr/bin/env python
#
# License: Apache 2.0
# https://raw.github.com/rosjava/rosjava_tools/license/LICENSE
# https://raw.github.com/rosjava/rosjava_build_tools/license/LICENSE
#
##############################################################################
......
#!/usr/bin/env python
#
# License: Apache 2.0
# https://raw.github.com/rosjava/rosjava_tools/license/LICENSE
# https://raw.github.com/rosjava/rosjava_build_tools/license/LICENSE
#
##############################################################################
......
#!/usr/bin/env python
#
# License: Apache 2.0
# https://raw.github.com/rosjava/rosjava_tools/license/LICENSE
# https://raw.github.com/rosjava/rosjava_build_tools/license/LICENSE
#
##############################################################################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment