Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[3420] pkg/trunk
|
From: <pof...@us...> - 2008-08-21 20:00:39
|
Revision: 3420
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=3420&view=rev
Author: poftwaresatent
Date: 2008-08-21 20:00:48 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
Updated the "trio" of E*/sfl/npm. The latter is now using GNU Automake
for ROS, the CMakeLists approach was simply too unstable (maintaining
two build systems is a pain).
Modified Paths:
--------------
pkg/trunk/3rdparty/estar/Makefile
pkg/trunk/3rdparty/libsunflower/Makefile
pkg/trunk/simulators/nepumuk/Makefile
Removed Paths:
-------------
pkg/trunk/simulators/nepumuk/CMakeLists.txt
Modified: pkg/trunk/3rdparty/estar/Makefile
===================================================================
--- pkg/trunk/3rdparty/estar/Makefile 2008-08-21 18:56:37 UTC (rev 3419)
+++ pkg/trunk/3rdparty/estar/Makefile 2008-08-21 20:00:48 UTC (rev 3420)
@@ -36,10 +36,15 @@
$(MAKE) -C $(BUILD_DIR) install
.PHONY: svn-all
-svn-all:
- test -d $(SVN_DIR) || svn co -r$(SVN_REV) $(SVN_URL) $(SVN_DIR)
+svn-all: checkout
$(MAKE) SOURCE_DIR=$(SVN_DIR) really-all
+checkout:
+ test -d $(SVN_DIR) || svn co -r$(SVN_REV) $(SVN_URL) $(SVN_DIR)
+
+update: checkout
+ test -d $(SVN_DIR) && svn up $(SVN_DIR)
+
.PHONY: tarball-all
tarball-all: $(SOURCE_DIR)
$(MAKE) really-all
Modified: pkg/trunk/3rdparty/libsunflower/Makefile
===================================================================
--- pkg/trunk/3rdparty/libsunflower/Makefile 2008-08-21 18:56:37 UTC (rev 3419)
+++ pkg/trunk/3rdparty/libsunflower/Makefile 2008-08-21 20:00:48 UTC (rev 3420)
@@ -16,7 +16,7 @@
all: tarball-all
-VERSION= r903
+VERSION= r910
TARBALL= libsunflower-$(VERSION).tar.gz
TARBALL_URL= http://downloads.sourceforge.net/libsunflower/$(TARBALL)
@@ -38,10 +38,15 @@
$(MAKE) -C $(BUILD_DIR) install
.PHONY: svn-all
-svn-all:
- test -d $(SVN_DIR) || svn co -r$(SVN_REV) $(SVN_URL) $(SVN_DIR)
+svn-all: checkout
$(MAKE) SOURCE_DIR=$(SVN_DIR) really-all
+checkout:
+ test -d $(SVN_DIR) || svn co -r$(SVN_REV) $(SVN_URL) $(SVN_DIR)
+
+update: checkout
+ test -d $(SVN_DIR) && svn up $(SVN_DIR)
+
.PHONY: tarball-all
tarball-all: $(SOURCE_DIR)
$(MAKE) really-all
Deleted: pkg/trunk/simulators/nepumuk/CMakeLists.txt
===================================================================
--- pkg/trunk/simulators/nepumuk/CMakeLists.txt 2008-08-21 18:56:37 UTC (rev 3419)
+++ pkg/trunk/simulators/nepumuk/CMakeLists.txt 2008-08-21 20:00:48 UTC (rev 3420)
@@ -1,146 +0,0 @@
-### Simplified CMake build file for ROSified nepumuk.
-
-# depends on:
-# - GL, GLU, GLUT
-# - libsunflower ros-pkg
-# - boost ros-pkg
-#
-# later (optional?) code will depend on:
-# - estar ros-pkg
-# - asl-mplan future ros-pkg
-# - asl-mcontrol future ros-pkg
-
-cmake_minimum_required(VERSION 2.6)
-include(rosbuild)
-
-rospack(nepumuk)
-
-SET (ROS_BUILD_TYPE Debug)
-SET (ROS_BUILD_STATIC_EXES false)
-SET (ROS_BUILD_SHARED_LIBS true)
-SET (ROS_BUILD_STATIC_LIBS false)
-
-IF (WIN32)
- MESSAGE (STATUS "Detected Microsoft Windows")
- SET (ROS_COMPILE_FLAGS "-DWIN32 -Wall -DNPM_HAVE_ROS")
-ELSE (WIN32)
- IF (APPLE)
- MESSAGE (STATUS "Detected Mac OS X")
- SET (ROS_COMPILE_FLAGS "-DOSX -Wall -DNPM_HAVE_ROS")
- ENDIF (APPLE)
-
- IF (CMAKE_SYSTEM_NAME MATCHES Linux)
- MESSAGE (STATUS "Detected Linux")
- SET (ROS_COMPILE_FLAGS "-DLINUX -Wall -DNPM_HAVE_ROS")
- ENDIF (CMAKE_SYSTEM_NAME MATCHES Linux)
-
- IF (CMAKE_SYSTEM_NAME MATCHES OpenBSD)
- MESSAGE (STATUS "Detected OpenBSD")
- SET (ROS_COMPILE_FLAGS "-DOPENBSD -Wall -DNPM_HAVE_ROS")
- ENDIF (CMAKE_SYSTEM_NAME MATCHES OpenBSD)
-ENDIF(WIN32)
-
-SET (ROS_LINK_FLAGS "")
-
-rospack_add_executable(nepumuk src/simul/nepumuk.cpp)
-rospack_add_executable(simpletest src/ros/test.cpp)
-
-
-
-SET (CMAKE_VERBOSE_MAKEFILE ON)
-
-INCLUDE (FindOpenGL)
-IF (OPENGL_FOUND)
- MESSAGE (STATUS "Found OpenGL")
-ELSE (OPENGL_FOUND)
- MESSAGE (FATAL_ERROR "OpenGL not found")
-ENDIF (OPENGL_FOUND)
-IF (OPENGL_GLU_FOUND)
- MESSAGE (STATUS "Found GLU")
-ELSE (OPENGL_GLU_FOUND)
- MESSAGE (FATAL_ERROR "GLU not found")
-ENDIF (OPENGL_GLU_FOUND)
-INCLUDE_DIRECTORIES (${OPENGL_INCLUDE_DIR})
-
-INCLUDE (FindGLUT)
-IF (GLUT_FOUND)
- MESSAGE (STATUS "Found GLUT")
-ELSE (GLUT_FOUND)
- MESSAGE (FATAL_ERROR "GLUT not found")
-ENDIF (GLUT_FOUND)
-INCLUDE_DIRECTORIES (${GLUT_INCLUDE_DIR})
-
-INCLUDE (FindThreads)
-IF (CMAKE_USE_PTHREADS_INIT)
- MESSAGE (STATUS "Found pthreads")
-ELSE (CMAKE_USE_PTHREADS_INIT)
- MESSAGE (FATAL_ERROR "Sorry for the moment libsunflower still seems to need pthreads...")
-ENDIF (CMAKE_USE_PTHREADS_INIT)
-
-
-rospack_add_library (npm
- src/common/BBox.cpp
- src/common/BicycleDrive.cpp
- src/common/BicycleDriveDrawing.cpp
- src/common/Camera.cpp
- src/common/CheatSheet.cpp
- src/common/DiffDrive.cpp
- src/common/DiffDriveDrawing.cpp
- src/common/Drawing.cpp
- src/common/Drive.cpp
- src/common/Globals.cpp
- src/common/GoalInstanceDrawing.cpp
- src/common/HAL.cpp
- src/common/HoloDrive.cpp
- src/common/HoloDriveDrawing.cpp
- src/common/Lidar.cpp
- src/common/Manageable.cpp
- src/common/Manager.cpp
- src/common/MapperRefDrawing.cpp
- src/common/MapperUpdateDrawing.cpp
- src/common/NoiseModel.cpp
- src/common/Object.cpp
- src/common/OdometryDrawing.cpp
- src/common/RobotClient.cpp
- src/common/RobotDescriptor.cpp
- src/common/RobotDrawing.cpp
- src/common/RobotServer.cpp
- src/common/RobotZoomCamera.cpp
- src/common/ScannerDrawing.cpp
- src/common/Sensor.cpp
- src/common/Sharp.cpp
- src/common/SharpDrawing.cpp
- src/common/SimpleImage.cpp
- src/common/StillCamera.cpp
- src/common/TrajectoryDrawing.cpp
- src/common/TraversabilityDrawing.cpp
- src/common/View.cpp
- src/common/World.cpp
- src/common/WorldCamera.cpp
- src/common/WorldDrawing.cpp
- src/common/trfct.cpp
- src/common/wrap_glu.cpp
- src/robox/BBDrawing.cpp
- src/robox/BLDrawing.cpp
- src/robox/DODrawing.cpp
- src/robox/DWDrawing.cpp
- src/robox/GridLayerCamera.cpp
- src/robox/GridLayerDrawing.cpp
- src/robox/MPDrawing.cpp
- src/robox/OCamera.cpp
- src/robox/ODrawing.cpp
- src/robox/RHDrawing.cpp
- src/robox/Robox.cpp
- src/visitor/Visitor.cpp
- src/ros/ROSbot.cpp
- src/simul/Interlock.cpp
- src/simul/RobotFactory.cpp
- src/simul/Simulator.cpp)
-
-INCLUDE_DIRECTORIES (.)
-
-TARGET_LINK_LIBRARIES (nepumuk npm sunflower
- ${GLUT_LIBRARIES}
- ${OPENGL_glu_LIBRARY}
- ${OPENGL_gl_LIBRARY}
- pthread)
Modified: pkg/trunk/simulators/nepumuk/Makefile
===================================================================
--- pkg/trunk/simulators/nepumuk/Makefile 2008-08-21 18:56:37 UTC (rev 3419)
+++ pkg/trunk/simulators/nepumuk/Makefile 2008-08-21 20:00:48 UTC (rev 3420)
@@ -19,52 +19,70 @@
all: tarball-all
-SVN_DIR= $(PWD)/nepumuk-svn
-SVN_REV= HEAD
-SVN_URL= https://libsunflower.svn.sourceforge.net/svnroot/libsunflower/trunk/nepumuk
+VERSION= r912
-VERSION= r903
-
TARBALL= nepumuk-$(VERSION).tar.gz
TARBALL_URL= http://downloads.sourceforge.net/libsunflower/$(TARBALL)
SOURCE_DIR= $(PWD)/nepumuk-$(VERSION)
UNPACK_CMD= tar xfz
+BUILD_DIR= $(PWD)/build
+INST_DIR= $(PWD)/local
+ESTAR_DIR= `rospack find estar`/local
+SFL_DIR= `rospack find libsunflower`/local
+BOOST_DIR= `rospack --cflags-only-I boost`
-SYMLINK= npm
-SYMTARGET= $(SOURCE_DIR)
+SVN_DIR= $(PWD)/nepumuk-svn
+SVN_REV= HEAD
+SVN_URL= https://libsunflower.svn.sourceforge.net/svnroot/libsunflower/trunk/nepumuk
+SIMULINKS= nepumuk rostest ros0.sh robots.ros0 layout.ros0 expodemo.sh robots.expo layout.expo
+
+
include $(shell rospack find mk)/download_unpack.mk
-.PHONY: really-all tarball-all svn-all checkout
-
+.PHONY: svn-all
svn-all: checkout
$(MAKE) SOURCE_DIR=$(SVN_DIR) really-all
+.PHONY: tarball-all
tarball-all: $(SOURCE_DIR)
$(MAKE) really-all
-rebuild: clean really-all
+rebuild: wipe really-all
-really-all: symlinks build/Makefile
- test -d build || mkdir build
- $(MAKE) -C build
+.PHONY: really-all
+really-all: $(SOURCE_DIR)/configure $(BUILD_DIR)/config.h
+ $(MAKE) -C $(BUILD_DIR) install
+ $(MAKE) symlinks
checkout:
test -d $(SVN_DIR) || svn co -r$(SVN_REV) $(SVN_URL) $(SVN_DIR)
+update: checkout
+ test -d $(SVN_DIR) && svn up $(SVN_DIR)
+
symlinks:
- $(MAKE) SYMLINK=src SYMTARGET=$(SOURCE_DIR) symlink
- $(MAKE) SYMLINK=npm SYMTARGET=$(SOURCE_DIR) symlink
- $(MAKE) SYMLINK=ros0.sh SYMTARGET=$(SOURCE_DIR)/simul/ros0.sh symlink
- $(MAKE) SYMLINK=robots.ros0 SYMTARGET=$(SOURCE_DIR)/simul/robots.ros0 symlink
- $(MAKE) SYMLINK=layout.ros0 SYMTARGET=$(SOURCE_DIR)/simul/layout.ros0 symlink
+ for foo in $(SIMULINKS); do \
+ test -L $$foo || ln -s $(INST_DIR)/bin/$$foo || exit 42; done
-symlink:
- test -L $(SYMLINK) || ln -s $(SYMTARGET) $(SYMLINK)
+$(SOURCE_DIR)/configure: $(SOURCE_DIR)/configure.ac $(SOURCE_DIR)/bootstrap-buildsystem.sh
+ cd $(SOURCE_DIR) && ./bootstrap-buildsystem.sh
-build/Makefile: CMakeLists.txt manifest.xml
- mkdir -p build
- cd build && `rospack find cmake`/cmake/bin/cmake -DCMAKE_TOOLCHAIN_FILE=`rospack find rosbuild`/rostoolchain.cmake ..
+$(BUILD_DIR)/config.h: $(SOURCE_DIR)/configure $(SOURCE_DIR)/config.h.in
+ test -d $(BUILD_DIR) || mkdir -p $(BUILD_DIR)
+ cd $(BUILD_DIR) && $(SOURCE_DIR)/configure --prefix=$(INST_DIR) \
+ --enable-ros \
+ --with-sfl=$(SFL_DIR) \
+ --with-estar=$(ESTAR_DIR) \
+ --with-boost=$(BOOST_DIR)
clean:
- rm -rf lib build npm ros0.sh robots.ros0 layout.ros0
+ - rm $(SIMULINKS)
+ $(MAKE) -C $(BUILD_DIR) clean
+
+distclean:
+ - rm $(SIMULINKS)
+ $(MAKE) -C $(BUILD_DIR) distclean
+
+wipe:
+ rm -rf $(BUILD_DIR) $(INST_DIR)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
