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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 781
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=781&view=rev
Author:   gerkey
Date:     2008-06-12 13:11:40 -0700 (Thu, 12 Jun 2008)

Log Message:
-----------
moved flatland into simulators

Modified Paths:
--------------
    pkg/trunk/demos/2dnav-stage/2dnav-stage.xml
    pkg/trunk/visualization/pr2_gui/Makefile

Added Paths:
-----------
    pkg/trunk/simulators/flatland/

Removed Paths:
-------------
    pkg/trunk/nav/sim/flatland/

Modified: pkg/trunk/demos/2dnav-stage/2dnav-stage.xml
===================================================================

--- pkg/trunk/demos/2dnav-stage/2dnav-stage.xml	2008-06-12 20:09:55 UTC (rev 780)
+++ pkg/trunk/demos/2dnav-stage/2dnav-stage.xml	2008-06-12 20:11:40 UTC (rev 781)
@@ -5,7 +5,7 @@
     <node pkg="map_server" type="map_server" args="willow-full.png 0.1" respawn="false" />
     <node pkg="amcl_player" type="amcl_player" respawn="false" />
     <node pkg="wavefront_player" type="wavefront_player" respawn="false" />
-    <node pkg="nav_view" type="nav_view" respawn="false" />
+    <!-- node pkg="nav_view" type="nav_view" respawn="true" /-->
   </ns>
 </launch>
 

Copied: pkg/trunk/simulators/flatland (from rev 778, pkg/trunk/nav/sim/flatland)

Modified: pkg/trunk/visualization/pr2_gui/Makefile
===================================================================
--- pkg/trunk/visualization/pr2_gui/Makefile	2008-06-12 20:09:55 UTC (rev 780)
+++ pkg/trunk/visualization/pr2_gui/Makefile	2008-06-12 20:11:40 UTC (rev 781)
@@ -1,29 +1,32 @@
 #############################################################################
 # Makefile for building: bin/pr2_gui
-# Generated by qmake (2.01a) (Qt 4.3.4) on: Tue Jun 10 15:04:20 2008
+# Generated by qmake (2.01a) (Qt 4.2.3) on: Wed Jun 11 16:22:05 2008
 # Project:  pr2_gui.pro
 # Template: app
-# Command: /usr/bin/qmake -unix -o Makefile pr2_gui.pro
+# Command: /usr/bin/qmake-qt4 -unix -o Makefile pr2_gui.pro
 #############################################################################
 
 ####### Compiler, tools and options
 
 CC            = gcc
 CXX           = g++
-DEFINES       = -DQT_SHARED -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
-CFLAGS        = -pipe $(shell rospack export/cpp/cflags pr2_gui) -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS      = -pipe -fpermissive $(shell rospack export/cpp/cflags pr2_gui) -Wall -W -D_REENTRANT $(DEFINES)
+LEX           = flex
+YACC          = yacc
+DEFINES       = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
+CFLAGS        = -pipe $(shell rospack export/cpp/cflags pr2_gui) -Wall -W -D_REENTRANT  $(DEFINES)
+CXXFLAGS      = -pipe $(shell rospack export/cpp/cflags pr2_gui) -Wall -W -D_REENTRANT  $(DEFINES)
+LEXFLAGS      = 
+YACCFLAGS     = -d
 INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtGui -I/usr/include/qt4 -Ibuild -Ibuild
 LINK          = g++
-LFLAGS        = -Wl,--no-undefined
+LFLAGS        = 
 LIBS          = $(SUBLIBS)  -L/usr/lib $(shell rospack export/cpp/lflags pr2_gui) -lQtGui -lQtCore -lpthread
 AR            = ar cqs
 RANLIB        = 
-QMAKE         = /usr/bin/qmake
+QMAKE         = /usr/bin/qmake-qt4
 TAR           = tar -cf
 COMPRESS      = gzip -9f
 COPY          = cp -f
-SED           = sed
 COPY_FILE     = $(COPY)
 COPY_DIR      = $(COPY) -r
 INSTALL_FILE  = install -m 644 -p
@@ -47,8 +50,8 @@
 OBJECTS       = build/launcherimpl.o \
 		build/main.o \
 		build/moc_launcherimpl.o
-DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
-		/usr/share/qt4/mkspecs/common/unix.conf \
+DIST          = /usr/share/qt4/mkspecs/common/unix.conf \
+		/usr/share/qt4/mkspecs/common/g++.conf \
 		/usr/share/qt4/mkspecs/common/linux.conf \
 		/usr/share/qt4/mkspecs/qconfig.pri \
 		/usr/share/qt4/mkspecs/features/qt_functions.prf \
@@ -63,8 +66,6 @@
 		/usr/share/qt4/mkspecs/features/moc.prf \
 		/usr/share/qt4/mkspecs/features/resources.prf \
 		/usr/share/qt4/mkspecs/features/uic.prf \
-		/usr/share/qt4/mkspecs/features/yacc.prf \
-		/usr/share/qt4/mkspecs/features/lex.prf \
 		pr2_gui.pro
 QMAKE_TARGET  = pr2_gui
 DESTDIR       = bin/
@@ -98,8 +99,8 @@
 	@$(CHK_DIR_EXISTS) bin/ || $(MKDIR) bin/ 
 	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
-Makefile: pr2_gui.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
-		/usr/share/qt4/mkspecs/common/unix.conf \
+Makefile: pr2_gui.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/unix.conf \
+		/usr/share/qt4/mkspecs/common/g++.conf \
 		/usr/share/qt4/mkspecs/common/linux.conf \
 		/usr/share/qt4/mkspecs/qconfig.pri \
 		/usr/share/qt4/mkspecs/features/qt_functions.prf \
@@ -113,12 +114,10 @@
 		/usr/share/qt4/mkspecs/features/unix/thread.prf \
 		/usr/share/qt4/mkspecs/features/moc.prf \
 		/usr/share/qt4/mkspecs/features/resources.prf \
-		/usr/share/qt4/mkspecs/features/uic.prf \
-		/usr/share/qt4/mkspecs/features/yacc.prf \
-		/usr/share/qt4/mkspecs/features/lex.prf
+		/usr/share/qt4/mkspecs/features/uic.prf
 	$(QMAKE) -unix -o Makefile pr2_gui.pro
-/usr/share/qt4/mkspecs/common/g++.conf:
 /usr/share/qt4/mkspecs/common/unix.conf:
+/usr/share/qt4/mkspecs/common/g++.conf:
 /usr/share/qt4/mkspecs/common/linux.conf:
 /usr/share/qt4/mkspecs/qconfig.pri:
 /usr/share/qt4/mkspecs/features/qt_functions.prf:
@@ -133,8 +132,6 @@
 /usr/share/qt4/mkspecs/features/moc.prf:
 /usr/share/qt4/mkspecs/features/resources.prf:
 /usr/share/qt4/mkspecs/features/uic.prf:
-/usr/share/qt4/mkspecs/features/yacc.prf:
-/usr/share/qt4/mkspecs/features/lex.prf:
 qmake:  FORCE
 	@$(QMAKE) -unix -o Makefile pr2_gui.pro
 
@@ -143,6 +140,8 @@
 	$(COPY_FILE) --parents $(SOURCES) $(DIST) build/pr2_gui1.0.0/ && $(COPY_FILE) --parents src/launcherimpl.h build/pr2_gui1.0.0/ && $(COPY_FILE) --parents src/launcherimpl.cpp src/main.cpp build/pr2_gui1.0.0/ && $(COPY_FILE) --parents ui/launcher.ui build/pr2_gui1.0.0/ && (cd `dirname build/pr2_gui1.0.0` && $(TAR) pr2_gui1.0.0.tar pr2_gui1.0.0 && $(COMPRESS) pr2_gui1.0.0.tar) && $(MOVE) `dirname build/pr2_gui1.0.0`/pr2_gui1.0.0.tar.gz . && $(DEL_FILE) -r build/pr2_gui1.0.0
 
 
+yaccclean:
+lexclean:
 clean:compiler_clean 
 	-$(DEL_FILE) $(OBJECTS)
 	-$(DEL_FILE) *~ core *.core
@@ -155,6 +154,9 @@
 	-$(DEL_FILE) Makefile
 
 
+/usr/bin/moc-qt4:
+	(cd $(QTDIR)/src/tools/moc && $(MAKE))
+
 mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
@@ -162,9 +164,10 @@
 compiler_moc_header_make_all: build/moc_launcherimpl.cpp
 compiler_moc_header_clean:
 	-$(DEL_FILE) build/moc_launcherimpl.cpp
-build/moc_launcherimpl.cpp: build/ui_launcher.h \
+build/moc_launcherimpl.cpp: ui_launcher.h \
 		src/Vis3d.hh \
-		src/launcherimpl.h
+		src/launcherimpl.h \
+		/usr/bin/moc-qt4
 	/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) src/launcherimpl.h -o build/moc_launcherimpl.cpp
 
 compiler_rcc_make_all:
@@ -180,23 +183,17 @@
 build/ui_launcher.h: ui/launcher.ui
 	/usr/bin/uic-qt4 ui/launcher.ui -o build/ui_launcher.h
 
-compiler_yacc_decl_make_all:
-compiler_yacc_decl_clean:
-compiler_yacc_impl_make_all:
-compiler_yacc_impl_clean:
-compiler_lex_make_all:
-compiler_lex_clean:
-compiler_clean: compiler_moc_header_clean compiler_uic_clean 
+compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_image_collection_clean compiler_moc_source_clean compiler_uic_clean 
 
 ####### Compile
 
 build/launcherimpl.o: src/launcherimpl.cpp src/launcherimpl.h \
-		build/ui_launcher.h \
+		ui_launcher.h \
 		src/Vis3d.hh
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/launcherimpl.o src/launcherimpl.cpp
 
 build/main.o: src/main.cpp src/launcherimpl.h \
-		build/ui_launcher.h \
+		ui_launcher.h \
 		src/Vis3d.hh
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o build/main.o src/main.cpp
 


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


