Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5ab4ba7
Adding changelog for original release feature/BB-772
purplefishies Jan 7, 2020
af88782
Fix Changelog includes log and commit messages feature/BB-772
purplefishies Jan 7, 2020
c7a8e40
changelog and build fixes for building debian package feature/BB-772
purplefishies Jan 7, 2020
e2b5953
experimenting with new make @local feature/BB-772
purplefishies Jan 7, 2020
0af9475
Fixing build (again) feature/BB-772
purplefishies Jan 7, 2020
f7fb58a
Trying custom action feature/BB-772
purplefishies Jan 7, 2020
6432cff
trying additional vm feature/BB-772
purplefishies Jan 7, 2020
fec1145
new docker syntax feature/BB-772
purplefishies Jan 7, 2020
35ed63e
Merge branch 'feature/BB-772' of https://github.com/AutoModality/am-u…
Jan 7, 2020
d49936f
assigned the make to use the docker image feature/BB-772
Jan 7, 2020
140abc2
cannot have both uses and runs feature/BB-772
Jan 7, 2020
458a9fd
went back to using the make. Updated the docker file to reference am…
Jan 7, 2020
cebb702
using trial until auth is figured out feature/BB-772
Jan 7, 2020
d032fbb
using just package feature/BB-772
Jan 7, 2020
b7e095b
Fixed over intall of catkin_tools_prebuild feature/BB-772
purplefishies Jan 7, 2020
19b959d
Using latest master branch feature/BB-772
purplefishies Jan 10, 2020
f2af95a
Fixe for version of story feature/BB-772 feature/BB-772
purplefishies Jan 10, 2020
f1e0fbe
Added ignore file feature/BB-772 feature/BB-772
purplefishies Jan 10, 2020
e30c2b4
added docs
Jan 13, 2020
f9bd8de
Merge branch 'feature/BB-772' of https://github.com/AutoModality/am-u…
Jan 13, 2020
a3f39f1
building with amros dockerfile package BB-790/dockerfile-package
Jan 13, 2020
a633795
updated to released version BB-790/dockerfile-package
Jan 13, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
token: ${{secrets.github_token}}
- name: Package
id: package
uses: AutoModality/action-package-debian-ros@v1.1.0
uses: AutoModality/action-package-debian-ros@v1.1.1
with:
branch: ${{ github.event.pull_request.head.ref }}
pull-request-number: ${{ github.event.number }}
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@ jobs:
with:
semantic_version: 15.14.0
extra_plugins: |
@semantic-release/git
@semantic-release/changelog@3.0.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Package
if: steps.semantic.outputs.new_release_published == 'true'
id: package
uses: AutoModality/action-package-debian-ros@v1.1.0
uses: AutoModality/action-package-debian-ros@v1.1.1
with:
version: ${{ steps.semantic.outputs.new_release_version }}
- name: The generated package
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/story.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ jobs:
runs-on: ubuntu-16.04
steps:
- uses: actions/checkout@v1
- name: make
uses: AutoModality/action-make-ros@v1.0.0
- name: Package
uses: AutoModality/action-package-debian-ros@v1.1.1


39 changes: 39 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Prerequisites
*.d

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app


catkin_ws
debian/ros-kinetic-*.debhelper.log
debian/ros-kinetic-am-utils*
debian/debhelper-build-stamp
debian/source
74 changes: 74 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
v1.0.1 (2020-01-06)
------------
- Adding changelog for original release feature/BB-772. [Jimi Damon]


v1.0.0 (2020-01-05)
-------------------
- Merge pull request #3 from AutoModality/feature/BB-772. [Aaron Roller]

realease config needed to avoid node dependency feature/BB-772
- Realease config needed to avoid node dependency feature/BB-772. [Aaron
Roller]
- Merge pull request #1 from AutoModality/feature/BB-772. [Aaron Roller]

BB-772 Added Github Actions Make, Package, Release
- Feat: added Actions following the standard release process
feature/BB-772. [Aaron Roller]
- Added package and release feature/BB-772. [Aaron Roller]
- Fixing regex feature/BB-772. [Jimi Damon]
- Adding this branch feature/BB-772. [Jimi Damon]
- Adding story workflow feature/BB-772. [Jimi Damon]
- Removing build.yml feature/BB-772. [Jimi Damon]
- Trying out build using @arollers build feature/BB-772. [Jimi Damon]
- Still Trying out fixes with build.yml feature/BB-772. [Jimi Damon]
- Still Trying out fixes with build.yml feature/BB-772. [Jimi Damon]
- Still Trying out fixes with build.yml feature/BB-772. [Jimi Damon]
- Trying out fixes with build.yml feature/BB-772. [Jimi Damon]
- Adding github workflow feature/BB-772. [Jimi Damon]
- Debian information for packages feature/BB-772. [Jimi Damon]
- Ground removal. [Unknown]


demo_2019_02_25 (2019-02-09)
-----------------

New
~~~
- New Delay statistics message and online statistics algorithms
calculations. [Jimi Damon]

- allows mean and variance to be calculated incrementally when new data points come in
- we can keep a sliding window of number of points to use for our mean and var calculations
- resolved merge conflicts with taos checkin

TMP
- Add CAN socket. [Tao Wang]

Other
~~~~~
- New topics for dji_sdk gimbal. [Unknown]
- Correct dji_sdk topics. [dan hennage]
- More vision topic fixes. [dan hennage]
- Fixed the naming bug in sensor camera topics. [dan hennage]
- Successfull build. [ubuntu]
- More dji_vision related topics and services. [ubuntu]
- Topics for dji vision. [ubuntu]
- Topic for Battery_state. [ubuntu]
- Distance/agl_lw. [dan hennage]
- Added ouster topics. [dan hennage]
- Add LED blink topic. [ubuntu]
- Added topics. [dan hennage]
- Set addr.can_family before ioctl. [Jimi Damon]
- Release CAN key when read fail. [dan hennage]
- :sparkles: Fixes for creating an installable library. [Jimi Damon]
- More user friendly message that includes stddev instead of variance.
[Jimi Damon]
- Revise the header macro for CAN socket. [Tao Wang]
- Added topics. [dan hennage]
- Latency_wrapper.h bug fix. [ubuntu]
- Fix on latency_wrapper. [ubuntu]
- Added sc1 topics. [dan hennage]
- Changed to strings. [dan hennage]


5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ find_package(catkin REQUIRED COMPONENTS
nav_msgs
genmsg
std_msgs
sensor_msgs)
sensor_msgs
rosconsole
rostime
)

add_message_files(
DIRECTORY msg
Expand Down
18 changes: 18 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
SHELL := /bin/bash

default:
source /opt/ros/kinetic/setup.bash && cd catkin_ws && catkin clean -f -i -y && catkin build -j3
rm -f catkin_ws/install/lib/pkgconfig/catkin_tools_prebuild.pc
@echo "Built!!!!"

install:
rm -rf catkin_ws/install/share/catkin_tools_prebuild
install -d $(DESTDIR)/opt/ros/kinetic/
cp -f -p -r catkin_ws/install/lib $(DESTDIR)/opt/ros/kinetic
cp -f -p -r catkin_ws/install/share $(DESTDIR)/opt/ros/kinetic
cp -f -p -r catkin_ws/install/include $(DESTDIR)/opt/ros/kinetic


clean:
@echo "Cleaning"
rm -rf catkin_ws
24 changes: 24 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,30 @@ A common library for sharing core code.
| [![Release](https://github.com/AutoModality/am-utils/workflows/Release/badge.svg)](https://github.com/AutoModality/am-utils/actions?query=workflow%3A%22Release) | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/badges/version/automodality/release/deb/ros-kinetic-am-utils/latest/d=ubuntu%252Fxenial;t=1/?render=true&badge_token=gAAAAABeEYCXaXnvhWBdS0An17OCBntPch8LyCzJnPoQYMA4Ng8uIJnw2hvwdvv_NBqAOTu76_FBfvns72pfHrzV2xWoBFEvGA-hns2hV-4yu2BmqWtHCT0%3D)](https://cloudsmith.io/~automodality/repos/release/packages/detail/deb/ros-kinetic-am-utils/latest/d=ubuntu%252Fxenial;t=1/)|


## Run in Docker

Mounts your local clone of this repository to `/workspace` directory in a docker container.

**Prerequisites**
* Docker is installed
* This repository is cloned
* Your current directory is the root of this repository

```
docker run -w /workspace -v `pwd`:/workspace -it docker.cloudsmith.io/automodality/dev/amros-base
```

## Build

Build with debian in docker.

```


## Package

Runs `Build` and packages for installation.

## Releases

See [releases](https://github.com/AutoModality/am-utils/releases) for the latest. Follows the standard [Development Lifecycle](https://automodality.atlassian.net/wiki/spaces/AUTOMOD/pages/668664251/Development+Lifecycle).
18 changes: 18 additions & 0 deletions configure
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash
PACKAGE=am-utils
source /opt/ros/kinetic/setup.bash
echo "We are $(pwd)"
CURDIR=$(readlink -f $(pwd))
mkdir -p catkin_ws/src/${PACKAGE}
WORKSPACE=$(readlink -f ./catkin_ws)
cp -r src catkin_ws/src/${PACKAGE}
cp -r include catkin_ws/src/${PACKAGE}
cp -r test catkin_ws/src/${PACKAGE}
cp -r msg catkin_ws/src/${PACKAGE}
cp package.xml catkin_ws/src/${PACKAGE}
cp CMakeLists.txt catkin_ws/src/${PACKAGE}
cd catkin_ws
catkin init --workspace .
echo "PWD: $(pwd)"
catkin config --install

15 changes: 7 additions & 8 deletions debian/control
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
Source: ros-kinetic-am-utils
Section: unknown
Section: misc
Priority: extra
Maintainer: Jimi Damon <jdamon@automodality.com>
Build-Depends: cmake, debhelper (>=9),javahelper
Standards-Version: 3.9.6
Homepage: <insert the upstream URL, if relevant>
Maintainer: info <info@automodality.com>
Build-Depends: debhelper (>= 9.0.0), ros-kinetic-catkin, ros-kinetic-geometry-msgs, ros-kinetic-message-generation, ros-kinetic-nav-msgs, ros-kinetic-rosconsole, ros-kinetic-roscpp, ros-kinetic-rostime, ros-kinetic-sensor-msgs, ros-kinetic-std-msgs
Homepage: https://github.com/AutoModality/am-utils
Standards-Version: 3.9.2

Package: ros-kinetic-am-utils
Architecture: any
Multi-Arch: foreign
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Utilites for AM based ROs packages
Depends: ${shlibs:Depends}, ${misc:Depends}, ros-kinetic-geometry-msgs, ros-kinetic-message-runtime, ros-kinetic-nav-msgs, ros-kinetic-rosconsole, ros-kinetic-roscpp, ros-kinetic-rostime, ros-kinetic-sensor-msgs, ros-kinetic-std-msgs
Description: The am utils package
63 changes: 53 additions & 10 deletions debian/rules
Original file line number Diff line number Diff line change
@@ -1,15 +1,58 @@
#!/usr/bin/make -f
# You must remove unused comment lines for the released package.
#export DH_VERBOSE = 1
#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
#export JAVA_HOME=/usr/lib/jvm/default-java
#export CLASSPATH=/usr/share/java/csv.jar:/usr/share/java/debug-disable.jar:/usr/share/java/itext.jar
# -*- 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/kinetic/lib/pkgconfig
# Explicitly enable -DNDEBUG, see:
# https://github.com/ros-infrastructure/bloom/issues/327
export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG

%:
dh $@

#override_dh_auto_configure:
# dh_auto_configure -- \
# -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_TARGET_MULTIARCH)"
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/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
dh_auto_configure

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/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/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/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/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/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
dh_shlibdeps -l$(CURDIR)/debian/ros-kinetic-am-utils//opt/ros/kinetic/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/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
dh_auto_install
6 changes: 4 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>am_utils</name>
<version>0.0.0</version>
<version>1.0.1</version>
<description>The am utils package</description>
<maintainer email="info@automodality.com">info</maintainer>
<license>BSD</license>
Expand All @@ -12,7 +12,9 @@
<depend>nav_msgs</depend>
<depend>std_msgs</depend>
<depend>sensor_msgs</depend>

<depend>roscpp</depend>
<depend>rosconsole</depend>
<depend>rostime</depend>
<build_depend>message_generation</build_depend>
<exec_depend>message_runtime</exec_depend>

Expand Down