[Personalrobots-commit] SF.net SVN: personalrobots:[23396] pkg/trunk

[<ge...@us...>]

Revision: 23396
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23396&view=rev
Author:   gerkey
Date:     2009-08-31 19:08:25 +0000 (Mon, 31 Aug 2009)

Log Message:
-----------
Moved theora_image_transport and compressed_image_transport out of
imaging_pipeline into sandbox, pending creation of new stack to hold them.

Modified Paths:
--------------
    pkg/trunk/stacks/diagnostics/CMakeLists.txt
    pkg/trunk/stacks/imaging_pipeline/stack.xml

Added Paths:
-----------
    pkg/trunk/sandbox/compressed_image_transport/
    pkg/trunk/sandbox/theora_image_transport/
    pkg/trunk/stacks/imaging_pipeline/CMakeLists.txt
    pkg/trunk/stacks/imaging_pipeline/Makefile

Removed Paths:
-------------
    pkg/trunk/stacks/imaging_pipeline/compressed_image_transport/
    pkg/trunk/stacks/imaging_pipeline/theora_image_transport/


Property changes on: pkg/trunk/sandbox/compressed_image_transport
___________________________________________________________________
Added: svn:mergeinfo
   + /pkg/branches/gazebo-branch-merge/stacks/imaging_pipeline/compressed_image_transport:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334


Property changes on: pkg/trunk/sandbox/theora_image_transport
___________________________________________________________________
Added: svn:mergeinfo
   + /pkg/branches/gazebo-branch-merge/stacks/imaging_pipeline/theora_image_transport:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334

Modified: pkg/trunk/stacks/diagnostics/CMakeLists.txt
===================================================================
--- pkg/trunk/stacks/diagnostics/CMakeLists.txt	2009-08-31 18:59:46 UTC (rev 23395)
+++ pkg/trunk/stacks/diagnostics/CMakeLists.txt	2009-08-31 19:08:25 UTC (rev 23396)
@@ -16,6 +16,4 @@
 # variables.
 #list(APPEND CPACK_SOURCE_IGNORE_FILES /core/experimental)
 
-rosbuild(diagnostics 0.1.0)
-# After next ROS release, change to new macro
-#rosbuild_make_distribution(0.1.0)
+rosbuild_make_distribution(0.1.0)

Added: pkg/trunk/stacks/imaging_pipeline/CMakeLists.txt
===================================================================
--- pkg/trunk/stacks/imaging_pipeline/CMakeLists.txt	                        (rev 0)
+++ pkg/trunk/stacks/imaging_pipeline/CMakeLists.txt	2009-08-31 19:08:25 UTC (rev 23396)
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 2.4.6)
+include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
+
+set(ROSPACK_MAKEDIST true)
+
+# Append to CPACK_SOURCE_IGNORE_FILES a semicolon-separated list of
+# directories (or patterns, but directories should suffice) that should
+# be excluded from the distro.  This is not the place to put things that
+# should be ignored everywhere, like "build" directories; that happens in
+# rosbuild/rosbuild.cmake.  Here should be listed packages that aren't
+# ready for inclusion in a distro.
+#
+# This list is combined with the list in rosbuild/rosbuild.cmake.  Note
+# that CMake 2.6 may be required to ensure that the two lists are combined
+# properly.  CMake 2.4 seems to have unpredictable scoping rules for such
+# variables.
+#list(APPEND CPACK_SOURCE_IGNORE_FILES /core/experimental)
+
+rosbuild_make_distribution(0.1.0)

Added: pkg/trunk/stacks/imaging_pipeline/Makefile
===================================================================
--- pkg/trunk/stacks/imaging_pipeline/Makefile	                        (rev 0)
+++ pkg/trunk/stacks/imaging_pipeline/Makefile	2009-08-31 19:08:25 UTC (rev 23396)
@@ -0,0 +1 @@
+include $(shell rospack find mk)/cmake_stack.mk
\ No newline at end of file

Modified: pkg/trunk/stacks/imaging_pipeline/stack.xml
===================================================================
--- pkg/trunk/stacks/imaging_pipeline/stack.xml	2009-08-31 18:59:46 UTC (rev 23395)
+++ pkg/trunk/stacks/imaging_pipeline/stack.xml	2009-08-31 19:08:25 UTC (rev 23396)
@@ -1,18 +1,17 @@
 <stack name="imaging_pipeline" version="0.1.0">
   <description brief="pipeline for processing monocular and stereo images">
+
     pipeline for processing monocular and stereo images
+
   </description>
   <author>Kurt Konolige</author>
   <license>BSD</license>  
   <review status="unreviewed" notes=""/>
-  <url>http://pr.willowgarage.com/wiki/imaging_pipeline</url>
-  <depend stack="opencv"/> <!-- opencvpython, opencv_latest, opencv_latest --> 
+  <url>http://ros.org/wiki/imaging_pipeline</url>
+  <depend stack="opencv"/> <!-- opencv_latest --> 
   <depend stack="diagnostics"/> <!-- diagnostic_updater --> 
-  <depend stack="ros"/> <!-- roscpp, rostest, rosrecord, roscpp --> 
+  <depend stack="ros"/> <!-- rosbagmigration, message_filters, roscpp --> 
+  <depend stack="common"/> <!-- image_transport --> 
   <depend stack="common_msgs"/> <!-- sensor_msgs --> 
-  <depend stack="image_transport"/> 
-  <depend package="message_filters" />
-  <depend package="rosbagmigration"/>
-  <depend package="pluginlib"/>
 
 </stack>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.