[Personalrobots-commit] SF.net SVN: personalrobots: [183] pkg/branches/rosbus

[<mor...@us...>]

Revision: 183
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=183&view=rev
Author:   morgan_quigley
Date:     2008-04-25 18:03:39 -0700 (Fri, 25 Apr 2008)

Log Message:
-----------
deleting thread_utils package because it has been subsumed by the rosthread package, which provides more stuff (e.g. semaphore)

Modified Paths:
--------------
    pkg/branches/rosbus/axis_cam/include/axis_cam/axis_cam.h
    pkg/branches/rosbus/axis_cam/manifest.xml
    pkg/branches/rosbus/axis_cam/src/libaxis_cam/Makefile
    pkg/branches/rosbus/sharks/manifest.xml
    pkg/branches/rosbus/sharks/src/libsharks/Makefile

Removed Paths:
-------------
    pkg/branches/rosbus/thread_utils/

Modified: pkg/branches/rosbus/axis_cam/include/axis_cam/axis_cam.h
===================================================================
--- pkg/branches/rosbus/axis_cam/include/axis_cam/axis_cam.h	2008-04-26 00:37:15 UTC (rev 182)
+++ pkg/branches/rosbus/axis_cam/include/axis_cam/axis_cam.h	2008-04-26 01:03:39 UTC (rev 183)
@@ -33,7 +33,7 @@
 #include <curl/curl.h>
 #include <string>
 #include <sstream>
-#include "thread_utils/mutex.h"
+#include "rosthread/mutex.h"
 using namespace std;
 
 class AxisCam
@@ -65,7 +65,7 @@
   CURL *jpeg_curl, *getptz_curl, *setptz_curl;
   char *image_url, *ptz_url;
   stringstream ptz_ss; // need to mutex this someday...
-  ThreadUtils::Mutex ptz_ss_mutex;
+  ros::thread::mutex ptz_ss_mutex;
   inline double clamp(double d, double low, double high)
   { 
     return (d < low ? low : (d > high ? high : d)); 

Modified: pkg/branches/rosbus/axis_cam/manifest.xml
===================================================================
--- pkg/branches/rosbus/axis_cam/manifest.xml	2008-04-26 00:37:15 UTC (rev 182)
+++ pkg/branches/rosbus/axis_cam/manifest.xml	2008-04-26 01:03:39 UTC (rev 183)
@@ -13,8 +13,11 @@
 <url>http://stair.stanford.edu</url>
 <depend package="common_flows"/>
 <depend package="image_viewer"/>
-<depend package="thread_utils"/>
+<depend package="rosthread"/>
 <depend package="string_utils"/>
 <depend package="unstable_flows"/>
+<export>
+  <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -laxis_cam"/>
+</export>
 </package>
 

Modified: pkg/branches/rosbus/axis_cam/src/libaxis_cam/Makefile
===================================================================
--- pkg/branches/rosbus/axis_cam/src/libaxis_cam/Makefile	2008-04-26 00:37:15 UTC (rev 182)
+++ pkg/branches/rosbus/axis_cam/src/libaxis_cam/Makefile	2008-04-26 01:03:39 UTC (rev 183)
@@ -1,4 +1,5 @@
 SRC = axis_cam.cpp
 OUT = ../../lib/libaxis_cam.a 
 PKG = axis_cam
-include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/lib.mk
+CFLAGS = -I../../include
+include $(shell rospack find mk)/lib.mk

Modified: pkg/branches/rosbus/sharks/manifest.xml
===================================================================
--- pkg/branches/rosbus/sharks/manifest.xml	2008-04-26 00:37:15 UTC (rev 182)
+++ pkg/branches/rosbus/sharks/manifest.xml	2008-04-26 01:03:39 UTC (rev 183)
@@ -22,6 +22,10 @@
 <depend package="vacuum"/>
 <depend package="sdl"/>
 <depend package="sdl_image"/>
+<depend package="serial_port"/>
 <sys_depend lib="ncurses"/>
+<export>
+  <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lsharks"/>
+</export>
 </package>
 

Modified: pkg/branches/rosbus/sharks/src/libsharks/Makefile
===================================================================
--- pkg/branches/rosbus/sharks/src/libsharks/Makefile	2008-04-26 00:37:15 UTC (rev 182)
+++ pkg/branches/rosbus/sharks/src/libsharks/Makefile	2008-04-26 01:03:39 UTC (rev 183)
@@ -1,4 +1,4 @@
 SRC = sharks.cpp kbhit.cpp
 OUT = ../../lib/libsharks.a 
 PKG = sharks
-include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/lib.mk
+include $(shell rospack find mk)/lib.mk


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