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

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

Revision: 160
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=160&view=rev
Author:   morgan_quigley
Date:     2008-04-22 16:58:24 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
slowly i will move the packages to correpond to the 'code forest' style of organization instead of the current 'pile of directories' setup

Modified Paths:
--------------
    pkg/trunk/axis_cam/nodes/test_axis_cam
    pkg/trunk/cloud_viewer/src/standalone/Makefile

Added Paths:
-----------
    pkg/trunk/3rdparty/
    pkg/trunk/3rdparty/sdl/
    pkg/trunk/3rdparty/sdl/Makefile
    pkg/trunk/3rdparty/sdl/SDL-1.2.13.tar.gz
    pkg/trunk/3rdparty/sdl/manifest.xml

Removed Paths:
-------------
    pkg/trunk/3rdparty/sdl/SDL-1.2.13.tar.gz
    pkg/trunk/3rdparty/sdl/manifest.xml
    pkg/trunk/3rdparty/sdl/rosbuild
    pkg/trunk/sdl/

Copied: pkg/trunk/3rdparty/sdl (from rev 158, pkg/trunk/sdl)

Copied: pkg/trunk/3rdparty/sdl/Makefile (from rev 159, pkg/trunk/sdl/Makefile)
===================================================================
--- pkg/trunk/3rdparty/sdl/Makefile	                        (rev 0)
+++ pkg/trunk/3rdparty/sdl/Makefile	2008-04-22 23:58:24 UTC (rev 160)
@@ -0,0 +1,16 @@
+all: SDL
+
+SDL-1.2.13:
+	tar xzf SDL-1.2.13.tar.gz
+
+SDL: SDL-1.2.13
+	@if [ ! -d /usr/include/X11 ]; then echo "you don't appear to have X. On Ubuntu, this is fixed with 'sudo apt-get install xorg-dev'"; false; fi
+	@if [ ! -f /usr/include/GL/gl.h ]; then echo "you don't appear to have OpenGL. On Ubuntu, this is fixed with 'sudo apt-get install libgl1-mesa-dev'"; false; fi
+	@if [ ! -f /usr/include/GL/glu.h ]; then echo "you don't appear to have the OpenGL GLU library. On Ubuntu, this can be fixed with 'sudo apt-get install libglu1-mesa-dev'"; false; fi
+	cd SDL-1.2.13 && ./configure --prefix=$(PWD)/SDL
+	cd SDL-1.2.13 && make && make install
+
+clean:
+	-rm -rf SDL-1.2.13 SDL
+
+.PHONY : clean

Deleted: pkg/trunk/3rdparty/sdl/SDL-1.2.13.tar.gz
===================================================================
(Binary files differ)

Copied: pkg/trunk/3rdparty/sdl/SDL-1.2.13.tar.gz (from rev 159, pkg/trunk/sdl/SDL-1.2.13.tar.gz)
===================================================================
(Binary files differ)

Deleted: pkg/trunk/3rdparty/sdl/manifest.xml
===================================================================
--- pkg/trunk/sdl/manifest.xml	2008-04-22 23:35:36 UTC (rev 158)
+++ pkg/trunk/3rdparty/sdl/manifest.xml	2008-04-22 23:58:24 UTC (rev 160)
@@ -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/3rdparty/sdl/manifest.xml (from rev 159, pkg/trunk/sdl/manifest.xml)
===================================================================
--- pkg/trunk/3rdparty/sdl/manifest.xml	                        (rev 0)
+++ pkg/trunk/3rdparty/sdl/manifest.xml	2008-04-22 23:58:24 UTC (rev 160)
@@ -0,0 +1,17 @@
+<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>
+<export>
+  <cpp lflags="-Xlinker -rpath ${prefix}/SDL/lib -L${prefix}/SDL/lib -lSDL" cflags="-I${prefix}/SDL/include"/>
+</export>
+</package>
+

Deleted: pkg/trunk/3rdparty/sdl/rosbuild
===================================================================
--- pkg/trunk/sdl/rosbuild	2008-04-22 23:35:36 UTC (rev 158)
+++ pkg/trunk/3rdparty/sdl/rosbuild	2008-04-22 23:58:24 UTC (rev 160)
@@ -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
-

Modified: pkg/trunk/axis_cam/nodes/test_axis_cam
===================================================================
--- pkg/trunk/axis_cam/nodes/test_axis_cam	2008-04-22 23:57:06 UTC (rev 159)
+++ pkg/trunk/axis_cam/nodes/test_axis_cam	2008-04-22 23:58:24 UTC (rev 160)
@@ -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'=>'xterm'}
-g.node 'image_viewer/image_viewer', {'launch'=>'xterm'}
+g.node 'axis_cam/axis_cam', {'launch'=>'valgrind'}
+g.node 'image_viewer/image_viewer', {'launch'=>'valgrind'}
 #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-22 23:57:06 UTC (rev 159)
+++ pkg/trunk/cloud_viewer/src/standalone/Makefile	2008-04-22 23:58:24 UTC (rev 160)
@@ -1,6 +1,7 @@
 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
+#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


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