Skip to content

Commit 17c28a3

Browse files
Merge pull request #13 from NVIDIA-ISAAC-ROS/release-4.1
Isaac ROS 4.1
2 parents cba8790 + 6d54991 commit 17c28a3

41 files changed

Lines changed: 1882 additions & 224 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010

1111
PACKAGE_NAME := isaac-ros-cli
1212

13-
DISTRIBUTION ?= noble
14-
COMPONENT ?= main
15-
ARCHITECTURE ?= all
16-
1713
# Convenience variable for the built .deb (lives one dir up when using dpkg-buildpackage)
1814
DEB_GLOB := ../$(PACKAGE_NAME)_*.deb
1915

@@ -22,20 +18,33 @@ DEB_GLOB := ../$(PACKAGE_NAME)_*.deb
2218
help:
2319
@echo "Targets:"
2420
@echo " make build - Build Debian package (.deb)"
21+
@echo " make build-stamped - Build Debian package (.deb) with timestamped version"
22+
@echo " make timestamp - Append timestamp suffix to debian/changelog"
2523
@echo " make clean - Remove staged packaging artifacts inside debian/"
2624
@echo " make distclean - Clean and remove built files in parent dir"
2725
@echo " make print-deb - Print the path to the built .deb (expects exactly one)"
2826
@echo ""
29-
@echo "Variables (override with VAR=value):"
30-
@echo " DISTRIBUTION=$(DISTRIBUTION) COMPONENT=$(COMPONENT) ARCHITECTURE=$(ARCHITECTURE)"
3127

3228
all: build
3329

30+
timestamp:
31+
@set -e; \
32+
timestamp=$$(date +%Y%m%d%H%M%S); \
33+
sed -i "1s/)/.$$timestamp)/" debian/changelog; \
34+
echo "Updated debian version with timestamp suffix .$$timestamp"; \
35+
head -1 debian/changelog
36+
3437
build:
3538
@echo "Building Debian package for $(PACKAGE_NAME)..."
3639
DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -us -uc -b
3740
@echo "Build complete. Use 'make print-deb' to locate the .deb file."
3841

42+
build-stamped:
43+
cp debian/changelog debian/changelog.original
44+
make timestamp
45+
make build
46+
mv debian/changelog.original debian/changelog
47+
3948
print-deb:
4049
@set -e; \
4150
count=$$(ls -1 $(DEB_GLOB) 2>/dev/null | wc -l | tr -d ' '); \
@@ -47,7 +56,7 @@ print-deb:
4756

4857
clean:
4958
@echo "Removing staged packaging artifacts under debian/..."
50-
rm -rf debian/$(PACKAGE_NAME) debian/.debhelper debian/debhelper-build-stamp debian/files
59+
rm -rf debian/$(PACKAGE_NAME) debian/*.debhelper debian/*.substvars debian/debhelper-build-stamp debian/files
5160

5261
distclean: clean
5362
@echo "Removing built artifacts in parent directory (if any)..."

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ sudo apt-get install isaac-ros-cli
1515
isaac-ros --help
1616

1717
# Initialize environment (pick a mode)
18-
sudo isaac-ros init docker
18+
sudo isaac-ros init <docker|venv|baremetal>
1919

2020
# Activate environment
2121
isaac-ros activate

config/.build_image_layers.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
image_key_order:
2-
- noble.ros2_jazzy.realsense.nova_carter
2+
- isaac_ros.noble.ros2_jazzy.realsense.nova_carter
3+
context_overrides:
4+
isaac_ros: ..
5+
noble: ..
36
cache_to_registry_names: []
47
cache_from_registry_names:
58
- nvcr.io/nvidia/isaac/ros
6-
remote_builder: []
9+
remote_builder: []

config/config.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
version: 1
2-
3-
environment:
4-
mode: uninitialized
1+
version: 2
52

63
docker:
74
image:
8-
base_image_keys:
9-
- noble
10-
- ros2_jazzy
5+
base_image_keys:
6+
- isaac_ros
117
additional_image_keys: []
128

139
run:

config/environment.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ISAAC_ROS_ENVIRONMENT=uninitialized

0 commit comments

Comments
 (0)