Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots: [232] pkg/branches/rosbus
|
From: <ge...@us...> - 2008-04-29 23:03:04
|
Revision: 232
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=232&view=rev
Author: gerkey
Date: 2008-04-29 16:03:09 -0700 (Tue, 29 Apr 2008)
Log Message:
-----------
moving nodes to unported
Added Paths:
-----------
pkg/branches/rosbus/unported/exploreGraph/
pkg/branches/rosbus/unported/exploreGraph/doc/
pkg/branches/rosbus/unported/exploreGraph/flows/
pkg/branches/rosbus/unported/exploreGraph/lib/
pkg/branches/rosbus/unported/exploreGraph/manifest.xml
pkg/branches/rosbus/unported/exploreGraph/nodes/
pkg/branches/rosbus/unported/exploreGraph/rosbuild
pkg/branches/rosbus/unported/exploreGraph/src/
pkg/branches/rosbus/unported/gmapping/
pkg/branches/rosbus/unported/gmapping/Makefile
pkg/branches/rosbus/unported/gmapping/TODO.txt
pkg/branches/rosbus/unported/gmapping/bin/
pkg/branches/rosbus/unported/gmapping/build_tools/
pkg/branches/rosbus/unported/gmapping/carmenwrapper/
pkg/branches/rosbus/unported/gmapping/configfile/
pkg/branches/rosbus/unported/gmapping/configure
pkg/branches/rosbus/unported/gmapping/docs/
pkg/branches/rosbus/unported/gmapping/gfs-carmen/
pkg/branches/rosbus/unported/gmapping/grid/
pkg/branches/rosbus/unported/gmapping/gridfastslam/
pkg/branches/rosbus/unported/gmapping/gui/
pkg/branches/rosbus/unported/gmapping/ini/
pkg/branches/rosbus/unported/gmapping/lib/
pkg/branches/rosbus/unported/gmapping/log/
pkg/branches/rosbus/unported/gmapping/manual.mk
pkg/branches/rosbus/unported/gmapping/manual.mk-template
pkg/branches/rosbus/unported/gmapping/particlefilter/
pkg/branches/rosbus/unported/gmapping/playerwrapper/
pkg/branches/rosbus/unported/gmapping/scanmatcher/
pkg/branches/rosbus/unported/gmapping/sensor/
pkg/branches/rosbus/unported/gmapping/setlibpath
pkg/branches/rosbus/unported/gmapping/utils/
pkg/branches/rosbus/unported/linuxjoystick_player/
pkg/branches/rosbus/unported/range_flows/
pkg/branches/rosbus/unported/simple_sdl_gui/
Removed Paths:
-------------
pkg/branches/rosbus/exploreGraph/
pkg/branches/rosbus/gmapping/
pkg/branches/rosbus/linuxjoystick_player/
pkg/branches/rosbus/range_flows/
pkg/branches/rosbus/simple_sdl_gui/
pkg/branches/rosbus/unported/exploreGraph/doc/
pkg/branches/rosbus/unported/exploreGraph/flows/
pkg/branches/rosbus/unported/exploreGraph/lib/
pkg/branches/rosbus/unported/exploreGraph/manifest.xml
pkg/branches/rosbus/unported/exploreGraph/nodes/
pkg/branches/rosbus/unported/exploreGraph/rosbuild
pkg/branches/rosbus/unported/exploreGraph/src/
pkg/branches/rosbus/unported/gmapping/Makefile
pkg/branches/rosbus/unported/gmapping/TODO.txt
pkg/branches/rosbus/unported/gmapping/bin/
pkg/branches/rosbus/unported/gmapping/build_tools/
pkg/branches/rosbus/unported/gmapping/carmenwrapper/
pkg/branches/rosbus/unported/gmapping/configfile/
pkg/branches/rosbus/unported/gmapping/configure
pkg/branches/rosbus/unported/gmapping/docs/
pkg/branches/rosbus/unported/gmapping/gfs-carmen/
pkg/branches/rosbus/unported/gmapping/grid/
pkg/branches/rosbus/unported/gmapping/gridfastslam/
pkg/branches/rosbus/unported/gmapping/gui/
pkg/branches/rosbus/unported/gmapping/ini/
pkg/branches/rosbus/unported/gmapping/lib/
pkg/branches/rosbus/unported/gmapping/log/
pkg/branches/rosbus/unported/gmapping/manual.mk
pkg/branches/rosbus/unported/gmapping/manual.mk-template
pkg/branches/rosbus/unported/gmapping/particlefilter/
pkg/branches/rosbus/unported/gmapping/playerwrapper/
pkg/branches/rosbus/unported/gmapping/scanmatcher/
pkg/branches/rosbus/unported/gmapping/sensor/
pkg/branches/rosbus/unported/gmapping/setlibpath
pkg/branches/rosbus/unported/gmapping/utils/
Copied: pkg/branches/rosbus/unported/exploreGraph (from rev 229, pkg/branches/rosbus/exploreGraph)
Copied: pkg/branches/rosbus/unported/exploreGraph/doc (from rev 231, pkg/branches/rosbus/exploreGraph/doc)
Copied: pkg/branches/rosbus/unported/exploreGraph/flows (from rev 231, pkg/branches/rosbus/exploreGraph/flows)
Copied: pkg/branches/rosbus/unported/exploreGraph/lib (from rev 231, pkg/branches/rosbus/exploreGraph/lib)
Deleted: pkg/branches/rosbus/unported/exploreGraph/manifest.xml
===================================================================
--- pkg/branches/rosbus/exploreGraph/manifest.xml 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/exploreGraph/manifest.xml 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,8 +0,0 @@
-<package>
- <description brief='This is a package to display the ROS Graph'></description>
- <author>Tully Foote tfoote at willowgarage.com</author>
- <license>BSD</license>
- <depend package="rospy" />
- <depend package="rospy_demo" />
- <depend package="pyImageViewer" />
-</package>
\ No newline at end of file
Copied: pkg/branches/rosbus/unported/exploreGraph/manifest.xml (from rev 231, pkg/branches/rosbus/exploreGraph/manifest.xml)
===================================================================
--- pkg/branches/rosbus/unported/exploreGraph/manifest.xml (rev 0)
+++ pkg/branches/rosbus/unported/exploreGraph/manifest.xml 2008-04-29 23:03:09 UTC (rev 232)
@@ -0,0 +1,8 @@
+<package>
+ <description brief='This is a package to display the ROS Graph'></description>
+ <author>Tully Foote tfoote at willowgarage.com</author>
+ <license>BSD</license>
+ <depend package="rospy" />
+ <depend package="rospy_demo" />
+ <depend package="pyImageViewer" />
+</package>
\ No newline at end of file
Copied: pkg/branches/rosbus/unported/exploreGraph/nodes (from rev 231, pkg/branches/rosbus/exploreGraph/nodes)
Deleted: pkg/branches/rosbus/unported/exploreGraph/rosbuild
===================================================================
--- pkg/branches/rosbus/exploreGraph/rosbuild 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/exploreGraph/rosbuild 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,36 +0,0 @@
-#!/usr/bin/env ruby
-
-if !ENV['ROS_ROOT']
- puts "aaaaaaa! The ROS_ROOT environment variable is not set."
- puts "Navigate to your ROS_ROOT directory and run ./set_ros_root"
- puts "(alternatively, you can do this in your .bashrc file"
- exit
-end
-
-pkg_path = File.expand_path($0).split('/')
-pkg_path = pkg_path[0,pkg_path.length-1].join('/')
-
-if ARGV.length == 0 || ARGV[0] == 'update'
- puts "generating flows..."
- # look up the latest versions of rosrb and rospy
- rosrb = `#{ENV['ROS_ROOT']}/rospack latest rosrb`.chomp
- rospy = `#{ENV['ROS_ROOT']}/rospack latest rospy`.chomp
- puts `#{rospy}/scripts/flowgen_py #{pkg_path}/flows/*.flow`
- puts `#{rosrb}/scripts/flowgen_rb #{pkg_path}/flows/*.flow`
-elsif ARGV[0] == 'clean'
- puts "cleaning auto-generated flows..."
- # string hackery to generate the same filenames the flow generators do
- pkg = File.expand_path($0).split('/')[-2]
- Dir.glob("#{pkg_path}/flows/*.flow").each do |f|
- f = f.split('/')[-1]
- f[-5,:end] = ''
- puts "deleting auto-generated flows for flow #{f}"
- `rm #{pkg_path}/flows/python/#{pkg}/#{f}.py` if File.exist? "#{pkg_path}/flows/python/#{pkg}/#{f}.py"
- `rm #{pkg_path}/flows/python/#{pkg}/#{f}.pyc` if File.exist? "#{pkg_path}/flows/python/#{pkg}/#{f}.pyc"
- `rm #{pkg_path}/flows/ruby/#{pkg}/Flow#{f}.rb` if File.exist? "#{pkg_path}/flows/ruby/#{pkg}/Flow#{f}.rb"
- end
- `rm #{pkg_path}/flows/python/#{pkg}/__init__.py` if File.exist? "#{pkg_path}/flows/python/#{pkg}/__init__.py"
- `rm #{pkg_path}/flows/python/#{pkg}/__init__.pyc` if File.exist? "#{pkg_path}/flows/python/#{pkg}/__init__.pyc"
-else
- puts "unknown parameter: #{ARGV[0]}"
-end
Copied: pkg/branches/rosbus/unported/exploreGraph/rosbuild (from rev 231, pkg/branches/rosbus/exploreGraph/rosbuild)
===================================================================
--- pkg/branches/rosbus/unported/exploreGraph/rosbuild (rev 0)
+++ pkg/branches/rosbus/unported/exploreGraph/rosbuild 2008-04-29 23:03:09 UTC (rev 232)
@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+if !ENV['ROS_ROOT']
+ puts "aaaaaaa! The ROS_ROOT environment variable is not set."
+ puts "Navigate to your ROS_ROOT directory and run ./set_ros_root"
+ puts "(alternatively, you can do this in your .bashrc file"
+ exit
+end
+
+pkg_path = File.expand_path($0).split('/')
+pkg_path = pkg_path[0,pkg_path.length-1].join('/')
+
+if ARGV.length == 0 || ARGV[0] == 'update'
+ puts "generating flows..."
+ # look up the latest versions of rosrb and rospy
+ rosrb = `#{ENV['ROS_ROOT']}/rospack latest rosrb`.chomp
+ rospy = `#{ENV['ROS_ROOT']}/rospack latest rospy`.chomp
+ puts `#{rospy}/scripts/flowgen_py #{pkg_path}/flows/*.flow`
+ puts `#{rosrb}/scripts/flowgen_rb #{pkg_path}/flows/*.flow`
+elsif ARGV[0] == 'clean'
+ puts "cleaning auto-generated flows..."
+ # string hackery to generate the same filenames the flow generators do
+ pkg = File.expand_path($0).split('/')[-2]
+ Dir.glob("#{pkg_path}/flows/*.flow").each do |f|
+ f = f.split('/')[-1]
+ f[-5,:end] = ''
+ puts "deleting auto-generated flows for flow #{f}"
+ `rm #{pkg_path}/flows/python/#{pkg}/#{f}.py` if File.exist? "#{pkg_path}/flows/python/#{pkg}/#{f}.py"
+ `rm #{pkg_path}/flows/python/#{pkg}/#{f}.pyc` if File.exist? "#{pkg_path}/flows/python/#{pkg}/#{f}.pyc"
+ `rm #{pkg_path}/flows/ruby/#{pkg}/Flow#{f}.rb` if File.exist? "#{pkg_path}/flows/ruby/#{pkg}/Flow#{f}.rb"
+ end
+ `rm #{pkg_path}/flows/python/#{pkg}/__init__.py` if File.exist? "#{pkg_path}/flows/python/#{pkg}/__init__.py"
+ `rm #{pkg_path}/flows/python/#{pkg}/__init__.pyc` if File.exist? "#{pkg_path}/flows/python/#{pkg}/__init__.pyc"
+else
+ puts "unknown parameter: #{ARGV[0]}"
+end
Copied: pkg/branches/rosbus/unported/exploreGraph/src (from rev 231, pkg/branches/rosbus/exploreGraph/src)
Copied: pkg/branches/rosbus/unported/gmapping (from rev 229, pkg/branches/rosbus/gmapping)
Deleted: pkg/branches/rosbus/unported/gmapping/Makefile
===================================================================
--- pkg/branches/rosbus/gmapping/Makefile 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/gmapping/Makefile 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,21 +0,0 @@
--include ./global.mk
-
-ifeq ($(CARMENSUPPORT),1)
-SUBDIRS=utils sensor log configfile scanmatcher carmenwrapper gridfastslam gui gfs-carmen
-else
-ifeq ($(PLAYERSUPPORT),1)
-SUBDIRS=utils sensor log configfile scanmatcher gridfastslam playerwrapper gui
-else
-ifeq ($(MACOSX),1)
-SUBDIRS=utils sensor log configfile scanmatcher gridfastslam
-else
-SUBDIRS=utils sensor log configfile scanmatcher gridfastslam gui
-endif
-endif
-endif
-
-LDFLAGS+=
-CPPFLAGS+= -I../sensor
-
--include ./build_tools/Makefile.subdirs
-
Copied: pkg/branches/rosbus/unported/gmapping/Makefile (from rev 231, pkg/branches/rosbus/gmapping/Makefile)
===================================================================
--- pkg/branches/rosbus/unported/gmapping/Makefile (rev 0)
+++ pkg/branches/rosbus/unported/gmapping/Makefile 2008-04-29 23:03:09 UTC (rev 232)
@@ -0,0 +1,21 @@
+-include ./global.mk
+
+ifeq ($(CARMENSUPPORT),1)
+SUBDIRS=utils sensor log configfile scanmatcher carmenwrapper gridfastslam gui gfs-carmen
+else
+ifeq ($(PLAYERSUPPORT),1)
+SUBDIRS=utils sensor log configfile scanmatcher gridfastslam playerwrapper gui
+else
+ifeq ($(MACOSX),1)
+SUBDIRS=utils sensor log configfile scanmatcher gridfastslam
+else
+SUBDIRS=utils sensor log configfile scanmatcher gridfastslam gui
+endif
+endif
+endif
+
+LDFLAGS+=
+CPPFLAGS+= -I../sensor
+
+-include ./build_tools/Makefile.subdirs
+
Deleted: pkg/branches/rosbus/unported/gmapping/TODO.txt
===================================================================
--- pkg/branches/rosbus/gmapping/TODO.txt 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/gmapping/TODO.txt 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,21 +0,0 @@
-TODO-List for gmapping (and partly explore)
---------------------------------------------
-
-open:
------
-
-1. implement a working(!) ancestry tree
-
-2. compute trajectory uncertainty based on the
- ancestry tree formula
-
-3. possibility to choose the way the pose uncertainty
- for a particle set is computed (grid vs set of
- gaussians)
-
-4. Fix the NAN Problem with the pose uncertainty with gaussians
-
-done:
------
-
-(move the done stuff down here)
\ No newline at end of file
Copied: pkg/branches/rosbus/unported/gmapping/TODO.txt (from rev 231, pkg/branches/rosbus/gmapping/TODO.txt)
===================================================================
--- pkg/branches/rosbus/unported/gmapping/TODO.txt (rev 0)
+++ pkg/branches/rosbus/unported/gmapping/TODO.txt 2008-04-29 23:03:09 UTC (rev 232)
@@ -0,0 +1,21 @@
+TODO-List for gmapping (and partly explore)
+--------------------------------------------
+
+open:
+-----
+
+1. implement a working(!) ancestry tree
+
+2. compute trajectory uncertainty based on the
+ ancestry tree formula
+
+3. possibility to choose the way the pose uncertainty
+ for a particle set is computed (grid vs set of
+ gaussians)
+
+4. Fix the NAN Problem with the pose uncertainty with gaussians
+
+done:
+-----
+
+(move the done stuff down here)
\ No newline at end of file
Copied: pkg/branches/rosbus/unported/gmapping/bin (from rev 231, pkg/branches/rosbus/gmapping/bin)
Copied: pkg/branches/rosbus/unported/gmapping/build_tools (from rev 231, pkg/branches/rosbus/gmapping/build_tools)
Copied: pkg/branches/rosbus/unported/gmapping/carmenwrapper (from rev 231, pkg/branches/rosbus/gmapping/carmenwrapper)
Copied: pkg/branches/rosbus/unported/gmapping/configfile (from rev 231, pkg/branches/rosbus/gmapping/configfile)
Deleted: pkg/branches/rosbus/unported/gmapping/configure
===================================================================
--- pkg/branches/rosbus/gmapping/configure 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/gmapping/configure 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,256 +0,0 @@
-#!/bin/bash
-#if [ "$UID" = 0 ]; then echo "Please don't run configure as root"; exit 1; fi
-
-LINUX=0
-MACOSX=0
-
-if [ `uname` = "Linux" ]; then
- LINUX=1
- OSTYPE=LINUX
- CPPFLAGS="-DLINUX"
-fi
-if [ `uname` = "Darwin" ]; then
- MACOSX=1
- CPPFLAGS="-DMACOSX"
- OSTYPE=MACOSX
-fi
-
-if [ ! $CXX ]; then
- echo "No 'CXX' environment variable found, using g++.";
- CXX="g++"
-fi
-
-if [ ! $CC ]; then
- echo "No 'CC' environment variable found, using gcc.";
- CC="gcc"
-fi
-
-if [ ! -x `which $CXX` ]; then
- echo "Can't execute C++ compiler '$CXX'.";
- exit 1;
-else
- echo "Using C++ compiler: $CXX"
-fi
-
-if [ ! -x `which $CC` ]; then
- echo "Can't execute C++ compiler '$CC'.";
- exit 1;
-else
- echo "Using C compiler: $CC"
-fi
-
-GCC_VERSION=`$CXX --version`
-
-echo -n "Checking for Qt 3.x ... "
-for GUESS_QTDIR in `ls /usr/lib/ | grep -E "qt3|qt-3"`; do
- if [ -d /usr/lib/$GUESS_QTDIR/include -a -d /usr/lib/$GUESS_QTDIR/lib -a -f /usr/lib/$GUESS_QTDIR/bin/moc ]; then
- QT_INCLUDE="-I /usr/lib/$GUESS_QTDIR/include"
- QT_LIB="-L /usr/lib/$GUESS_QTDIR/lib -lqt-mt" ;
- MOC="/usr/lib/$GUESS_QTDIR/bin/moc" ;
- fi ;
-done ;
-if [ ! "$QT_INCLUDE" ]; then
- echo -e "\n\n*** Qt 3.x not found. I'll make some educated guesses. If this doesn't work, please set QT_INCLUDE, QT_LIB, MOC by hand in the file global.mk.\n\a"
- #exit 1
- QT_INCLUDE="-I/usr/include/qt3";
- QT_LIB="-lqt-mt" ;
- MOC="moc" ;
-else
- echo "Ok" ;
-fi
-
-ARIASUPPORT="0"
-echo -n "Checking for Aria libs "
-for GUESS_ARIADIR in `ls /usr/local/ | grep -E "Aria"`; do
- if [ -d /usr/local/$GUESS_ARIADIR/include -a -d /usr/local/$GUESS_ARIADIR/lib ]; then
- ARIA_INCLUDE="-I/usr/local/$GUESS_ARIADIR/include"
- ARIA_LIB="-L/usr/local/$GUESS_ARIADIR/lib -lAria"
- ARIASUPPORT="1"
- fi ;
-done ;
-
-if [ ! "$ARIA_INCLUDE" ]; then
- echo -e "\n\n*** ARIA not found, please set ARIA_INCLUDE and ARIA_LIB by hand\n\a"
-else
- echo "Ok" ;
-fi
-
-#echo -n "Checking for Gsl libs "
-#if [ "$OSTYPE" = "LINUX" ]; then
-# GSL_LIB="-lgsl -lgslcblas"
-# GSL_INCLUDE="-I/usr/include/"
-#fi
-#if [ "$OSTYPE" = "MACOSX" ]; then
-# GSL_LIB="-L/sw/lib -lgsl -lgslcblas"
-# GSL_INCLUDE="-I/sw/include"
-#fi
-#
-#if [ ! "$GSL_INCLUDE" ]; then
-# echo -e "\n\n*** GSL not found, please set GSL_INCLUDE and GSL_LIB by hand\n\a"
-#else
-# echo "Ok" ;
-#fi
-
-
-# echo -n "Checking for KDE 3.x includes ... "
-# for GUESS_KDE_INCLUDE in /usr/include/kde /usr/include/kde3 /opt/kde3/include /opt/kde/include; do
-# if [ -d $GUESS_KDE_INCLUDE ]; then
-# KDE_INCLUDE="-I$GUESS_KDE_INCLUDE"
-# fi ;
-# done ;
-#
-# if [ ! "$KDE_INCLUDE" ]; then
-# echo -e "\n\n*** KDE 3.x includes not found please set KDE_INCLUDE by hand\n\a"
-# exit 1
-# else
-# echo "Ok" ;
-# fi
-#
-# echo -n "Checking for KDE 3.x libs ... "
-# for GUESS_KDE_LIB in /usr/lib/kde3 /opt/kde3/lib; do
-# if [ -d $GUESS_KDE_LIB ]; then
-# KDE_LIB="-L$GUESS_KDE_LIB -lkdeui"
-# fi ;
-# done ;
-#
-# if [ ! "$KDE_LIB" ]; then
-# echo -e "\n\n*** KDE 3.x libs not found please set KDE_LIBS by hand\n\a"
-# exit 1
-# else
-# echo "Ok" ;
-# fi
-
-
-# echo -n "Checking for uic ... "
-# for GUESS_UIC in `ls /usr/bin/ | grep -E "uic|uic3"`; do
-# if [ -f /usr/bin/$GUESS_UIC ]; then
-# UIC=$GUESS_UIC;
-# fi ;
-# done ;
-#
-# if [ ! "$UIC" ]; then
-# echo -e "\n\n*** uic not found please set UIC by hand\n\a"
-# exit 1
-# else
-# echo "Ok" ;
-# fi
-
-MAPPING_ROOT=`pwd`
-
-
-BINDIR=$MAPPING_ROOT/bin
-echo -n "Checking bin directory $BINDIR ... "
-if [ ! -d $BINDIR ]; then
- mkdir $BINDIR
- echo "created."
-else
- echo "Ok."
-fi
-
-LIBDIR=$MAPPING_ROOT/lib
-echo -n "Checking lib directory $LIBDIR ... "
-if [ ! -d $LIBDIR ]; then
- mkdir $LIBDIR
- echo "created."
-else
- echo "Ok."
-fi
-
-CARMENFLAG=""
-CARMENSUPPORT="0"
-CARMEN_LIBS="libnavigator_interface.a libipc.a librobot_interface.a liblaser_interface.a libsimulator_interface.a liblocalize_interface.a libreadlog.a libwritelog.a libglobal.a libipc.a"
-if [ ! "$CARMEN_HOME" ]; then
- echo -e "Carmen NOT FOUND."
- echo -e "If you have a carmen version installed please set the"
- echo -e "CARMEN_HOME variable to the carmen path."
-else
- if [ -d $CARMEN_HOME ]; then
- echo -e "carmen found in $CARMEN_HOME, enabling support"
- CARMENFLAG="-DCARMEN_SUPPORT"
- echo -e "generating shared objects"
- for CARMEN_OBJECT in $CARMEN_LIBS ; do
- if [ -f $CARMEN_HOME/lib/$CARMEN_OBJECT ]; then
- cp $CARMEN_HOME/lib/$CARMEN_OBJECT $LIBDIR
- ./build_tools/generate_shared_object $LIBDIR/$CARMEN_OBJECT
- rm $LIBDIR/$CARMEN_OBJECT
- else
- echo -e "Compile carmen first "$CARMEN_HOME/lib/$CARMEN_OBJECT" not found"
- exit -1
- fi
- done;
- CARMENSUPPORT="1"
- else
- echo -e "CARMEN_HOME=$CARMEN_HOME does not exist, disabling support\n"
- fi
-fi
-
-PLAYERFLAG=""
-PLAYERSUPPORT="0"
-echo -n "Checking for player (pkg-config --libs playercore)..."
-playerlibs=`pkg-config --libs playercore`
-if [ -z "$playerlibs" ]; then
- echo -e "Player not found."
-else
- echo -e "Player found."
- PLAYERFLAG="-DPLAYER_SUPPORT"
- PLAYERSUPPORT="1"
-fi
-
-
-CONFIG=global.mk
-rm -f $CONFIG
-
-cat << EOF > $CONFIG
-### You should not need to change anything below.
-LINUX=$LINUX
-MACOSX=$MACOSX
-
-# Compilers
-CC=$CC
-CXX=$CXX
-
-# Paths
-MAPPING_ROOT=$MAPPING_ROOT
-LIBDIR=$LIBDIR
-BINDIR=$BINDIR
-
-# Build tools
-PRETTY=$MAPPING_ROOT/build_tools/pretty_compiler
-MESSAGE=$MAPPING_ROOT/build_tools/message
-TESTLIB=$MAPPING_ROOT/build_tools/testlib
-
-# QT support
-MOC=$MOC
-QT_LIB=$QT_LIB
-QT_INCLUDE=$QT_INCLUDE
-
-# ARIA support
-ARIA_LIB=$ARIA_LIB
-ARIA_INCLUDE=$ARIA_INCLUDE
-
-
-# # KDE support
-# KDE_LIB=$KDE_LIB
-# KDE_INCLUDE=$KDE_INCLUDE
-# UIC=$UIC
-
-# Generic makefiles
-MAKEFILE_GENERIC=$MAPPING_ROOT/build_tools/Makefile.generic-shared-object
-MAKEFILE_APP=$MAPPING_ROOT/build_tools/Makefile.app
-MAKEFILE_SUBDIRS=$MAPPING_ROOT/build_tools/Makefile.subdirs
-
-
-# Flags
-CPPFLAGS+=$CPPFLAGS -I$MAPPING_ROOT $CARMENFLAG $PLAYERFLAG
-CXXFLAGS+=$CXXFLAGS
-LDFLAGS+=$LDFLAGS -Xlinker -rpath $MAPPING_ROOT/lib
-CARMENSUPPORT=$CARMENSUPPORT
-PLAYERSUPPORT=$PLAYERSUPPORT
-ARIASUPPORT=$ARIASUPPORT
-
-$OTHER
-
-include $MAPPING_ROOT/manual.mk
-
-EOF
-
Copied: pkg/branches/rosbus/unported/gmapping/configure (from rev 231, pkg/branches/rosbus/gmapping/configure)
===================================================================
--- pkg/branches/rosbus/unported/gmapping/configure (rev 0)
+++ pkg/branches/rosbus/unported/gmapping/configure 2008-04-29 23:03:09 UTC (rev 232)
@@ -0,0 +1,256 @@
+#!/bin/bash
+#if [ "$UID" = 0 ]; then echo "Please don't run configure as root"; exit 1; fi
+
+LINUX=0
+MACOSX=0
+
+if [ `uname` = "Linux" ]; then
+ LINUX=1
+ OSTYPE=LINUX
+ CPPFLAGS="-DLINUX"
+fi
+if [ `uname` = "Darwin" ]; then
+ MACOSX=1
+ CPPFLAGS="-DMACOSX"
+ OSTYPE=MACOSX
+fi
+
+if [ ! $CXX ]; then
+ echo "No 'CXX' environment variable found, using g++.";
+ CXX="g++"
+fi
+
+if [ ! $CC ]; then
+ echo "No 'CC' environment variable found, using gcc.";
+ CC="gcc"
+fi
+
+if [ ! -x `which $CXX` ]; then
+ echo "Can't execute C++ compiler '$CXX'.";
+ exit 1;
+else
+ echo "Using C++ compiler: $CXX"
+fi
+
+if [ ! -x `which $CC` ]; then
+ echo "Can't execute C++ compiler '$CC'.";
+ exit 1;
+else
+ echo "Using C compiler: $CC"
+fi
+
+GCC_VERSION=`$CXX --version`
+
+echo -n "Checking for Qt 3.x ... "
+for GUESS_QTDIR in `ls /usr/lib/ | grep -E "qt3|qt-3"`; do
+ if [ -d /usr/lib/$GUESS_QTDIR/include -a -d /usr/lib/$GUESS_QTDIR/lib -a -f /usr/lib/$GUESS_QTDIR/bin/moc ]; then
+ QT_INCLUDE="-I /usr/lib/$GUESS_QTDIR/include"
+ QT_LIB="-L /usr/lib/$GUESS_QTDIR/lib -lqt-mt" ;
+ MOC="/usr/lib/$GUESS_QTDIR/bin/moc" ;
+ fi ;
+done ;
+if [ ! "$QT_INCLUDE" ]; then
+ echo -e "\n\n*** Qt 3.x not found. I'll make some educated guesses. If this doesn't work, please set QT_INCLUDE, QT_LIB, MOC by hand in the file global.mk.\n\a"
+ #exit 1
+ QT_INCLUDE="-I/usr/include/qt3";
+ QT_LIB="-lqt-mt" ;
+ MOC="moc" ;
+else
+ echo "Ok" ;
+fi
+
+ARIASUPPORT="0"
+echo -n "Checking for Aria libs "
+for GUESS_ARIADIR in `ls /usr/local/ | grep -E "Aria"`; do
+ if [ -d /usr/local/$GUESS_ARIADIR/include -a -d /usr/local/$GUESS_ARIADIR/lib ]; then
+ ARIA_INCLUDE="-I/usr/local/$GUESS_ARIADIR/include"
+ ARIA_LIB="-L/usr/local/$GUESS_ARIADIR/lib -lAria"
+ ARIASUPPORT="1"
+ fi ;
+done ;
+
+if [ ! "$ARIA_INCLUDE" ]; then
+ echo -e "\n\n*** ARIA not found, please set ARIA_INCLUDE and ARIA_LIB by hand\n\a"
+else
+ echo "Ok" ;
+fi
+
+#echo -n "Checking for Gsl libs "
+#if [ "$OSTYPE" = "LINUX" ]; then
+# GSL_LIB="-lgsl -lgslcblas"
+# GSL_INCLUDE="-I/usr/include/"
+#fi
+#if [ "$OSTYPE" = "MACOSX" ]; then
+# GSL_LIB="-L/sw/lib -lgsl -lgslcblas"
+# GSL_INCLUDE="-I/sw/include"
+#fi
+#
+#if [ ! "$GSL_INCLUDE" ]; then
+# echo -e "\n\n*** GSL not found, please set GSL_INCLUDE and GSL_LIB by hand\n\a"
+#else
+# echo "Ok" ;
+#fi
+
+
+# echo -n "Checking for KDE 3.x includes ... "
+# for GUESS_KDE_INCLUDE in /usr/include/kde /usr/include/kde3 /opt/kde3/include /opt/kde/include; do
+# if [ -d $GUESS_KDE_INCLUDE ]; then
+# KDE_INCLUDE="-I$GUESS_KDE_INCLUDE"
+# fi ;
+# done ;
+#
+# if [ ! "$KDE_INCLUDE" ]; then
+# echo -e "\n\n*** KDE 3.x includes not found please set KDE_INCLUDE by hand\n\a"
+# exit 1
+# else
+# echo "Ok" ;
+# fi
+#
+# echo -n "Checking for KDE 3.x libs ... "
+# for GUESS_KDE_LIB in /usr/lib/kde3 /opt/kde3/lib; do
+# if [ -d $GUESS_KDE_LIB ]; then
+# KDE_LIB="-L$GUESS_KDE_LIB -lkdeui"
+# fi ;
+# done ;
+#
+# if [ ! "$KDE_LIB" ]; then
+# echo -e "\n\n*** KDE 3.x libs not found please set KDE_LIBS by hand\n\a"
+# exit 1
+# else
+# echo "Ok" ;
+# fi
+
+
+# echo -n "Checking for uic ... "
+# for GUESS_UIC in `ls /usr/bin/ | grep -E "uic|uic3"`; do
+# if [ -f /usr/bin/$GUESS_UIC ]; then
+# UIC=$GUESS_UIC;
+# fi ;
+# done ;
+#
+# if [ ! "$UIC" ]; then
+# echo -e "\n\n*** uic not found please set UIC by hand\n\a"
+# exit 1
+# else
+# echo "Ok" ;
+# fi
+
+MAPPING_ROOT=`pwd`
+
+
+BINDIR=$MAPPING_ROOT/bin
+echo -n "Checking bin directory $BINDIR ... "
+if [ ! -d $BINDIR ]; then
+ mkdir $BINDIR
+ echo "created."
+else
+ echo "Ok."
+fi
+
+LIBDIR=$MAPPING_ROOT/lib
+echo -n "Checking lib directory $LIBDIR ... "
+if [ ! -d $LIBDIR ]; then
+ mkdir $LIBDIR
+ echo "created."
+else
+ echo "Ok."
+fi
+
+CARMENFLAG=""
+CARMENSUPPORT="0"
+CARMEN_LIBS="libnavigator_interface.a libipc.a librobot_interface.a liblaser_interface.a libsimulator_interface.a liblocalize_interface.a libreadlog.a libwritelog.a libglobal.a libipc.a"
+if [ ! "$CARMEN_HOME" ]; then
+ echo -e "Carmen NOT FOUND."
+ echo -e "If you have a carmen version installed please set the"
+ echo -e "CARMEN_HOME variable to the carmen path."
+else
+ if [ -d $CARMEN_HOME ]; then
+ echo -e "carmen found in $CARMEN_HOME, enabling support"
+ CARMENFLAG="-DCARMEN_SUPPORT"
+ echo -e "generating shared objects"
+ for CARMEN_OBJECT in $CARMEN_LIBS ; do
+ if [ -f $CARMEN_HOME/lib/$CARMEN_OBJECT ]; then
+ cp $CARMEN_HOME/lib/$CARMEN_OBJECT $LIBDIR
+ ./build_tools/generate_shared_object $LIBDIR/$CARMEN_OBJECT
+ rm $LIBDIR/$CARMEN_OBJECT
+ else
+ echo -e "Compile carmen first "$CARMEN_HOME/lib/$CARMEN_OBJECT" not found"
+ exit -1
+ fi
+ done;
+ CARMENSUPPORT="1"
+ else
+ echo -e "CARMEN_HOME=$CARMEN_HOME does not exist, disabling support\n"
+ fi
+fi
+
+PLAYERFLAG=""
+PLAYERSUPPORT="0"
+echo -n "Checking for player (pkg-config --libs playercore)..."
+playerlibs=`pkg-config --libs playercore`
+if [ -z "$playerlibs" ]; then
+ echo -e "Player not found."
+else
+ echo -e "Player found."
+ PLAYERFLAG="-DPLAYER_SUPPORT"
+ PLAYERSUPPORT="1"
+fi
+
+
+CONFIG=global.mk
+rm -f $CONFIG
+
+cat << EOF > $CONFIG
+### You should not need to change anything below.
+LINUX=$LINUX
+MACOSX=$MACOSX
+
+# Compilers
+CC=$CC
+CXX=$CXX
+
+# Paths
+MAPPING_ROOT=$MAPPING_ROOT
+LIBDIR=$LIBDIR
+BINDIR=$BINDIR
+
+# Build tools
+PRETTY=$MAPPING_ROOT/build_tools/pretty_compiler
+MESSAGE=$MAPPING_ROOT/build_tools/message
+TESTLIB=$MAPPING_ROOT/build_tools/testlib
+
+# QT support
+MOC=$MOC
+QT_LIB=$QT_LIB
+QT_INCLUDE=$QT_INCLUDE
+
+# ARIA support
+ARIA_LIB=$ARIA_LIB
+ARIA_INCLUDE=$ARIA_INCLUDE
+
+
+# # KDE support
+# KDE_LIB=$KDE_LIB
+# KDE_INCLUDE=$KDE_INCLUDE
+# UIC=$UIC
+
+# Generic makefiles
+MAKEFILE_GENERIC=$MAPPING_ROOT/build_tools/Makefile.generic-shared-object
+MAKEFILE_APP=$MAPPING_ROOT/build_tools/Makefile.app
+MAKEFILE_SUBDIRS=$MAPPING_ROOT/build_tools/Makefile.subdirs
+
+
+# Flags
+CPPFLAGS+=$CPPFLAGS -I$MAPPING_ROOT $CARMENFLAG $PLAYERFLAG
+CXXFLAGS+=$CXXFLAGS
+LDFLAGS+=$LDFLAGS -Xlinker -rpath $MAPPING_ROOT/lib
+CARMENSUPPORT=$CARMENSUPPORT
+PLAYERSUPPORT=$PLAYERSUPPORT
+ARIASUPPORT=$ARIASUPPORT
+
+$OTHER
+
+include $MAPPING_ROOT/manual.mk
+
+EOF
+
Copied: pkg/branches/rosbus/unported/gmapping/docs (from rev 231, pkg/branches/rosbus/gmapping/docs)
Copied: pkg/branches/rosbus/unported/gmapping/gfs-carmen (from rev 231, pkg/branches/rosbus/gmapping/gfs-carmen)
Copied: pkg/branches/rosbus/unported/gmapping/grid (from rev 231, pkg/branches/rosbus/gmapping/grid)
Copied: pkg/branches/rosbus/unported/gmapping/gridfastslam (from rev 231, pkg/branches/rosbus/gmapping/gridfastslam)
Copied: pkg/branches/rosbus/unported/gmapping/gui (from rev 231, pkg/branches/rosbus/gmapping/gui)
Copied: pkg/branches/rosbus/unported/gmapping/ini (from rev 231, pkg/branches/rosbus/gmapping/ini)
Copied: pkg/branches/rosbus/unported/gmapping/lib (from rev 231, pkg/branches/rosbus/gmapping/lib)
Copied: pkg/branches/rosbus/unported/gmapping/log (from rev 231, pkg/branches/rosbus/gmapping/log)
Deleted: pkg/branches/rosbus/unported/gmapping/manual.mk
===================================================================
--- pkg/branches/rosbus/gmapping/manual.mk 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/gmapping/manual.mk 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,7 +0,0 @@
-#CPPFLAGS+= -DNDEBUG
-CXXFLAGS+= -O3 -Wall -ffast-math
-#CXXFLAGS+= -g -O0 -Wall
-PROFILE= false
-
-
-
Copied: pkg/branches/rosbus/unported/gmapping/manual.mk (from rev 231, pkg/branches/rosbus/gmapping/manual.mk)
===================================================================
--- pkg/branches/rosbus/unported/gmapping/manual.mk (rev 0)
+++ pkg/branches/rosbus/unported/gmapping/manual.mk 2008-04-29 23:03:09 UTC (rev 232)
@@ -0,0 +1,7 @@
+#CPPFLAGS+= -DNDEBUG
+CXXFLAGS+= -O3 -Wall -ffast-math
+#CXXFLAGS+= -g -O0 -Wall
+PROFILE= false
+
+
+
Deleted: pkg/branches/rosbus/unported/gmapping/manual.mk-template
===================================================================
--- pkg/branches/rosbus/gmapping/manual.mk-template 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/gmapping/manual.mk-template 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,7 +0,0 @@
-#CPPFLAGS+= -DNDEBUG
-#CXXFLAGS+= -O3 -Wall
-CXXFLAGS+= -g -O0 -Wall
-PROFILE= false
-
-
-
Copied: pkg/branches/rosbus/unported/gmapping/manual.mk-template (from rev 231, pkg/branches/rosbus/gmapping/manual.mk-template)
===================================================================
--- pkg/branches/rosbus/unported/gmapping/manual.mk-template (rev 0)
+++ pkg/branches/rosbus/unported/gmapping/manual.mk-template 2008-04-29 23:03:09 UTC (rev 232)
@@ -0,0 +1,7 @@
+#CPPFLAGS+= -DNDEBUG
+#CXXFLAGS+= -O3 -Wall
+CXXFLAGS+= -g -O0 -Wall
+PROFILE= false
+
+
+
Copied: pkg/branches/rosbus/unported/gmapping/particlefilter (from rev 231, pkg/branches/rosbus/gmapping/particlefilter)
Copied: pkg/branches/rosbus/unported/gmapping/playerwrapper (from rev 231, pkg/branches/rosbus/gmapping/playerwrapper)
Copied: pkg/branches/rosbus/unported/gmapping/scanmatcher (from rev 231, pkg/branches/rosbus/gmapping/scanmatcher)
Copied: pkg/branches/rosbus/unported/gmapping/sensor (from rev 231, pkg/branches/rosbus/gmapping/sensor)
Deleted: pkg/branches/rosbus/unported/gmapping/setlibpath
===================================================================
--- pkg/branches/rosbus/gmapping/setlibpath 2008-04-29 22:32:30 UTC (rev 229)
+++ pkg/branches/rosbus/unported/gmapping/setlibpath 2008-04-29 23:03:09 UTC (rev 232)
@@ -1,35 +0,0 @@
-# --- !/bin/bash
-
-LIBDIR="`pwd`/lib"
-
-echo "Adding $LIBDIR to library path ... "
-
-
-if [ "$LD_LIBRARY_PATH" ]; then
- echo "Checking your library path ... "
- #echo -e "using $LD_LIBRARY_PATH" ;
- OLDIFS=$IFS ;
- IFS="$IFS:" ;
- LIB="" ;
- for GUESS_USERDIR in $LD_LIBRARY_PATH ; do
- echo -e -n "\t$GUESS_USERDIR ... " ;
- if [ "$LIBDIR" == "$GUESS_USERDIR" ] ; then
- LIB="$GUESS_USERDIR" ;
- echo "Ok" ;
- else
- echo "skipping" ;
- fi ;
- done ;
- IFS="$OLDIFS" ;
- if [ "$LIB" == "" ] ; then
- echo -e -n "\tAdding $LIBDIR to your library path ... " ;
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBDIR" ;
- echo "Ok" ;
- fi ;
-else
- echo -e "LD_LIBRARY_PATH undefined, using $LIBDIR" ;
- LD_LIBRARY_PATH="$LIBDIR"
-fi
-
-export LD_LIBRARY_PATH ;
-
Copied: pkg/branches/rosbus/unported/gmapping/setlibpath (from rev 231, pkg/branches/rosbus/gmapping/setlibpath)
===================================================================
--- pkg/branches/rosbus/unported/gmapping/setlibpath (rev 0)
+++ pkg/branches/rosbus/unported/gmapping/setlibpath 2008-04-29 23:03:09 UTC (rev 232)
@@ -0,0 +1,35 @@
+# --- !/bin/bash
+
+LIBDIR="`pwd`/lib"
+
+echo "Adding $LIBDIR to library path ... "
+
+
+if [ "$LD_LIBRARY_PATH" ]; then
+ echo "Checking your library path ... "
+ #echo -e "using $LD_LIBRARY_PATH" ;
+ OLDIFS=$IFS ;
+ IFS="$IFS:" ;
+ LIB="" ;
+ for GUESS_USERDIR in $LD_LIBRARY_PATH ; do
+ echo -e -n "\t$GUESS_USERDIR ... " ;
+ if [ "$LIBDIR" == "$GUESS_USERDIR" ] ; then
+ LIB="$GUESS_USERDIR" ;
+ echo "Ok" ;
+ else
+ echo "skipping" ;
+ fi ;
+ done ;
+ IFS="$OLDIFS" ;
+ if [ "$LIB" == "" ] ; then
+ echo -e -n "\tAdding $LIBDIR to your library path ... " ;
+ LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBDIR" ;
+ echo "Ok" ;
+ fi ;
+else
+ echo -e "LD_LIBRARY_PATH undefined, using $LIBDIR" ;
+ LD_LIBRARY_PATH="$LIBDIR"
+fi
+
+export LD_LIBRARY_PATH ;
+
Copied: pkg/branches/rosbus/unported/gmapping/utils (from rev 231, pkg/branches/rosbus/gmapping/utils)
Copied: pkg/branches/rosbus/unported/linuxjoystick_player (from rev 231, pkg/branches/rosbus/linuxjoystick_player)
Copied: pkg/branches/rosbus/unported/range_flows (from rev 231, pkg/branches/rosbus/range_flows)
Copied: pkg/branches/rosbus/unported/simple_sdl_gui (from rev 231, pkg/branches/rosbus/simple_sdl_gui)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
