mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00
Code Issues Releases Activity

- Update to 1.2.5

Browse Source 
- Remove patch integrated upstream
- New patches to use GNU make which supports the -l parameter, sent upstream
This commit is contained in:
Rene Ladan 2011-02-13 16:27:13 +00:00
parent 350e9c7528
commit 09bc610a2c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=269086
28 changed files with 188 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/ros-documentation/Makefile
View File

@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= ros
PORTVERSION= 1.2.4
PORTREVISION= 5
PORTVERSION= 1.2.5
CATEGORIES= devel
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ros/
DISTFILES= ros-${PORTVERSION}.tar.bz2 SWIG-1.3.29-wx.tar.gz \
@ -308,7 +307,7 @@ do-install:
tools/rosbag/scripts/fix_md5sums.py \
tools/rosbag/scripts/fix_moved_messages.py tools/rosbag/scripts/fixbag.py \
tools/rosbag/scripts/fixbag_batch.py tools/rosbag/scripts/makerule.py \
tools/rosbag/scripts/savemsg.py tools/rosbag/scripts/slash.py \
tools/rosbag/scripts/savemsg.py \
tools/rosbag/scripts/topic_renamer.py tools/rosbag/test/latched_pub.py \
tools/rosbag/test/latched_sub.py tools/rosbagmigration/scripts/checkbag.py \
tools/rosbagmigration/scripts/fixbag.py \

4
devel/ros-documentation/distinfo
View File

@ -1,5 +1,5 @@
SHA256 (ros/ros-1.2.4.tar.bz2) = 199bd4d9f2578a165dfb42cd24bd0a5bfa489ec2085cd1ac8e5f6d2ab2ef2516
SIZE (ros/ros-1.2.4.tar.bz2) = 1535133
SHA256 (ros/ros-1.2.5.tar.bz2) = 7df54a08caaed36cd30cb66a429222614a7c7900be0a5c524a47ce790e6828f7
SIZE (ros/ros-1.2.5.tar.bz2) = 1541170
SHA256 (ros/SWIG-1.3.29-wx.tar.gz) = fbd316cb2da250a846a5dbedf48e1deee0600b40af88da5f7ca5c01f3d02c66d
SIZE (ros/SWIG-1.3.29-wx.tar.gz) = 3143417
SHA256 (ros/gtest-1.5.0.tar.gz) = 24156a23cfa49a194c48d1b630fd8eaa63fffc403719b5ddb94cdbe8d9a96aff

11
devel/ros-documentation/files/patch-3172
View File

@ -1,11 +0,0 @@
--- tools/rosmsg/src/rosmsg.py.orig 2010-08-13 02:20:15.000000000 +0200
+++ tools/rosmsg/src/rosmsg.py 2010-12-03 18:54:32.000000000 +0100
@@ -81,7 +81,7 @@
return val
def make_find_command(path):
- if os.uname()[0] == 'Darwin':
+ if os.uname()[0] in ['Darwin', 'FreeBSD']:
return ["find", "-E", path]
else:
return ["find", path, "-regextype", "posix-egrep"]

14
devel/ros-documentation/files/patch-3rdparty__wxswig__Makefile Normal file
View File

@ -0,0 +1,14 @@
--- 3rdparty/wxswig/Makefile.orig 2010-09-28 22:37:32.000000000 +0200
+++ 3rdparty/wxswig/Makefile 2011-02-13 13:18:06.000000000 +0100
@@ -13,7 +13,11 @@
./configure --prefix=$(WXSWIG_ROOT)
wxswig: $(SOURCE_DIR)/unpacked
+ifneq ($(MAKE),)
+ cd $(SOURCE_DIR) && ./configure --prefix=$(shell rospack find wxswig) && $(MAKE) $(ROS_PARALLEL_JOBS) && $(MAKE) install
+else
cd $(SOURCE_DIR) && ./configure --prefix=$(shell rospack find wxswig) && make $(ROS_PARALLEL_JOBS) && make install
+endif
mv bin/swig bin/swig-real
cp swig-wrap bin/swig
touch wxswig

14
devel/ros-documentation/files/patch-test__test_rosbag__Makefile Normal file
View File

@ -0,0 +1,14 @@
--- test/test_rosbag/Makefile.orig 2010-05-06 00:22:45.000000000 +0200
+++ test/test_rosbag/Makefile 2011-02-13 13:20:26.000000000 +0100
@@ -4,7 +4,11 @@
@mkdir -p build
-mkdir -p bin
cd build && cmake -DCMAKE_TOOLCHAIN_FILE=`rospack find rosbuild`/rostoolchain.cmake ..
+ifneq ($(MAKE),)
+ cd build && $(MAKE) $(ROS_PARALLEL_JOBS)
+else
cd build && make $(ROS_PARALLEL_JOBS)
+endif
PACKAGE_NAME=$(shell basename $(PWD))

14
devel/ros-documentation/files/patch-test__test_rosbagmigration__Makefile Normal file
View File

@ -0,0 +1,14 @@
--- test/test_rosbagmigration/Makefile.orig 2009-07-20 03:49:11.000000000 +0200
+++ test/test_rosbagmigration/Makefile 2011-02-13 13:39:46.000000000 +0100
@@ -4,7 +4,11 @@
@mkdir -p build
-mkdir -p bin
cd build && cmake -DCMAKE_TOOLCHAIN_FILE=`rospack find rosbuild`/rostoolchain.cmake ..
+ifneq ($(MAKE),)
+ cd build && $(MAKE) $(ROS_PARALLEL_JOBS)
+else
cd build && make $(ROS_PARALLEL_JOBS)
+endif
PACKAGE_NAME=$(shell basename $(PWD))

2
devel/ros-documentation/pkg-plist
View File

@ -2640,6 +2640,7 @@ ros/ros/test/test_rospack/stack_overlay/stack/stack.xml
ros/ros/test/test_rospack/structure_test/.hidden/manifest.xml
ros/ros/test/test_rospack/structure_test/package1/manifest.xml
ros/ros/test/test_rospack/structure_test/package2/manifest.xml
ros/ros/test/test_rospack/structure_test/package2/rospack_nosubdirs
ros/ros/test/test_rospack/structure_test/subdir1/package3/manifest.xml
ros/ros/test/test_rospack/structure_test/subdir1/subdir1_1/package4/manifest.xml
ros/ros/test/test_rospack/structure_test/subdir1/subdir1_1/package5/manifest.xml
@ -3035,7 +3036,6 @@ ros/ros/tools/rosbag/scripts/fixbag.py
ros/ros/tools/rosbag/scripts/fixbag_batch.py
ros/ros/tools/rosbag/scripts/makerule.py
ros/ros/tools/rosbag/scripts/savemsg.py
ros/ros/tools/rosbag/scripts/slash.py
ros/ros/tools/rosbag/scripts/topic_renamer.py
ros/ros/tools/rosbag/src/bag.cpp
ros/ros/tools/rosbag/src/buffer.cpp

5
devel/ros-rx/Makefile
View File

@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= ros
PORTVERSION= 1.2.4
PORTREVISION= 5
PORTVERSION= 1.2.5
CATEGORIES= devel
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ros/
DISTFILES= ros-${PORTVERSION}.tar.bz2 SWIG-1.3.29-wx.tar.gz \
@ -308,7 +307,7 @@ do-install:
tools/rosbag/scripts/fix_md5sums.py \
tools/rosbag/scripts/fix_moved_messages.py tools/rosbag/scripts/fixbag.py \
tools/rosbag/scripts/fixbag_batch.py tools/rosbag/scripts/makerule.py \
tools/rosbag/scripts/savemsg.py tools/rosbag/scripts/slash.py \
tools/rosbag/scripts/savemsg.py \
tools/rosbag/scripts/topic_renamer.py tools/rosbag/test/latched_pub.py \
tools/rosbag/test/latched_sub.py tools/rosbagmigration/scripts/checkbag.py \
tools/rosbagmigration/scripts/fixbag.py \

4
devel/ros-rx/distinfo
View File

@ -1,5 +1,5 @@
SHA256 (ros/ros-1.2.4.tar.bz2) = 199bd4d9f2578a165dfb42cd24bd0a5bfa489ec2085cd1ac8e5f6d2ab2ef2516
SIZE (ros/ros-1.2.4.tar.bz2) = 1535133
SHA256 (ros/ros-1.2.5.tar.bz2) = 7df54a08caaed36cd30cb66a429222614a7c7900be0a5c524a47ce790e6828f7
SIZE (ros/ros-1.2.5.tar.bz2) = 1541170
SHA256 (ros/SWIG-1.3.29-wx.tar.gz) = fbd316cb2da250a846a5dbedf48e1deee0600b40af88da5f7ca5c01f3d02c66d
SIZE (ros/SWIG-1.3.29-wx.tar.gz) = 3143417
SHA256 (ros/gtest-1.5.0.tar.gz) = 24156a23cfa49a194c48d1b630fd8eaa63fffc403719b5ddb94cdbe8d9a96aff

11
devel/ros-rx/files/patch-3172
View File

@ -1,11 +0,0 @@
--- tools/rosmsg/src/rosmsg.py.orig 2010-08-13 02:20:15.000000000 +0200
+++ tools/rosmsg/src/rosmsg.py 2010-12-03 18:54:32.000000000 +0100
@@ -81,7 +81,7 @@
return val
def make_find_command(path):
- if os.uname()[0] == 'Darwin':
+ if os.uname()[0] in ['Darwin', 'FreeBSD']:
return ["find", "-E", path]
else:
return ["find", path, "-regextype", "posix-egrep"]

14
devel/ros-rx/files/patch-3rdparty__wxswig__Makefile Normal file
View File

@ -0,0 +1,14 @@
--- 3rdparty/wxswig/Makefile.orig 2010-09-28 22:37:32.000000000 +0200
+++ 3rdparty/wxswig/Makefile 2011-02-13 13:18:06.000000000 +0100
@@ -13,7 +13,11 @@
./configure --prefix=$(WXSWIG_ROOT)
wxswig: $(SOURCE_DIR)/unpacked
+ifneq ($(MAKE),)
+ cd $(SOURCE_DIR) && ./configure --prefix=$(shell rospack find wxswig) && $(MAKE) $(ROS_PARALLEL_JOBS) && $(MAKE) install
+else
cd $(SOURCE_DIR) && ./configure --prefix=$(shell rospack find wxswig) && make $(ROS_PARALLEL_JOBS) && make install
+endif
mv bin/swig bin/swig-real
cp swig-wrap bin/swig
touch wxswig

14
devel/ros-rx/files/patch-test__test_rosbag__Makefile Normal file
View File

@ -0,0 +1,14 @@
--- test/test_rosbag/Makefile.orig 2010-05-06 00:22:45.000000000 +0200
+++ test/test_rosbag/Makefile 2011-02-13 13:20:26.000000000 +0100
@@ -4,7 +4,11 @@
@mkdir -p build
-mkdir -p bin
cd build && cmake -DCMAKE_TOOLCHAIN_FILE=`rospack find rosbuild`/rostoolchain.cmake ..
+ifneq ($(MAKE),)
+ cd build && $(MAKE) $(ROS_PARALLEL_JOBS)
+else
cd build && make $(ROS_PARALLEL_JOBS)
+endif
PACKAGE_NAME=$(shell basename $(PWD))

14
devel/ros-rx/files/patch-test__test_rosbagmigration__Makefile Normal file
View File

@ -0,0 +1,14 @@
--- test/test_rosbagmigration/Makefile.orig 2009-07-20 03:49:11.000000000 +0200
+++ test/test_rosbagmigration/Makefile 2011-02-13 13:39:46.000000000 +0100
@@ -4,7 +4,11 @@
@mkdir -p build
-mkdir -p bin
cd build && cmake -DCMAKE_TOOLCHAIN_FILE=`rospack find rosbuild`/rostoolchain.cmake ..
+ifneq ($(MAKE),)
+ cd build && $(MAKE) $(ROS_PARALLEL_JOBS)
+else
cd build && make $(ROS_PARALLEL_JOBS)
+endif
PACKAGE_NAME=$(shell basename $(PWD))

2
devel/ros-rx/pkg-plist
View File

@ -2640,6 +2640,7 @@ ros/ros/test/test_rospack/stack_overlay/stack/stack.xml
ros/ros/test/test_rospack/structure_test/.hidden/manifest.xml
ros/ros/test/test_rospack/structure_test/package1/manifest.xml
ros/ros/test/test_rospack/structure_test/package2/manifest.xml
ros/ros/test/test_rospack/structure_test/package2/rospack_nosubdirs
ros/ros/test/test_rospack/structure_test/subdir1/package3/manifest.xml
ros/ros/test/test_rospack/structure_test/subdir1/subdir1_1/package4/manifest.xml
ros/ros/test/test_rospack/structure_test/subdir1/subdir1_1/package5/manifest.xml
@ -3035,7 +3036,6 @@ ros/ros/tools/rosbag/scripts/fixbag.py
ros/ros/tools/rosbag/scripts/fixbag_batch.py
ros/ros/tools/rosbag/scripts/makerule.py
ros/ros/tools/rosbag/scripts/savemsg.py
ros/ros/tools/rosbag/scripts/slash.py
ros/ros/tools/rosbag/scripts/topic_renamer.py
ros/ros/tools/rosbag/src/bag.cpp
ros/ros/tools/rosbag/src/buffer.cpp

5
devel/ros/Makefile
View File

@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= ros
PORTVERSION= 1.2.4
PORTREVISION= 5
PORTVERSION= 1.2.5
CATEGORIES= devel
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ros/
DISTFILES= ros-${PORTVERSION}.tar.bz2 SWIG-1.3.29-wx.tar.gz \
@ -308,7 +307,7 @@ do-install:
tools/rosbag/scripts/fix_md5sums.py \
tools/rosbag/scripts/fix_moved_messages.py tools/rosbag/scripts/fixbag.py \
tools/rosbag/scripts/fixbag_batch.py tools/rosbag/scripts/makerule.py \
tools/rosbag/scripts/savemsg.py tools/rosbag/scripts/slash.py \
tools/rosbag/scripts/savemsg.py \
tools/rosbag/scripts/topic_renamer.py tools/rosbag/test/latched_pub.py \
tools/rosbag/test/latched_sub.py tools/rosbagmigration/scripts/checkbag.py \
tools/rosbagmigration/scripts/fixbag.py \

4
devel/ros/distinfo
View File

@ -1,5 +1,5 @@
SHA256 (ros/ros-1.2.4.tar.bz2) = 199bd4d9f2578a165dfb42cd24bd0a5bfa489ec2085cd1ac8e5f6d2ab2ef2516
SIZE (ros/ros-1.2.4.tar.bz2) = 1535133
SHA256 (ros/ros-1.2.5.tar.bz2) = 7df54a08caaed36cd30cb66a429222614a7c7900be0a5c524a47ce790e6828f7
SIZE (ros/ros-1.2.5.tar.bz2) = 1541170
SHA256 (ros/SWIG-1.3.29-wx.tar.gz) = fbd316cb2da250a846a5dbedf48e1deee0600b40af88da5f7ca5c01f3d02c66d
SIZE (ros/SWIG-1.3.29-wx.tar.gz) = 3143417
SHA256 (ros/gtest-1.5.0.tar.gz) = 24156a23cfa49a194c48d1b630fd8eaa63fffc403719b5ddb94cdbe8d9a96aff

11
devel/ros/files/patch-3172
View File

@ -1,11 +0,0 @@
--- tools/rosmsg/src/rosmsg.py.orig 2010-08-13 02:20:15.000000000 +0200
+++ tools/rosmsg/src/rosmsg.py 2010-12-03 18:54:32.000000000 +0100
@@ -81,7 +81,7 @@
return val
def make_find_command(path):
- if os.uname()[0] == 'Darwin':
+ if os.uname()[0] in ['Darwin', 'FreeBSD']:
return ["find", "-E", path]
else:
return ["find", path, "-regextype", "posix-egrep"]

14
devel/ros/files/patch-3rdparty__wxswig__Makefile Normal file
View File

@ -0,0 +1,14 @@
--- 3rdparty/wxswig/Makefile.orig 2010-09-28 22:37:32.000000000 +0200
+++ 3rdparty/wxswig/Makefile 2011-02-13 13:18:06.000000000 +0100
@@ -13,7 +13,11 @@
./configure --prefix=$(WXSWIG_ROOT)
wxswig: $(SOURCE_DIR)/unpacked
+ifneq ($(MAKE),)
+ cd $(SOURCE_DIR) && ./configure --prefix=$(shell rospack find wxswig) && $(MAKE) $(ROS_PARALLEL_JOBS) && $(MAKE) install
+else
cd $(SOURCE_DIR) && ./configure --prefix=$(shell rospack find wxswig) && make $(ROS_PARALLEL_JOBS) && make install
+endif
mv bin/swig bin/swig-real
cp swig-wrap bin/swig
touch wxswig

14
devel/ros/files/patch-test__test_rosbag__Makefile Normal file
View File

@ -0,0 +1,14 @@
--- test/test_rosbag/Makefile.orig 2010-05-06 00:22:45.000000000 +0200
+++ test/test_rosbag/Makefile 2011-02-13 13:20:26.000000000 +0100
@@ -4,7 +4,11 @@
@mkdir -p build
-mkdir -p bin
cd build && cmake -DCMAKE_TOOLCHAIN_FILE=`rospack find rosbuild`/rostoolchain.cmake ..
+ifneq ($(MAKE),)
+ cd build && $(MAKE) $(ROS_PARALLEL_JOBS)
+else
cd build && make $(ROS_PARALLEL_JOBS)
+endif
PACKAGE_NAME=$(shell basename $(PWD))

14
devel/ros/files/patch-test__test_rosbagmigration__Makefile Normal file
View File

@ -0,0 +1,14 @@
--- test/test_rosbagmigration/Makefile.orig 2009-07-20 03:49:11.000000000 +0200
+++ test/test_rosbagmigration/Makefile 2011-02-13 13:39:46.000000000 +0100
@@ -4,7 +4,11 @@
@mkdir -p build
-mkdir -p bin
cd build && cmake -DCMAKE_TOOLCHAIN_FILE=`rospack find rosbuild`/rostoolchain.cmake ..
+ifneq ($(MAKE),)
+ cd build && $(MAKE) $(ROS_PARALLEL_JOBS)
+else
cd build && make $(ROS_PARALLEL_JOBS)
+endif
PACKAGE_NAME=$(shell basename $(PWD))

2
devel/ros/pkg-plist
View File

@ -2640,6 +2640,7 @@ ros/ros/test/test_rospack/stack_overlay/stack/stack.xml
ros/ros/test/test_rospack/structure_test/.hidden/manifest.xml
ros/ros/test/test_rospack/structure_test/package1/manifest.xml
ros/ros/test/test_rospack/structure_test/package2/manifest.xml
ros/ros/test/test_rospack/structure_test/package2/rospack_nosubdirs
ros/ros/test/test_rospack/structure_test/subdir1/package3/manifest.xml
ros/ros/test/test_rospack/structure_test/subdir1/subdir1_1/package4/manifest.xml
ros/ros/test/test_rospack/structure_test/subdir1/subdir1_1/package5/manifest.xml
@ -3035,7 +3036,6 @@ ros/ros/tools/rosbag/scripts/fixbag.py
ros/ros/tools/rosbag/scripts/fixbag_batch.py
ros/ros/tools/rosbag/scripts/makerule.py
ros/ros/tools/rosbag/scripts/savemsg.py
ros/ros/tools/rosbag/scripts/slash.py
ros/ros/tools/rosbag/scripts/topic_renamer.py
ros/ros/tools/rosbag/src/bag.cpp
ros/ros/tools/rosbag/src/buffer.cpp

5
devel/ros_comm/Makefile
View File

@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= ros
PORTVERSION= 1.2.4
PORTREVISION= 5
PORTVERSION= 1.2.5
CATEGORIES= devel
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ros/
DISTFILES= ros-${PORTVERSION}.tar.bz2 SWIG-1.3.29-wx.tar.gz \
@ -308,7 +307,7 @@ do-install:
tools/rosbag/scripts/fix_md5sums.py \
tools/rosbag/scripts/fix_moved_messages.py tools/rosbag/scripts/fixbag.py \
tools/rosbag/scripts/fixbag_batch.py tools/rosbag/scripts/makerule.py \
tools/rosbag/scripts/savemsg.py tools/rosbag/scripts/slash.py \
tools/rosbag/scripts/savemsg.py \
tools/rosbag/scripts/topic_renamer.py tools/rosbag/test/latched_pub.py \
tools/rosbag/test/latched_sub.py tools/rosbagmigration/scripts/checkbag.py \
tools/rosbagmigration/scripts/fixbag.py \

4
devel/ros_comm/distinfo
View File

@ -1,5 +1,5 @@
SHA256 (ros/ros-1.2.4.tar.bz2) = 199bd4d9f2578a165dfb42cd24bd0a5bfa489ec2085cd1ac8e5f6d2ab2ef2516
SIZE (ros/ros-1.2.4.tar.bz2) = 1535133
SHA256 (ros/ros-1.2.5.tar.bz2) = 7df54a08caaed36cd30cb66a429222614a7c7900be0a5c524a47ce790e6828f7
SIZE (ros/ros-1.2.5.tar.bz2) = 1541170
SHA256 (ros/SWIG-1.3.29-wx.tar.gz) = fbd316cb2da250a846a5dbedf48e1deee0600b40af88da5f7ca5c01f3d02c66d
SIZE (ros/SWIG-1.3.29-wx.tar.gz) = 3143417
SHA256 (ros/gtest-1.5.0.tar.gz) = 24156a23cfa49a194c48d1b630fd8eaa63fffc403719b5ddb94cdbe8d9a96aff

11
devel/ros_comm/files/patch-3172
View File

@ -1,11 +0,0 @@
--- tools/rosmsg/src/rosmsg.py.orig 2010-08-13 02:20:15.000000000 +0200
+++ tools/rosmsg/src/rosmsg.py 2010-12-03 18:54:32.000000000 +0100
@@ -81,7 +81,7 @@
return val
def make_find_command(path):
- if os.uname()[0] == 'Darwin':
+ if os.uname()[0] in ['Darwin', 'FreeBSD']:
return ["find", "-E", path]
else:
return ["find", path, "-regextype", "posix-egrep"]

14
devel/ros_comm/files/patch-3rdparty__wxswig__Makefile Normal file
View File

@ -0,0 +1,14 @@
--- 3rdparty/wxswig/Makefile.orig 2010-09-28 22:37:32.000000000 +0200
+++ 3rdparty/wxswig/Makefile 2011-02-13 13:18:06.000000000 +0100
@@ -13,7 +13,11 @@
./configure --prefix=$(WXSWIG_ROOT)
wxswig: $(SOURCE_DIR)/unpacked
+ifneq ($(MAKE),)
+ cd $(SOURCE_DIR) && ./configure --prefix=$(shell rospack find wxswig) && $(MAKE) $(ROS_PARALLEL_JOBS) && $(MAKE) install
+else
cd $(SOURCE_DIR) && ./configure --prefix=$(shell rospack find wxswig) && make $(ROS_PARALLEL_JOBS) && make install
+endif
mv bin/swig bin/swig-real
cp swig-wrap bin/swig
touch wxswig

14
devel/ros_comm/files/patch-test__test_rosbag__Makefile Normal file
View File

@ -0,0 +1,14 @@
--- test/test_rosbag/Makefile.orig 2010-05-06 00:22:45.000000000 +0200
+++ test/test_rosbag/Makefile 2011-02-13 13:20:26.000000000 +0100
@@ -4,7 +4,11 @@
@mkdir -p build
-mkdir -p bin
cd build && cmake -DCMAKE_TOOLCHAIN_FILE=`rospack find rosbuild`/rostoolchain.cmake ..
+ifneq ($(MAKE),)
+ cd build && $(MAKE) $(ROS_PARALLEL_JOBS)
+else
cd build && make $(ROS_PARALLEL_JOBS)
+endif
PACKAGE_NAME=$(shell basename $(PWD))

14
devel/ros_comm/files/patch-test__test_rosbagmigration__Makefile Normal file
View File

@ -0,0 +1,14 @@
--- test/test_rosbagmigration/Makefile.orig 2009-07-20 03:49:11.000000000 +0200
+++ test/test_rosbagmigration/Makefile 2011-02-13 13:39:46.000000000 +0100
@@ -4,7 +4,11 @@
@mkdir -p build
-mkdir -p bin
cd build && cmake -DCMAKE_TOOLCHAIN_FILE=`rospack find rosbuild`/rostoolchain.cmake ..
+ifneq ($(MAKE),)
+ cd build && $(MAKE) $(ROS_PARALLEL_JOBS)
+else
cd build && make $(ROS_PARALLEL_JOBS)
+endif
PACKAGE_NAME=$(shell basename $(PWD))

2
devel/ros_comm/pkg-plist
View File

@ -2640,6 +2640,7 @@ ros/ros/test/test_rospack/stack_overlay/stack/stack.xml
ros/ros/test/test_rospack/structure_test/.hidden/manifest.xml
ros/ros/test/test_rospack/structure_test/package1/manifest.xml
ros/ros/test/test_rospack/structure_test/package2/manifest.xml
ros/ros/test/test_rospack/structure_test/package2/rospack_nosubdirs
ros/ros/test/test_rospack/structure_test/subdir1/package3/manifest.xml
ros/ros/test/test_rospack/structure_test/subdir1/subdir1_1/package4/manifest.xml
ros/ros/test/test_rospack/structure_test/subdir1/subdir1_1/package5/manifest.xml
@ -3035,7 +3036,6 @@ ros/ros/tools/rosbag/scripts/fixbag.py
ros/ros/tools/rosbag/scripts/fixbag_batch.py
ros/ros/tools/rosbag/scripts/makerule.py
ros/ros/tools/rosbag/scripts/savemsg.py
ros/ros/tools/rosbag/scripts/slash.py
ros/ros/tools/rosbag/scripts/topic_renamer.py
ros/ros/tools/rosbag/src/bag.cpp
ros/ros/tools/rosbag/src/buffer.cpp