-
Notifications
You must be signed in to change notification settings - Fork 318
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add scripts to patch and repackage genjava for ROS noetic * Update README to reflect genjava backport to ROS noetic * Update msgs_jar workflow to run on Ubuntu 20 instead * Update android submodule to latest version --------- Co-authored-by: Ruben Garcia <[email protected]> Co-authored-by: Trey Smith <[email protected]>
- Loading branch information
3 people
authored
Mar 22, 2024
1 parent
6ac552f
commit 11eab6f
Showing
41 changed files
with
837 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| *.build | ||
| *.changes | ||
| *.dsc | ||
| *.tar.xz | ||
| *.tar.gz | ||
| *.deb | ||
| *.ddeb | ||
| *.buildinfo | ||
| ros-noetic-rosjava-build-tools | ||
| ros-noetic-rosjava-bootstrap | ||
| ros-noetic-genjava | ||
| ros-noetic-rosjava-messages |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| ros-noetic-rosjava-bootstrap (0.3.3-1astrobeefocal) focal; urgency=high | ||
|
|
||
| * Add Python3 basic support | ||
|
|
||
| -- Ruben Garcia <[email protected]> Thu, 15 Feb 2024 02:00:00 -0000 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 9 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| Source: ros-noetic-rosjava-bootstrap | ||
| Section: misc | ||
| Priority: extra | ||
| Maintainer: Ruben Garcia <[email protected]> | ||
| Build-Depends: debhelper (>= 9.0.0), ros-noetic-catkin, ros-noetic-rosjava-build-tools | ||
| Homepage: http://ros.org/wiki/rosjava_bootstrap | ||
| Standards-Version: 3.9.2 | ||
|
|
||
| Package: ros-noetic-rosjava-bootstrap | ||
| Architecture: any | ||
| Depends: ${shlibs:Depends}, ${misc:Depends}, ros-noetic-rosjava-build-tools | ||
| Description: Bootstrap utilities for rosjava builds. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| #!/usr/bin/make -f | ||
| # -*- makefile -*- | ||
| # Sample debian/rules that uses debhelper. | ||
| # This file was originally written by Joey Hess and Craig Small. | ||
| # As a special exception, when this file is copied by dh-make into a | ||
| # dh-make output file, you may use that output file without restriction. | ||
| # This special exception was added by Craig Small in version 0.37 of dh-make. | ||
|
|
||
| # Uncomment this to turn on verbose mode. | ||
| export DH_VERBOSE=1 | ||
| # TODO: remove the LDFLAGS override. It's here to avoid esoteric problems | ||
| # of this sort: | ||
| # https://code.ros.org/trac/ros/ticket/2977 | ||
| # https://code.ros.org/trac/ros/ticket/3842 | ||
| export LDFLAGS= | ||
| export PKG_CONFIG_PATH=/opt/ros/noetic/lib/pkgconfig | ||
| # Explicitly enable -DNDEBUG, see: | ||
| # https://github.com/ros-infrastructure/bloom/issues/327 | ||
| export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG | ||
|
|
||
| %: | ||
| dh $@ -v --buildsystem=cmake | ||
|
|
||
| override_dh_auto_configure: | ||
| # In case we're installing to a non-standard location, look for a setup.sh | ||
| # in the install tree that was dropped by catkin, and source it. It will | ||
| # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. | ||
| if [ -f "/opt/ros/noetic/setup.sh" ]; then . "/opt/ros/noetic/setup.sh"; fi && \ | ||
| dh_auto_configure -- \ | ||
| -DCATKIN_BUILD_BINARY_PACKAGE="1" \ | ||
| -DCMAKE_INSTALL_PREFIX="/opt/ros/noetic" \ | ||
| -DCMAKE_PREFIX_PATH="/opt/ros/noetic" | ||
|
|
||
| override_dh_auto_build: | ||
| # In case we're installing to a non-standard location, look for a setup.sh | ||
| # in the install tree that was dropped by catkin, and source it. It will | ||
| # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. | ||
| if [ -f "/opt/ros/noetic/setup.sh" ]; then . "/opt/ros/noetic/setup.sh"; fi && \ | ||
| dh_auto_build | ||
|
|
||
| override_dh_auto_test: | ||
| # In case we're installing to a non-standard location, look for a setup.sh | ||
| # in the install tree that was dropped by catkin, and source it. It will | ||
| # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. | ||
| echo -- Running tests. Even if one of them fails the build is not canceled. | ||
| if [ -f "/opt/ros/noetic/setup.sh" ]; then . "/opt/ros/noetic/setup.sh"; fi && \ | ||
| dh_auto_test || true | ||
|
|
||
| override_dh_shlibdeps: | ||
| # In case we're installing to a non-standard location, look for a setup.sh | ||
| # in the install tree that was dropped by catkin, and source it. It will | ||
| # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. | ||
| if [ -f "/opt/ros/noetic/setup.sh" ]; then . "/opt/ros/noetic/setup.sh"; fi && \ | ||
| dh_shlibdeps -l$(CURDIR)/debian/ros-noetic-rosjava-bootstrap//opt/ros/noetic/lib/ | ||
|
|
||
| override_dh_auto_install: | ||
| # In case we're installing to a non-standard location, look for a setup.sh | ||
| # in the install tree that was dropped by catkin, and source it. It will | ||
| # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. | ||
| if [ -f "/opt/ros/noetic/setup.sh" ]; then . "/opt/ros/noetic/setup.sh"; fi && \ | ||
| dh_auto_install |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 3.0 (quilt) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # Automatically add upstream changes to the quilt overlay. | ||
| # http://manpages.ubuntu.com/manpages/trusty/man1/dpkg-source.1.html | ||
| # This supports reusing the orig.tar.gz for debian increments. | ||
| auto-commit | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| ros-noetic-rosjava-build-tools (0.3.3-1astrobeefocal) focal; urgency=high | ||
|
|
||
| * Add Python3 basic support | ||
|
|
||
| -- Ruben Garcia <[email protected]> Thu, 15 Feb 2024 02:00:00 -0000 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 9 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| Source: ros-noetic-rosjava-build-tools | ||
| Section: misc | ||
| Priority: extra | ||
| Maintainer: Ruben Garcia <[email protected]> | ||
| Build-Depends: debhelper (>= 9.0.0), ant, openjdk-8-jdk, ros-noetic-catkin | ||
| Homepage: http://ros.org/wiki/rosjava_build_tools | ||
| Standards-Version: 3.9.2 | ||
|
|
||
| Package: ros-noetic-rosjava-build-tools | ||
| Architecture: any | ||
| Depends: ${shlibs:Depends}, ${misc:Depends}, ant, openjdk-8-jdk, ros-noetic-catkin | ||
| Description: Simple tools and catkin modules for rosjava development. |
121 changes: 121 additions & 0 deletions
121
scripts/setup/debians/rosjava/build-tools/patches/python3_compat.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| Index: ros-noetic-rosjava-build-tools/src/rosjava_build_tools/__init__.py | ||
| =================================================================== | ||
| --- ros-noetic-rosjava-build-tools.orig/src/rosjava_build_tools/__init__.py | ||
| +++ ros-noetic-rosjava-build-tools/src/rosjava_build_tools/__init__.py | ||
| @@ -4,10 +4,11 @@ | ||
| # Imports | ||
| ############################################################################## | ||
|
|
||
| -import console | ||
| -from create_package import init_android_package, init_rosjava_package | ||
| -from create_android_project import create_android_project | ||
| -from create_rosjava_project import create_rosjava_project, create_rosjava_msg_project, create_rosjava_library_project | ||
| -from utils import which | ||
| -from release import scrape_for_release_message_packages | ||
| -import catkin | ||
| +from rosjava_build_tools import console | ||
| +from rosjava_build_tools.create_package import init_android_package, init_rosjava_package | ||
| +from rosjava_build_tools.create_android_project import create_android_project | ||
| +from rosjava_build_tools.create_rosjava_project import create_rosjava_project, create_rosjava_msg_project, create_rosjava_library_project | ||
| +from rosjava_build_tools.utils import which | ||
| +from rosjava_build_tools.release import scrape_for_release_message_packages | ||
| +from rosjava_build_tools import catkin | ||
| + | ||
| Index: ros-noetic-rosjava-build-tools/src/rosjava_build_tools/create_android_project.py | ||
| =================================================================== | ||
| --- ros-noetic-rosjava-build-tools.orig/src/rosjava_build_tools/create_android_project.py | ||
| +++ ros-noetic-rosjava-build-tools/src/rosjava_build_tools/create_android_project.py | ||
| @@ -11,11 +11,10 @@ import sys | ||
| import argparse | ||
| import subprocess | ||
| import shutil | ||
| -import exceptions | ||
|
|
||
| # local imports | ||
| -import utils | ||
| -import console | ||
| +from rosjava_build_tools import utils | ||
| +from rosjava_build_tools import console | ||
|
|
||
| ############################################################################## | ||
| # Methods | ||
| @@ -72,9 +71,9 @@ def actually_create_android_project(pack | ||
| except subprocess.CalledProcessError: | ||
| print("Error") | ||
| raise subprocess.CalledProcessError("failed to create android project.") | ||
| - except exceptions.OSError as e: | ||
| + except OSError as e: | ||
| print("OS error" + str(e)) | ||
| - raise exceptions.OSError() | ||
| + raise OSError() | ||
|
|
||
| # This is in the old form, let's shovel the shit around to the new form | ||
| utils.mkdir_p(os.path.join(path, 'src', 'main', 'java')) | ||
| Index: ros-noetic-rosjava-build-tools/src/rosjava_build_tools/create_package.py | ||
| =================================================================== | ||
| --- ros-noetic-rosjava-build-tools.orig/src/rosjava_build_tools/create_package.py | ||
| +++ ros-noetic-rosjava-build-tools/src/rosjava_build_tools/create_package.py | ||
| @@ -12,8 +12,8 @@ import catkin_pkg | ||
| from catkin_pkg.package_templates import create_package_xml, PackageTemplate | ||
|
|
||
| # local imports | ||
| -import utils | ||
| -import console | ||
| +from rosjava_build_tools import utils | ||
| +from rosjava_build_tools import console | ||
|
|
||
| ############################################################################## | ||
| # Methods | ||
| Index: ros-noetic-rosjava-build-tools/src/rosjava_build_tools/create_rosjava_project.py | ||
| =================================================================== | ||
| --- ros-noetic-rosjava-build-tools.orig/src/rosjava_build_tools/create_rosjava_project.py | ||
| +++ ros-noetic-rosjava-build-tools/src/rosjava_build_tools/create_rosjava_project.py | ||
| @@ -13,8 +13,8 @@ import argparse | ||
| import xml.etree.ElementTree as ElementTree | ||
|
|
||
| # local imports | ||
| -import utils | ||
| -import console | ||
| +from rosjava_build_tools import utils | ||
| +from rosjava_build_tools import console | ||
|
|
||
| ############################################################################## | ||
| # Methods | ||
| Index: ros-noetic-rosjava-build-tools/src/rosjava_build_tools/release.py | ||
| =================================================================== | ||
| --- ros-noetic-rosjava-build-tools.orig/src/rosjava_build_tools/release.py | ||
| +++ ros-noetic-rosjava-build-tools/src/rosjava_build_tools/release.py | ||
| @@ -6,7 +6,7 @@ | ||
|
|
||
| import rosdistro | ||
| import catkin_pkg | ||
| -from . import catkin | ||
| +from rosjava_build_tools import catkin | ||
|
|
||
| ############################################################################## | ||
| # Imports | ||
| @@ -16,9 +16,9 @@ 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, 'kinetic') | ||
| + cache = rosdistro.get_release_cache(index, 'noetic') | ||
| packages = [] | ||
| - for package_name, package_string in cache.package_xmls.iteritems(): | ||
| + for package_name, package_string in cache.package_xmls.items(): | ||
| package = catkin_pkg.package.parse_package_string(package_string) | ||
| #print(" Name: %s" % package_name) | ||
| #print(" Buildtool Depends %s" % package.build) | ||
| Index: ros-noetic-rosjava-build-tools/src/rosjava_build_tools/utils.py | ||
| =================================================================== | ||
| --- ros-noetic-rosjava-build-tools.orig/src/rosjava_build_tools/utils.py | ||
| +++ ros-noetic-rosjava-build-tools/src/rosjava_build_tools/utils.py | ||
| @@ -8,7 +8,7 @@ import os | ||
| import sys | ||
| import errno | ||
| import pwd | ||
| -import console | ||
| +from rosjava_build_tools import console | ||
|
|
||
| ############################################################################## | ||
| # Methods |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| python3_compat.patch |
Oops, something went wrong.