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

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

Revision: 16388
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=16388&view=rev
Author:   hsujohnhsu
Date:     2009-05-29 20:03:07 +0000 (Fri, 29 May 2009)

Log Message:
-----------
Merging from branch:
svn merge -r 16009:16016 https://personalrobots.svn.sf.net/svnroot/personalrobots/pkg/branches/gazebo-branch-merge .

Added Paths:
-----------
    pkg/trunk/simulators/opende/Makefile.gcc
    pkg/trunk/simulators/opende/Makefile.intel

Property Changed:
----------------
    pkg/trunk/
    pkg/trunk/robot_descriptions/gazebo_robot_description/Media/
    pkg/trunk/visualization/
    pkg/trunk/visualization/rviz/src/rviz/generated/rviz_generated.i
    pkg/trunk/visualization/rviz/src/rviz/properties/forwards.h
    pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp
    pkg/trunk/visualization/rviz/src/rviz/robot/robot.h
    pkg/trunk/visualization_core/ogre_tools/
    pkg/trunk/visualization_core/ogre_tools/media/
    pkg/trunk/visualization_core/ogre_tools/src/stl_to_mesh/
    pkg/trunk/visualization_core/ogre_tools/test/


Property changes on: pkg/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
   + /pkg/branches/gazebo-branch-merge:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016


Property changes on: pkg/trunk/robot_descriptions/gazebo_robot_description/Media
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/robot_descriptions/gazebo_robot_description/Media:15797-15820,15822-15839,15852-15870,15983-16008
   + /pkg/branches/gazebo-branch-merge/robot_descriptions/gazebo_robot_description/Media:15797-15820,15822-15839,15852-15870,15983-16008,16010-16016

Copied: pkg/trunk/simulators/opende/Makefile.gcc (from rev 16016, pkg/branches/gazebo-branch-merge/simulators/opende/Makefile.gcc)
===================================================================

--- pkg/trunk/simulators/opende/Makefile.gcc	                        (rev 0)
+++ pkg/trunk/simulators/opende/Makefile.gcc	2009-05-29 20:03:07 UTC (rev 16388)
@@ -0,0 +1,52 @@
+# change the next flag to 'no' if drawstuff is not to be built
+WITH_DRAWSTUFF = yes
+
+CFG_OPTIONS = --with-arch=nocona --enable-release --disable-asserts --with-pic #--enable-double-precision
+SVN_REVISION = -r 1669
+
+SVN_PATCH = opende_patch.diff
+
+ifeq ($(WITH_DRAWSTUFF), yes)
+CFG_OPTIONS += --with-drawstuff=X11
+endif
+
+all: installed
+
+ROOT = $(shell rospack find opende)/opende
+
+SVN_DIR = opende-svn
+SVN_URL = https://opende.svn.sourceforge.net/svnroot/opende/trunk 
+include $(shell rospack find mk)/svn_checkout.mk
+
+#ipo breaks build, e.g.  ipo: warning #11043: unresolved dsPrint, change to ip
+INTEL_OPTIONS = CC='/opt/intel/cc/10.1.008/bin/icc' CXX='/opt/intel/cc/10.1.008/bin/icpc' LD='/opt/intel/cc/10.1.008/bin/xild'
+INTEL_C_FLAGS     =  CXXFLAGS='-march=core2 -msse3 -ip  -no-prec-div         -parallel -O3 -fPIC -I$(ROOT)/include' CFLAGS='-march=core2 -msse3 -ip  -no-prec-div         -parallel -O3 -fPIC -I$(ROOT)/include -I$(ROOT)/usr/include'
+INTEL_C_FLAGS_OMP =  CXXFLAGS='-march=core2 -msse3 -ip  -no-prec-div -openmp -parallel -O3 -fPIC -I$(ROOT)/include' CFLAGS='-march=core2 -msse3 -ip  -no-prec-div -openmp -parallel -O3 -fPIC -I$(ROOT)/include -I$(ROOT)/usr/include'
+
+INTEL_LD_FLAGS     =  LDFLAGS='-Wl,-rpath,/opt/intel/cc/10.1.008/lib,-rpath,$(ROOT)/lib -L/opt/intel/cc/10.1.008/lib -L$(ROOT)/lib -lguide -lcxaguard -limf -lsvml -lirc -lpthread -lintlc'
+INTEL_LD_FLAGS_OMP =  LDFLAGS='-Wl,-rpath,/opt/intel/cc/10.1.008/lib,-rpath,$(ROOT)/lib -L/opt/intel/cc/10.1.008/lib -L$(ROOT)/lib -lguide -lcxaguard -limf -lsvml -lirc -lpthread -lintlc -lompstub -liomp5 -lomp_db'
+
+GCC_FLAGS     = CXXFLAGS='-DNDEBUG -O3 -fPIC -I$(ROOT)/include' CFLAGS='-DNDEBUG -O3 -fPIC -I$(ROOT)/include -I$(ROOT)/usr/include' LDFLAGS='-L$(ROOT)/lib'
+
+#CONFIGURE_FLAGS = $(CFG_OPTIONS) $(INTEL_OPTIONS) $(INTEL_C_FLAGS) $(INTEL_LD_FLAGS)
+CONFIGURE_FLAGS = $(CFG_OPTIONS) $(GCC_FLAGS)
+
+
+installed: $(SVN_DIR) patched
+	cd $(SVN_DIR) && sh ./autogen.sh
+	cd $(SVN_DIR) && ./configure --prefix=$(ROOT) --with-trimesh=opcode --enable-new-trimesh --enable-shared $(CONFIGURE_FLAGS)
+	cd $(SVN_DIR) && make $(ROS_PARALLEL_JOBS)
+	cd $(SVN_DIR) && make install
+	@echo "patch ode-config to pass -Wl,-rpath,-L{exec_prefix}/lib"
+	sed 's/echo  -L$${exec_prefix}\/lib -lode/echo  -Wl,-rpath,$${exec_prefix}\/lib -L$${exec_prefix}\/lib -lode/g' opende-svn/ode-config > opende/bin/ode-config
+	#sed 's/echo  -L$${exec_prefix}\/lib -lode/echo  -Wl,-rpath,$${exec_prefix}\/lib -L$${exec_prefix}\/lib -lode -Wl,-rpath,\/opt\/intel\/cc\/10.1.008\/lib -L\/opt\/intel\/cc\/10.1.008\/lib -lguide -lcxaguard -limf -lsvml -lirc -lpthread/g' opende-svn/ode-config > opende/bin/ode-config
+	@echo "patch ode.pc to pass -Wl,-rpath,-L{libdir}"
+	sed 's/Libs: -L$${libdir} -lode/Libs: -Wl,-rpath,$${libdir} -L$${libdir} -lode/g' opende-svn/ode.pc > opende/lib/pkgconfig/ode.pc
+	#sed 's/Libs: -L$${libdir} -lode/Libs: -Wl,-rpath,$${libdir} -L$${libdir} -lode -Wl,-rpath,\/opt\/intel\/cc\/10.1.008\/lib -L\/opt\/intel\/cc\/10.1.008\/lib -lguide -lcxaguard -limf -lsvml -lirc -lpthread/g' opende-svn/ode.pc > opende/lib/pkgconfig/ode.pc
+	touch installed
+
+clean:
+	-cd $(SVN_DIR) && make clean
+	rm -rf opende installed
+wipe: clean
+	rm -rf $(SVN_DIR)

Copied: pkg/trunk/simulators/opende/Makefile.intel (from rev 16016, pkg/branches/gazebo-branch-merge/simulators/opende/Makefile.intel)
===================================================================
--- pkg/trunk/simulators/opende/Makefile.intel	                        (rev 0)
+++ pkg/trunk/simulators/opende/Makefile.intel	2009-05-29 20:03:07 UTC (rev 16388)
@@ -0,0 +1,50 @@
+# change the next flag to 'no' if drawstuff is not to be built
+WITH_DRAWSTUFF = yes
+
+CFG_OPTIONS = --with-arch=nocona --enable-release --disable-asserts --with-pic #--enable-double-precision
+SVN_REVISION = -r 1669
+
+SVN_PATCH = opende_patch.diff
+
+ifeq ($(WITH_DRAWSTUFF), yes)
+CFG_OPTIONS += --with-drawstuff=X11
+endif
+
+all: installed
+
+ROOT = $(shell rospack find opende)/opende
+
+SVN_DIR = opende-svn
+SVN_URL = https://opende.svn.sourceforge.net/svnroot/opende/trunk 
+include $(shell rospack find mk)/svn_checkout.mk
+
+#ipo breaks build, e.g.  ipo: warning #11043: unresolved dsPrint, change to ip
+INTEL_OPTIONS = CC='/opt/intel/cc/10.1.008/bin/icc' CXX='/opt/intel/cc/10.1.008/bin/icpc' LD='/opt/intel/cc/10.1.008/bin/xild'
+INTEL_C_FLAGS     =  CXXFLAGS='-march=core2 -msse3 -ip  -no-prec-div         -parallel -O3 -fPIC -I$(ROOT)/include' CFLAGS='-march=core2 -msse3 -ip  -no-prec-div         -parallel -O3 -fPIC -I$(ROOT)/include -I$(ROOT)/usr/include'
+INTEL_C_FLAGS_OMP =  CXXFLAGS='-march=core2 -msse3 -ip  -no-prec-div -openmp -parallel -O3 -fPIC -I$(ROOT)/include' CFLAGS='-march=core2 -msse3 -ip  -no-prec-div -openmp -parallel -O3 -fPIC -I$(ROOT)/include -I$(ROOT)/usr/include'
+
+INTEL_LD_FLAGS     =  LDFLAGS='-Wl,-rpath,/opt/intel/cc/10.1.008/lib,-rpath,$(ROOT)/lib -L/opt/intel/cc/10.1.008/lib -L$(ROOT)/lib -lguide -lcxaguard -limf -lsvml -lirc -lpthread -lintlc'
+INTEL_LD_FLAGS_OMP =  LDFLAGS='-Wl,-rpath,/opt/intel/cc/10.1.008/lib,-rpath,$(ROOT)/lib -L/opt/intel/cc/10.1.008/lib -L$(ROOT)/lib -lguide -lcxaguard -limf -lsvml -lirc -lpthread -lintlc -lompstub -liomp5 -lomp_db'
+
+GCC_FLAGS     = CXXFLAGS='-DNDEBUG -O3 -fPIC -I$(ROOT)/include' CFLAGS='-DNDEBUG -O3 -fPIC -I$(ROOT)/include -I$(ROOT)/usr/include' LDFLAGS='-L$(ROOT)/lib'
+
+CONFIGURE_FLAGS = $(CFG_OPTIONS) $(INTEL_OPTIONS) $(INTEL_C_FLAGS) $(INTEL_LD_FLAGS)
+#CONFIGURE_FLAGS = $(CFG_OPTIONS) $(GCC_FLAGS)
+
+
+installed: $(SVN_DIR) patched
+	cd $(SVN_DIR) && sh ./autogen.sh
+	cd $(SVN_DIR) && ./configure --prefix=$(ROOT) --with-trimesh=opcode --enable-new-trimesh --enable-shared $(CONFIGURE_FLAGS)
+	cd $(SVN_DIR) && make $(ROS_PARALLEL_JOBS)
+	cd $(SVN_DIR) && make install
+	@echo "patch ode-config to pass -Wl,-rpath,-L{exec_prefix}/lib"
+	sed 's/echo  -L$${exec_prefix}\/lib -lode/echo  -Wl,-rpath,$${exec_prefix}\/lib -L$${exec_prefix}\/lib -lode -Wl,-rpath,\/opt\/intel\/cc\/10.1.008\/lib -L\/opt\/intel\/cc\/10.1.008\/lib -lguide -lcxaguard -limf -lsvml -lirc -lpthread/g' opende-svn/ode-config > opende/bin/ode-config
+	@echo "patch ode.pc to pass -Wl,-rpath,-L{libdir}"
+	sed 's/Libs: -L$${libdir} -lode/Libs: -Wl,-rpath,$${libdir} -L$${libdir} -lode -Wl,-rpath,\/opt\/intel\/cc\/10.1.008\/lib -L\/opt\/intel\/cc\/10.1.008\/lib -lguide -lcxaguard -limf -lsvml -lirc -lpthread/g' opende-svn/ode.pc > opende/lib/pkgconfig/ode.pc
+	touch installed
+
+clean:
+	-cd $(SVN_DIR) && make clean
+	rm -rf opende installed
+wipe: clean
+	rm -rf $(SVN_DIR)


Property changes on: pkg/trunk/visualization
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/rviz_selection:12152-13640
/pkg/branches/josh/visualization_scratch:14041-14428
   + /pkg/branches/gazebo-branch-merge/visualization:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/rviz_selection:12152-13640
/pkg/branches/josh/visualization_scratch:14041-14428


Property changes on: pkg/trunk/visualization/rviz/src/rviz/generated/rviz_generated.i
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/generated/rviz_generated.i:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/generated/rviz_generated.i:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/generated/visualization_panel_generated.i:12189
   + /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/generated/rviz_generated.i:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/generated/rviz_generated.i:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/generated/visualization_panel_generated.i:12189


Property changes on: pkg/trunk/visualization/rviz/src/rviz/properties/forwards.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/properties/forwards.h:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/properties/forwards.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/properties/property_forwards.h:12189,12408-12643,12667
   + /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/properties/forwards.h:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/properties/forwards.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/properties/property_forwards.h:12189,12408-12643,12667


Property changes on: pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.cpp:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.cpp:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp:497-13654
   + /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.cpp:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.cpp:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp:497-13654


Property changes on: pkg/trunk/visualization/rviz/src/rviz/robot/robot.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.h:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.h:497-13654
   + /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.h:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.h:497-13654


Property changes on: pkg/trunk/visualization_core/ogre_tools
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/ogre_tools:14041-14418
   + /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/ogre_tools:14041-14418


Property changes on: pkg/trunk/visualization_core/ogre_tools/media
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/media:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/ogre_tools/media:14041-14418
/pkg/trunk/visualization/ogre_tools/media:2217-8463
   + /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/media:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/ogre_tools/media:14041-14418
/pkg/trunk/visualization/ogre_tools/media:2217-8463


Property changes on: pkg/trunk/visualization_core/ogre_tools/src/stl_to_mesh
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/src/stl_to_mesh:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/ogre_tools/src/stl_to_mesh:14041-14418
/pkg/trunk/visualization/ogre_tools/src/stl_to_mesh:2217-2818
   + /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/src/stl_to_mesh:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/ogre_tools/src/stl_to_mesh:14041-14418
/pkg/trunk/visualization/ogre_tools/src/stl_to_mesh:2217-2818


Property changes on: pkg/trunk/visualization_core/ogre_tools/test
___________________________________________________________________
Modified: svn:mergeinfo
   - /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/test:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008
/pkg/branches/josh/visualization_scratch/ogre_tools/test:14041-14418
/pkg/trunk/visualization/ogre_tools/test:2217-3599
   + /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/test:15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016
/pkg/branches/josh/visualization_scratch/ogre_tools/test:14041-14418
/pkg/trunk/visualization/ogre_tools/test:2217-3599


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


