|
From: <mc...@us...> - 2008-11-26 22:31:49
|
Revision: 7373
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=7373&view=rev
Author: mcgann
Date: 2008-11-26 22:31:45 +0000 (Wed, 26 Nov 2008)
Log Message:
-----------
Add log directory to path and source with path lookup for clock logging
Modified Paths:
--------------
pkg/trunk/demos/2dnav_pr2/trex/run_milestone_1.xml
pkg/trunk/demos/2dnav_pr2/trex/run_office_endurance_test.xml
pkg/trunk/highlevel/executive_trex/executive_trex_pr2/CMakeLists.txt
pkg/trunk/highlevel/executive_trex/executive_trex_pr2/src/LogClock.cc
Modified: pkg/trunk/demos/2dnav_pr2/trex/run_milestone_1.xml
===================================================================
--- pkg/trunk/demos/2dnav_pr2/trex/run_milestone_1.xml 2008-11-26 22:27:57 UTC (rev 7372)
+++ pkg/trunk/demos/2dnav_pr2/trex/run_milestone_1.xml 2008-11-26 22:31:45 UTC (rev 7373)
@@ -1,6 +1,6 @@
<launch>
<param name="/trex/input_file" value="pr2.cfg"/>
- <param name="/trex/path" value="$(find 2dnav_pr2)/trex:$(find executive_trex_pr2)/miles.3:$(find executive_trex_pr2)"/>
+ <param name="/trex/path" value="$(find 2dnav_pr2)/trex:$(find executive_trex_pr2)/miles.3:$(find 2dnav_pr2)/trex/logs:$(find executive_trex_pr2)"/>
<param name="/trex/log_dir" value="$(find 2dnav_pr2)/trex/logs"/>
<node pkg="executive_trex_pr2" type="trexfast"/>
</launch>
Modified: pkg/trunk/demos/2dnav_pr2/trex/run_office_endurance_test.xml
===================================================================
--- pkg/trunk/demos/2dnav_pr2/trex/run_office_endurance_test.xml 2008-11-26 22:27:57 UTC (rev 7372)
+++ pkg/trunk/demos/2dnav_pr2/trex/run_office_endurance_test.xml 2008-11-26 22:31:45 UTC (rev 7373)
@@ -1,6 +1,6 @@
<launch>
<param name="/trex/input_file" value="pr2.cfg"/>
- <param name="/trex/path" value="$(find 2dnav_pr2)/trex:$(find executive_trex_pr2)/miles.1:$(find executive_trex_pr2)"/>
+ <param name="/trex/path" value="$(find 2dnav_pr2)/trex:$(find executive_trex_pr2)/miles.1:$(find 2dnav_pr2)/trex/logs:$(find executive_trex_pr2)"/>
<param name="/trex/log_dir" value="$(find 2dnav_pr2)/trex/logs"/>
<node pkg="executive_trex_pr2" type="trexfast"/>
</launch>
Modified: pkg/trunk/highlevel/executive_trex/executive_trex_pr2/CMakeLists.txt
===================================================================
--- pkg/trunk/highlevel/executive_trex/executive_trex_pr2/CMakeLists.txt 2008-11-26 22:27:57 UTC (rev 7372)
+++ pkg/trunk/highlevel/executive_trex/executive_trex_pr2/CMakeLists.txt 2008-11-26 22:31:45 UTC (rev 7373)
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.6)
include(rosbuild)
-set(ROS_BUILD_TYPE Release)
+#set(ROS_BUILD_TYPE Release)
rospack(executive_trex_pr2)
Modified: pkg/trunk/highlevel/executive_trex/executive_trex_pr2/src/LogClock.cc
===================================================================
--- pkg/trunk/highlevel/executive_trex/executive_trex_pr2/src/LogClock.cc 2008-11-26 22:27:57 UTC (rev 7372)
+++ pkg/trunk/highlevel/executive_trex/executive_trex_pr2/src/LogClock.cc 2008-11-26 22:31:45 UTC (rev 7373)
@@ -1,12 +1,12 @@
#include "Clock.hh"
-#include <errno.h>
-#include <time.h>
-#include <signal.h>
#include "LogClock.hh"
#include "Agent.hh"
#include "LogManager.hh"
#include "Components.hh"
#include "Utilities.hh"
+#include <errno.h>
+#include <time.h>
+#include <signal.h>
namespace TREX {
/**
@@ -17,7 +17,7 @@
m_gets(0), m_tick(0),
m_secondsPerTick(secondsPerTick) {
pthread_mutex_init(&m_lock, NULL);
- m_file = fopen("./latest/clock.log", "w");
+ m_file = fopen(findFile("./latest/clock.log").c_str(), "w");
}
void LogClock::start(){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|