|
From: <jl...@us...> - 2008-04-23 16:09:53
|
Revision: 164
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=164&view=rev
Author: jleibs
Date: 2008-04-23 09:09:53 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
Rolling back morgans changes that are now located in the rosbus branch.
Modified Paths:
--------------
pkg/trunk/axis_cam/nodes/test_axis_cam
pkg/trunk/cloud_viewer/src/standalone/Makefile
Added Paths:
-----------
pkg/trunk/sdl/
pkg/trunk/sdl/SDL-1.2.13.tar.gz
pkg/trunk/sdl/manifest.xml
pkg/trunk/sdl/rosbuild
Removed Paths:
-------------
pkg/trunk/3rdparty/
pkg/trunk/sdl/SDL-1.2.13.tar.gz
pkg/trunk/sdl/manifest.xml
pkg/trunk/sdl/rosbuild
Modified: pkg/trunk/axis_cam/nodes/test_axis_cam
===================================================================
--- pkg/trunk/axis_cam/nodes/test_axis_cam 2008-04-23 15:44:47 UTC (rev 163)
+++ pkg/trunk/axis_cam/nodes/test_axis_cam 2008-04-23 16:09:53 UTC (rev 164)
@@ -2,8 +2,8 @@
require "#{`#{ENV['ROS_ROOT']}/rospack latest yamlgraph`}/lib/yamlgraph/ygl.rb"
g = YAMLGraph.new
g.param 'axis_cam.host', '192.168.1.90'
-g.node 'axis_cam/axis_cam', {'launch'=>'valgrind'}
-g.node 'image_viewer/image_viewer', {'launch'=>'valgrind'}
+g.node 'axis_cam/axis_cam', {'launch'=>'xterm'}
+g.node 'image_viewer/image_viewer', {'launch'=>'xterm'}
#g.node 'vacuum/vacuum', {'launch' => 'valgrind'}
g.flow 'axis_cam:image', 'image_viewer:image'
#g.flow 'axis_cam:image', 'vacuum:hose'
Modified: pkg/trunk/cloud_viewer/src/standalone/Makefile
===================================================================
--- pkg/trunk/cloud_viewer/src/standalone/Makefile 2008-04-23 15:44:47 UTC (rev 163)
+++ pkg/trunk/cloud_viewer/src/standalone/Makefile 2008-04-23 16:09:53 UTC (rev 164)
@@ -1,7 +1,6 @@
SRC = cloud.cpp
OUT = cloud
PKG = cloud_viewer
-#CFLAGS = -I$(shell $(ROS_ROOT)/rospack find sdl)/include -I../../include
-#LFLAGS = -L$(shell $(ROS_ROOT)/rospack find sdl)/lib -lSDL -L../../lib -lcloud_viewer -lGL -lGLU
-#include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/only_rules.mk
-include $(shell rospack find mk)/node.mk
+CFLAGS = -I$(shell $(ROS_ROOT)/rospack find sdl)/include -I../../include
+LFLAGS = -L$(shell $(ROS_ROOT)/rospack find sdl)/lib -lSDL -L../../lib -lcloud_viewer -lGL -lGLU
+include $(shell $(ROS_ROOT)/rospack find roscpp)/make_include/only_rules.mk
Copied: pkg/trunk/sdl (from rev 158, pkg/trunk/sdl)
Property changes on: pkg/trunk/sdl
___________________________________________________________________
Name: svn:ignore
+ share
SDL-1.2.13
include
lib
bin
man
Deleted: pkg/trunk/sdl/SDL-1.2.13.tar.gz
===================================================================
(Binary files differ)
Copied: pkg/trunk/sdl/SDL-1.2.13.tar.gz (from rev 158, pkg/trunk/sdl/SDL-1.2.13.tar.gz)
===================================================================
(Binary files differ)
Deleted: pkg/trunk/sdl/manifest.xml
===================================================================
--- pkg/trunk/sdl/manifest.xml 2008-04-22 23:35:36 UTC (rev 158)
+++ pkg/trunk/sdl/manifest.xml 2008-04-23 16:09:53 UTC (rev 164)
@@ -1,14 +0,0 @@
-<package>
-<description brief="The Simple DirectMedia Layer">
-
-This package contains the Simple DirectMedia Layer (SDL). This package does not
-modify SDL in any way; it simply provides a convenient way to download and
-compile the library's shared object in a way that can be managed by the ROS
-dependency system.
-
-</description>
-<author>Sam Lantinga, with contributions from many others. See web page for a full credits llist.</author>
-<license>LGPL</license>
-<url>http://www.libsdl.org</url>
-</package>
-
Copied: pkg/trunk/sdl/manifest.xml (from rev 158, pkg/trunk/sdl/manifest.xml)
===================================================================
--- pkg/trunk/sdl/manifest.xml (rev 0)
+++ pkg/trunk/sdl/manifest.xml 2008-04-23 16:09:53 UTC (rev 164)
@@ -0,0 +1,14 @@
+<package>
+<description brief="The Simple DirectMedia Layer">
+
+This package contains the Simple DirectMedia Layer (SDL). This package does not
+modify SDL in any way; it simply provides a convenient way to download and
+compile the library's shared object in a way that can be managed by the ROS
+dependency system.
+
+</description>
+<author>Sam Lantinga, with contributions from many others. See web page for a full credits llist.</author>
+<license>LGPL</license>
+<url>http://www.libsdl.org</url>
+</package>
+
Deleted: pkg/trunk/sdl/rosbuild
===================================================================
--- pkg/trunk/sdl/rosbuild 2008-04-22 23:35:36 UTC (rev 158)
+++ pkg/trunk/sdl/rosbuild 2008-04-23 16:09:53 UTC (rev 164)
@@ -1,44 +0,0 @@
-#!/usr/bin/env ruby
-require 'fileutils.rb'
-
-pkg_path = File.expand_path($0).split('/')
-pkg_path = pkg_path[0,pkg_path.length-1].join('/')
-puts "package path: [#{pkg_path}]"
-if pkg_path.length < 1
- puts "woah! package path looks scary. something isn't right. bailing..."
- exit
-end
-
-Dir.chdir(pkg_path)
-# TODO make sure we got there
-
-if ARGV.length == 0 || ARGV[0] == 'update'
- puts "extracting SDL ============================"
- system("tar xzvf SDL-1.2.13.tar.gz")
- Dir.mkdir 'bin' if !File.exists? 'bin'
- Dir.mkdir 'lib' if !File.exists? 'lib'
- Dir.mkdir 'man' if !File.exists? 'man'
- Dir.mkdir 'man/man1' if !File.exists? 'man/man1'
- puts "configuring libsdl ============================"
- Dir.chdir "#{pkg_path}/SDL-1.2.13"
- system("./configure --prefix=${PWD}/..")
-# TODO check for blowups after configure
- puts "making libsdl ================================="
- system("make")
- puts "moving files around ============================"
- system("make install")
-# TODO check for make errors
- puts "done! hooray! =================================="
-elsif ARGV[0] == 'clean'
- Dir.chdir "#{pkg_path}"
- system("rm -rf bin")
- system("rm -rf include")
- system("rm -rf lib")
- system("rm -rf man")
- system("rm -rf share")
- system("rm -rf SDL-1.2.13")
- puts "done!"
-else
- puts "unknown parameter: #{ARGV[0]}"
-end
-
Copied: pkg/trunk/sdl/rosbuild (from rev 158, pkg/trunk/sdl/rosbuild)
===================================================================
--- pkg/trunk/sdl/rosbuild (rev 0)
+++ pkg/trunk/sdl/rosbuild 2008-04-23 16:09:53 UTC (rev 164)
@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+require 'fileutils.rb'
+
+pkg_path = File.expand_path($0).split('/')
+pkg_path = pkg_path[0,pkg_path.length-1].join('/')
+puts "package path: [#{pkg_path}]"
+if pkg_path.length < 1
+ puts "woah! package path looks scary. something isn't right. bailing..."
+ exit
+end
+
+Dir.chdir(pkg_path)
+# TODO make sure we got there
+
+if ARGV.length == 0 || ARGV[0] == 'update'
+ puts "extracting SDL ============================"
+ system("tar xzvf SDL-1.2.13.tar.gz")
+ Dir.mkdir 'bin' if !File.exists? 'bin'
+ Dir.mkdir 'lib' if !File.exists? 'lib'
+ Dir.mkdir 'man' if !File.exists? 'man'
+ Dir.mkdir 'man/man1' if !File.exists? 'man/man1'
+ puts "configuring libsdl ============================"
+ Dir.chdir "#{pkg_path}/SDL-1.2.13"
+ system("./configure --prefix=${PWD}/..")
+# TODO check for blowups after configure
+ puts "making libsdl ================================="
+ system("make")
+ puts "moving files around ============================"
+ system("make install")
+# TODO check for make errors
+ puts "done! hooray! =================================="
+elsif ARGV[0] == 'clean'
+ Dir.chdir "#{pkg_path}"
+ system("rm -rf bin")
+ system("rm -rf include")
+ system("rm -rf lib")
+ system("rm -rf man")
+ system("rm -rf share")
+ system("rm -rf SDL-1.2.13")
+ puts "done!"
+else
+ puts "unknown parameter: #{ARGV[0]}"
+end
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|