Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[6849] pkg/trunk
|
From: <wgh...@us...> - 2008-11-18 00:46:23
|
Revision: 6849
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=6849&view=rev
Author: wghassan
Date: 2008-11-18 00:46:16 +0000 (Tue, 18 Nov 2008)
Log Message:
-----------
updated Makefile for 3rdparty packages to build inside on build directory
Modified Paths:
--------------
pkg/trunk/3rdparty/boost/Makefile
pkg/trunk/3rdparty/eml/Makefile
pkg/trunk/3rdparty/estar/Makefile
pkg/trunk/3rdparty/freeimage/Makefile
pkg/trunk/3rdparty/glc/elfhacks/Makefile
pkg/trunk/3rdparty/glc/glc/Makefile
pkg/trunk/3rdparty/glc/packetstream/Makefile
pkg/trunk/3rdparty/gmapping/Makefile
pkg/trunk/3rdparty/kdl/Makefile
pkg/trunk/3rdparty/libsunflower/Makefile
pkg/trunk/3rdparty/ogre/Makefile
pkg/trunk/3rdparty/opencv/Makefile
pkg/trunk/3rdparty/scipy/Makefile
pkg/trunk/3rdparty/soqt/Makefile
pkg/trunk/3rdparty/vop/Makefile
pkg/trunk/3rdparty/wxmpl/Makefile
pkg/trunk/3rdparty/wxswig/Makefile
pkg/trunk/simulators/nepumuk/Makefile
Removed Paths:
-------------
pkg/trunk/drivers/network/wifi_ddwrt/.backup-CMakeLists.txt
pkg/trunk/drivers/network/wifi_ddwrt/.backup-manifest.xml
pkg/trunk/drivers/network/wifi_ddwrt/msg/.backup-APSignal.msg
pkg/trunk/drivers/network/wifi_ddwrt/nodes/.backup-chat
pkg/trunk/drivers/network/wifi_ddwrt/nodes/.backup-ddwrt
pkg/trunk/drivers/network/wifi_ddwrt/nodes/.backup-listener
Modified: pkg/trunk/3rdparty/boost/Makefile
===================================================================
--- pkg/trunk/3rdparty/boost/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/boost/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,18 +1,19 @@
all: boost
-TARBALL = boost_1_36_0.tar.gz
+TARBALL = build/boost_1_36_0.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/boost_1_36_0.tar.gz
-SOURCE_DIR = boost_1_36_0
+SOURCE_DIR = build/boost_1_36_0
+LOCAL_DIR = boost_1_36_0
UNPACK_CMD = tar zxf
MD5SUM_FILE = boost_1_36_0.tar.gz.md5sum
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
boost: $(SOURCE_DIR)
-
+ mv $(SOURCE_DIR) $(LOCAL_DIR)
clean:
rm -rf boost_1_36_0
wipe: clean
- rm -rf boost_1_36_0.tar.gz
+ rm -rf build
.PHONY : clean distclean
Modified: pkg/trunk/3rdparty/eml/Makefile
===================================================================
--- pkg/trunk/3rdparty/eml/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/eml/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,10 +1,10 @@
all: build
-TARBALL = eml-r36-patched.tar.bz2
-TARBALL_URL = http://pr.willowgarage.com/downloads/$(TARBALL)
-SOURCE_DIR = eml-svn
+TARBALL = build/eml-r36-patched.tar.bz2
+TARBALL_URL = http://pr.willowgarage.com/downloads/eml-r36-patched.tar.bz2
+SOURCE_DIR = build/eml-svn
UNPACK_CMD = tar xjf
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
build: wiped eml
@@ -28,7 +28,7 @@
rm -rf eml configured
wipe: clean
- rm -rf $(SOURCE_DIR)
+ rm -rf build
Modified: pkg/trunk/3rdparty/estar/Makefile
===================================================================
--- pkg/trunk/3rdparty/estar/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/estar/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -17,11 +17,11 @@
VERSION= r267
-TARBALL= estar-$(VERSION).tar.gz
-TARBALL_URL= http://pr.willowgarage.com/downloads/$(TARBALL)
-SOURCE_DIR= $(PWD)/estar-$(VERSION)
+TARBALL= build/estar-$(VERSION).tar.gz
+TARBALL_URL= http://pr.willowgarage.com/downloads/estar-$(VERSION).tar.gz
+SOURCE_DIR= $(PWD)/build/estar-$(VERSION)
UNPACK_CMD= tar xfz
-BUILD_DIR= $(PWD)/build
+BUILD_DIR= $(PWD)/build/build
INST_DIR= $(PWD)/local
BOOST_DIR= `rospack cflags-only-I boost`
@@ -29,7 +29,7 @@
SVN_REV= HEAD
SVN_URL= https://estar.svn.sourceforge.net/svnroot/estar/trunk/estar
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
.PHONY: reall-all
really-all: $(SOURCE_DIR)/configure $(BUILD_DIR)/config.h
Modified: pkg/trunk/3rdparty/freeimage/Makefile
===================================================================
--- pkg/trunk/3rdparty/freeimage/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/freeimage/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,15 +1,15 @@
all: freeimage
-TARBALL = FreeImage3110.zip
-TARBALL_URL = http://pr.willowgarage.com/downloads/$(TARBALL)
-SOURCE_DIR = freeimage-3.11.0
-INITIAL_DIR = FreeImage
+TARBALL = build/FreeImage3110.zip
+TARBALL_URL = http://pr.willowgarage.com/downloads/FreeImage3110.zip
+SOURCE_DIR = build/freeimage-3.11.0
+INITIAL_DIR = build/FreeImage
UNPACK_CMD = unzip
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
ROOT = $(shell rospack find freeimage)/freeimage
-freeimage: freeimage-3.11.0
+freeimage: $(SOURCE_DIR)
@echo "making it"
@echo "ROOT is: $(ROOT)"
-mkdir -p freeimage
@@ -19,14 +19,14 @@
# Fix up the makefile, which doesn't make good use of any environment variables
# We also don't need to install with -o root -g root
# We also shouldn't run ldconfig, as we don't have permission for that either.
- cd freeimage-3.11.0 ; mv Makefile.gnu Makefile.gnu-orig ; cat Makefile.gnu-orig | sed -e 's%/usr/lib%$(ROOT)/lib%g' | sed -e 's%/usr/include%$(ROOT)/include%g' | sed -e 's/-o root -g root//' | grep -v ldconfig > Makefile.gnu
+ cd $(SOURCE_DIR) ; mv Makefile.gnu Makefile.gnu-orig ; cat Makefile.gnu-orig | sed -e 's%/usr/lib%$(ROOT)/lib%g' | sed -e 's%/usr/include%$(ROOT)/include%g' | sed -e 's/-o root -g root//' | grep -v ldconfig > Makefile.gnu
# Here's some other nasty hackery to build on OS X. This will only
# work on modern Intel-based Macs, and it will not build shared
# libraries.
#
# TODO: Replace this sed madness with a proper patch
- cd freeimage-3.11.0 ; mv Makefile.osx Makefile.osx-orig ; cat Makefile.osx-orig | sed -e 's%/usr/lib%$(ROOT)/lib%g' | sed -e 's%/usr/include%$(ROOT)/include%g' | sed -e 's/-o root -g wheel//' | sed -e 's%/usr/local%$(ROOT)%g'| sed -e 's%FreeImage: $$(STATICLIB) $$(SHAREDLIB)%FreeImage: $$(STATICLIB)%' | sed -e 's%$$(STATICLIB): $$(STATICLIB)-ppc%$$(STATICLIB):%' | sed -e 's%$$(LIPO) -create $$(STATICLIB)-ppc%$$(LIPO) -create%' | sed -e 's%install -m 644 $$(SHAREDLIB)%install -m 644 %' | sed -e 's%ln -sf%#ln -sf%' | sed -e 's%all: dist%all: FreeImage%' | grep -v ldconfig > Makefile.osx
- cd freeimage-3.11.0 ; make $(PARALLEL_JOBS); make install
+ cd $(SOURCE_DIR) ; mv Makefile.osx Makefile.osx-orig ; cat Makefile.osx-orig | sed -e 's%/usr/lib%$(ROOT)/lib%g' | sed -e 's%/usr/include%$(ROOT)/include%g' | sed -e 's/-o root -g wheel//' | sed -e 's%/usr/local%$(ROOT)%g'| sed -e 's%FreeImage: $$(STATICLIB) $$(SHAREDLIB)%FreeImage: $$(STATICLIB)%' | sed -e 's%$$(STATICLIB): $$(STATICLIB)-ppc%$$(STATICLIB):%' | sed -e 's%$$(LIPO) -create $$(STATICLIB)-ppc%$$(LIPO) -create%' | sed -e 's%install -m 644 $$(SHAREDLIB)%install -m 644 %' | sed -e 's%ln -sf%#ln -sf%' | sed -e 's%all: dist%all: FreeImage%' | grep -v ldconfig > Makefile.osx
+ cd $(SOURCE_DIR) ; make $(PARALLEL_JOBS); make install
mkdir -p freeimage/lib/pkgconfig
sed 's%FREEIMAGE_PATH%$(shell rospack find freeimage)%g' freeimage.pc > freeimage/lib/pkgconfig/freeimage.pc
@@ -35,8 +35,7 @@
rm -rf freeimage
wipe:
- rm -rf freeimage-3.11.0
rm -rf freeimage
- rm -rf $(TARBALL)
+ rm -rf build
.PHONY : clean download wipe
Modified: pkg/trunk/3rdparty/glc/elfhacks/Makefile
===================================================================
--- pkg/trunk/3rdparty/glc/elfhacks/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/glc/elfhacks/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,16 +1,16 @@
all: elfhacks
-TARBALL = elfhacks-0.4.1.tar.gz
+TARBALL = build/elfhacks-0.4.1.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/elfhacks-0.4.1.tar.gz
SOURCE_DIR = elfhacks-0.4.1
UNPACK_CMD = tar xzf
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
elfhacks: $(SOURCE_DIR)
- -mv elfhacks elfhacks-0.4.1
+ -mv build/elfhacks $(SOURCE_DIR)
cd $(SOURCE_DIR) && cmake . -DCMAKE_INSTALL_PREFIX:PATH="`rospack find glc`" -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 -msse -mmmx -fomit-frame-pointer" -DCMAKE_INSTALL_RPATH:STRING="`rospack find glc`/lib" && make && make install
clean:
rm -rf $(SOURCE_DIR)
wipe: clean
- rm -rf $(TARBALL)
+ rm -rf $(TARBALL) build
Modified: pkg/trunk/3rdparty/glc/glc/Makefile
===================================================================
--- pkg/trunk/3rdparty/glc/glc/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/glc/glc/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,16 +1,16 @@
all: glc
-TARBALL = glc-0.5.7.tar.gz
+TARBALL = build/glc-0.5.7.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/glc-0.5.7.tar.gz
SOURCE_DIR = glc-0.5.7
UNPACK_CMD = tar xzf
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
glc: $(SOURCE_DIR)
- -mv glc glc-0.5.7
+ -mv build/glc $(SOURCE_DIR)
cd $(SOURCE_DIR) && cmake . -DCMAKE_INSTALL_PREFIX:PATH="`rospack find glc`" -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 -msse -mmmx -fomit-frame-pointer" -DCMAKE_INSTALL_RPATH:STRING="`rospack find glc`/lib" && make && make install
clean:
rm -rf $(SOURCE_DIR)
wipe: clean
- rm -rf $(TARBALL)
+ rm -rf $(TARBALL) build
Modified: pkg/trunk/3rdparty/glc/packetstream/Makefile
===================================================================
--- pkg/trunk/3rdparty/glc/packetstream/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/glc/packetstream/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,16 +1,16 @@
all: packetstream
-TARBALL = packetstream-0.1.4.tar.gz
+TARBALL = build/packetstream-0.1.4.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/packetstream-0.1.4.tar.gz
SOURCE_DIR = packetstream-0.1.4
UNPACK_CMD = tar xzf
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
packetstream: $(SOURCE_DIR)
- -mv packetstream packetstream-0.1.4
+ -mv build/packetstream packetstream-0.1.4
cd $(SOURCE_DIR) && cmake . -DCMAKE_INSTALL_PREFIX:PATH="`rospack find glc`" -DCMAKE_BUILD_TYPE:STRING="Release" -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 -msse -mmmx -fomit-frame-pointer" -DCMAKE_INSTALL_RPATH:STRING="`rospack find glc`/lib" && make && make install
clean:
rm -rf $(SOURCE_DIR)
wipe: clean
- rm -rf $(TARBALL)
+ rm -rf $(TARBALL) build
Modified: pkg/trunk/3rdparty/gmapping/Makefile
===================================================================
--- pkg/trunk/3rdparty/gmapping/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/gmapping/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,17 +1,17 @@
all: build
-TARBALL = gmapping_r39.tar.gz
+TARBALL = build/gmapping_r39.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/gmapping_r39.tar.gz
-SOURCE_DIR = gmapping_export
+SOURCE_DIR = build/gmapping_export
UNPACK_CMD = tar xzf
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
PATCH = gmapping-r39.patch
build: wiped gmapping
configured: $(SOURCE_DIR) Makefile
- cd $(SOURCE_DIR) && patch -p0 < ../$(PATCH) && ./configure
+ cd $(SOURCE_DIR) && patch -p0 < ../../$(PATCH) && ./configure
touch configured
wiped: Makefile $(PATCH)
@@ -26,5 +26,5 @@
-cd $(SOURCE_DIR) && make clean
rm -rf gmapping configured
wipe: clean
- rm -rf $(SOURCE_DIR)
+ rm -rf build
Modified: pkg/trunk/3rdparty/kdl/Makefile
===================================================================
--- pkg/trunk/3rdparty/kdl/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/kdl/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -2,12 +2,12 @@
all: build
-TARBALL = kdl_29562.tar.gz
+TARBALL = build/kdl_29562.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/kdl_29562.tar.gz
-SOURCE_DIR = kdl_export
+SOURCE_DIR = build/kdl_export
#MD5SUM_FILE = opencv-1.0.0.tar.gz.md5sum
UNPACK_CMD = tar xzf
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
@@ -24,8 +24,8 @@
build: wiped kdl
configured: $(SOURCE_DIR) Makefile
- cd $(SOURCE_DIR) && patch -p0 <../$(PATCH1)
- cd $(SOURCE_DIR) && patch -p0 <../$(PATCH2)
+ cd $(SOURCE_DIR) && patch -p0 <../../$(PATCH1)
+ cd $(SOURCE_DIR) && patch -p0 <../../$(PATCH2)
mkdir -p $(SOURCE_DIR)/build
cd $(SOURCE_DIR)/build && $(CMAKE) $(CMAKE_ARGS) ..
touch configured
@@ -42,4 +42,4 @@
rm -rf configured
wipe: clean
- rm -rf $(TARBALL)
+ rm -rf $(TARBALL) build
Modified: pkg/trunk/3rdparty/libsunflower/Makefile
===================================================================
--- pkg/trunk/3rdparty/libsunflower/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/libsunflower/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -19,20 +19,20 @@
VERSION= r910
-TARBALL= libsunflower-$(VERSION).tar.gz
-TARBALL_URL= http://pr.willowgarage.com/downloads/$(TARBALL)
-SOURCE_DIR= $(PWD)/libsunflower-$(VERSION)
+TARBALL= build/libsunflower-$(VERSION).tar.gz
+TARBALL_URL= http://pr.willowgarage.com/downloads/libsunflower-$(VERSION).tar.gz
+SOURCE_DIR= $(PWD)/build/libsunflower-$(VERSION)
UNPACK_CMD= tar xfz
BUILD_DIR= $(PWD)/build
INST_DIR= $(PWD)/local
ESTAR_DIR= `rospack find estar`/local
BOOST_DIR= `rospack cflags-only-I boost`
-SVN_DIR= $(PWD)/sunflower-svn
+SVN_DIR= $(PWD)/build/sunflower-svn
SVN_REV= HEAD
SVN_URL= https://libsunflower.svn.sourceforge.net/svnroot/libsunflower/trunk/sunflower
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
.PHONY: really-all
really-all: $(SOURCE_DIR)/configure $(BUILD_DIR)/config.h
@@ -68,4 +68,4 @@
$(MAKE) -C $(BUILD_DIR) distclean
wipe:
- rm -rf $(BUILD_DIR) $(INST_DIR)
+ rm -rf $(BUILD_DIR) $(INST_DIR) build
Modified: pkg/trunk/3rdparty/ogre/Makefile
===================================================================
--- pkg/trunk/3rdparty/ogre/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/ogre/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,13 +1,13 @@
all: ogre
OGRE_VERSION = ogre-v1-4-9
-TARBALL = $(OGRE_VERSION).tar.bz2
-TARBALL_URL = http://pr.willowgarage.com/downloads/$(TARBALL)
-SOURCE_DIR = $(OGRE_VERSION)
+TARBALL = build/$(OGRE_VERSION).tar.bz2
+TARBALL_URL = http://pr.willowgarage.com/downloads/$(OGRE_VERSION).tar.bz2
+SOURCE_DIR = build/$(OGRE_VERSION)
UNPACK_CMD = tar xf
TARBALL_PATCH = warnings.patch
-INITIAL_DIR = ogre
-include $(shell rospack find mk)/download_unpack.mk
+INITIAL_DIR = build/ogre
+include $(shell rospack find mk)/download_unpack_build.mk
ROOT = $(shell rospack find ogre)
OGREROOT = $(shell rospack find ogre)/ogre
@@ -28,15 +28,15 @@
CONFIGURE_FLAGS = --with-arch=nocona --enable-release CXXFLAGS='-g -O3 -I$(FIROOT)/include -I$(CGROOT)/include' LDFLAGS='-Wl,-rpath,$(FIROOT)/lib,-rpath,$(CGROOT)/lib -L$(FIROOT)/lib -L$(CGROOT)/lib' CFLAGS='-g -O3 -I$(FIROOT)/include -I$(OISROOT)/include -I$(CGROOT)/include'
-$(OGRE_VERSION)/Makefile: $(OGRE_VERSION)
+$(SOURCE_DIR)/Makefile: $(SOURCE_DIR)
if test `uname` = Darwin ; then \
- touch $(OGRE_VERSION)/Makefile; \
+ touch $(SOURCE_DIR)/Makefile; \
else \
- cd $(OGRE_VERSION) && \
+ cd $(SOURCE_DIR) && \
export LIB="$(LFLAGS)" && \
export CFLAGS="$(CFLAGS)" && \
./configure --prefix=$(OGREROOT) --enable-threading --with-pic --with-platform=GLX --with-gui=gtk --disable-ogre-demos $(CONFIGURE_FLAGS) && \
- touch $(ROOT)/$(OGRE_VERSION)/Makefile && \
+ touch $(ROOT)/$(SOURCE_DIR)/Makefile && \
mkdir -p $(ROOT)/ogre && \
mkdir -p $(ROOT)/ogre/lib && \
mkdir -p $(ROOT)/ogre/include && \
@@ -66,10 +66,10 @@
ln -sf /usr/lib/OGRE ogre/lib/OGRE; \
fi
-ogre/lib/pkgconfig/OGRE.pc: $(OGRE_VERSION)/Makefile $(OGRE_VERSION)
+ogre/lib/pkgconfig/OGRE.pc: $(SOURCE_DIR)/Makefile $(SOURCE_DIR)
# building OGRE
if test `uname` = Darwin ; then \
- cd $(ROOT)/$(OGRE_VERSION)/Mac/Ogre && \
+ cd $(ROOT)/$(SOURCE_DIR)/Mac/Ogre && \
export CPATH=Developer/SDKs/MacOSX10.5.sdk/usr/X11/include:/Developer/SDKs/MacOSX10.5.sdk/usr/X11/include/freetype2:`rospack find freeimage`/freeimage/include:/opt/local/include && \
export LIBRARY_PATH=`rospack find freeimage`/freeimage/lib:/opt/local/lib && \
xcodebuild ARCHS=i386 -target Ogre && \
@@ -79,8 +79,8 @@
xcodebuild ARCHS=i386 -target "OctreeSceneManager Plugin" && \
xcodebuild ARCHS=i386 -target "Bundle Resources"; \
else \
- cd $(ROOT)/$(OGRE_VERSION) && make $(JOBC) $(PARALLEL_JOBS); \
- cd $(ROOT)/$(OGRE_VERSION) && make install; \
+ cd $(ROOT)/$(SOURCE_DIR) && make $(JOBC) $(PARALLEL_JOBS); \
+ cd $(ROOT)/$(SOURCE_DIR) && make install; \
fi
@echo "patch OGRE.pc to pass -Wl,-rpath,-L{libdir}"
-mv ogre/lib/pkgconfig/OGRE.pc ogre/lib/pkgconfig/OGRE.bak
@@ -91,11 +91,10 @@
.PHONY: clean wipe
clean:
- -cd $(ROOT)/$(OGRE_VERSION) && make clean
+ -cd $(ROOT)/$(SOURCE_DIR) && make clean
-rm -rf ogre
wipe:
- -rm -rf $(OGRE_VERSION)
- -rm -rf $(OGRE_VERSION).tar.bz2
+ -rm -rf build
Modified: pkg/trunk/3rdparty/opencv/Makefile
===================================================================
--- pkg/trunk/3rdparty/opencv/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/opencv/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,11 +1,11 @@
all: opencv
-TARBALL = opencv-1.0.0.tar.gz
+TARBALL = build/opencv-1.0.0.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/opencv-1.0.0.tar.gz
-SOURCE_DIR = opencv-1.0.0
+SOURCE_DIR = build/opencv-1.0.0
MD5SUM_FILE = opencv-1.0.0.tar.gz.md5sum
UNPACK_CMD = tar xzf
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
ffmpeg:
@if [ ! -d `rospack find ffmpeg`/ffmpeg ]; then rosmake ffmpeg; fi
@@ -14,7 +14,7 @@
configured: $(SOURCE_DIR) Makefile
@if [ ! -d /usr/include/gtk-2.0 ]; then echo "you don't appear to have the GTK+2.0 headers. On Ubuntu, this is fixed with 'sudo apt-get install libgtk2.0-dev'"; false; fi
- patch -N -p0 <opencv.patch ; true
+ patch -N -p0 <../opencv.patch ; true
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${FFMPEG}/ffmpeg/lib && cd $(SOURCE_DIR) && ./configure --without-quicktime --with-ffmpeg --prefix=$(PWD)/opencv CFLAGS="-I${FFMPEG}/ffmpeg/include -I${FFMPEG}/ffmpeg/include/libavutils -I${FFMPEG}/include/libavformat" CPPFLAGS="-I${FFMPEG}/ffmpeg/include -I${FFMPEG}/ffmpeg/include/libavutils -I${FFMPEG}/ffmpeg/include/libavformat" LDFLAGS="-L${FFMPEG}/ffmpeg/lib" --with-gnu-ld --with-x
# hack up the opencv <=> ffmpeg interface so we can use the latest ffmpeg
touch configured
Modified: pkg/trunk/3rdparty/scipy/Makefile
===================================================================
--- pkg/trunk/3rdparty/scipy/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/scipy/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,12 +1,12 @@
all: scipy
-TARBALL = scipy-0.6.0.tar.gz
+TARBALL = build/scipy-0.6.0.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/scipy-0.6.0.tar.gz
-SOURCE_DIR = scipy-0.6.0
-MD5SUM_FILE = scipy-0.6.0.tar.gz.md5sum
+SOURCE_DIR = build/scipy-0.6.0
+MD5SUM_FILE = scipy-0.6.0.tar.gz.md5sum
UNPACK_CMD = tar xzf
NUMPY_PATH = `rospack find numpy`/src
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
scipy: $(SOURCE_DIR)
mkdir -p src
@@ -17,6 +17,6 @@
clean:
rm -rf src scipy $(SOURCE_DIR)
wipe: clean
- rm -rf $(TARBALL)
+ rm -rf build
all: scipy
Modified: pkg/trunk/3rdparty/soqt/Makefile
===================================================================
--- pkg/trunk/3rdparty/soqt/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/soqt/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,16 +1,16 @@
all: soqt
-TARBALL = SoQt-1.4.1.tar.gz
+TARBALL = build/SoQt-1.4.1.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/SoQt-1.4.1.tar.gz
-SOURCE_DIR = SoQt-1.4.1
+SOURCE_DIR = build/SoQt-1.4.1
MD5SUM_FILE = SoQt-1.4.1.tar.gz.md5sum
UNPACK_CMD = tar xzf
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
PATCH=soqt_qt4.patch
configured: $(SOURCE_DIR)
- cd $(SOURCE_DIR) && patch -s -N -p1 < ../$(PATCH) || echo
+ cd $(SOURCE_DIR) && patch -s -N -p1 < ../../$(PATCH) || echo
cd $(SOURCE_DIR) && autoconf && ./configure --prefix=$(PWD)
touch configured
Modified: pkg/trunk/3rdparty/vop/Makefile
===================================================================
--- pkg/trunk/3rdparty/vop/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/vop/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,17 +1,17 @@
all: vop
-TARBALL = vop-1.0.tar.gz
+TARBALL = build/vop-1.0.tar.gz
TARBALL_URL = http://www.excamera.com/files/vop-1.0.tar.gz
-SOURCE_DIR = vop-1.0
+SOURCE_DIR = build/vop-1.0
UNPACK_CMD = tar xzf
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
vop: $(SOURCE_DIR)
-rm -rf src
mkdir -p src
cd $(SOURCE_DIR) && \
python setup.py build && \
- python setup.py install --prefix ../src
+ python setup.py install --prefix ../../src
mv src/lib/python2.5/site-packages/* src/
rm -rf src/bin src/lib
touch vop
@@ -20,4 +20,4 @@
rm -rf src vop $(SOURCE_DIR)
wipe: clean
- rm -rf $(TARBALL)
+ rm -rf $(TARBALL) build
Modified: pkg/trunk/3rdparty/wxmpl/Makefile
===================================================================
--- pkg/trunk/3rdparty/wxmpl/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/wxmpl/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,10 +1,10 @@
all: wxmpl
-TARBALL = wxmpl-1.2.9.tar.gz
+TARBALL = build/wxmpl-1.2.9.tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/wxmpl-1.2.9.tar.gz
-SOURCE_DIR = wxmpl-1.2.9
+SOURCE_DIR = build/wxmpl-1.2.9
UNPACK_CMD = tar xzf
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
wxmpl: $(SOURCE_DIR)
-mkdir src
@@ -14,4 +14,4 @@
clean:
rm -rf src wxmpl
wipe: clean
- rm -rf $(SOURCE_DIR) $(TARBALL)
+ rm -rf $(SOURCE_DIR) $(TARBALL) build
Modified: pkg/trunk/3rdparty/wxswig/Makefile
===================================================================
--- pkg/trunk/3rdparty/wxswig/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/3rdparty/wxswig/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,10 +1,11 @@
all: wxswig
-TARBALL = SWIG-1.3.29-wx.tar.gz
-TARBALL_URL = http://pr.willowgarage.com/downloads/$(TARBALL)
-SOURCE_DIR = SWIG-1.3.29
+PKGVERSION = SWIG-1.3.29
+TARBALL = build/$(PKGVERSION)-wx.tar.gz
+TARBALL_URL = http://pr.willowgarage.com/downloads/$(PKGVERSION)-wx.tar.gz
+SOURCE_DIR = build/SWIG-1.3.29
UNPACK_CMD = tar xzf
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
$(VERSION)/Makefile: $(VERSION)/Makefile.in $(VERSION)/configure $(VERSION)/configure.in
cd $(VERSION) && \
@@ -13,9 +14,9 @@
wxswig: $(SOURCE_DIR)
cd $(SOURCE_DIR) && ./configure --prefix=$(shell rospack find wxswig) && make $(PARALLEL_JOBS) && make install
touch wxswig
-
+
clean:
rm -rf bin share $(SOURCE_DIR)
-
+
wipe: clean
- rm -rf $(TARBALL)
+ rm -rf build
Deleted: pkg/trunk/drivers/network/wifi_ddwrt/.backup-CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/network/wifi_ddwrt/.backup-CMakeLists.txt 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/drivers/network/wifi_ddwrt/.backup-CMakeLists.txt 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,5 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-include(rosbuild)
-rospack(rospy_demo)
-genmsg()
-rospack_add_rostest(test/talker-listener-test.xml)
Deleted: pkg/trunk/drivers/network/wifi_ddwrt/.backup-manifest.xml
===================================================================
--- pkg/trunk/drivers/network/wifi_ddwrt/.backup-manifest.xml 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/drivers/network/wifi_ddwrt/.backup-manifest.xml 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,11 +0,0 @@
-<package>
- <description brief="dd-wrt wifi ap">
- Access to the DD-WRT wifi
- </description>
- <author>Scott Hasasn/ha...@wi...</author>
- <license>BSD</license>
- <url>http://pr.willowgarage.com/wiki/wifi_ddwrt</url>
- <depend package="rospy" />
- <depend package="std_msgs" />
- <depend package="rostest" />
-</package>
Deleted: pkg/trunk/drivers/network/wifi_ddwrt/msg/.backup-APSignal.msg
===================================================================
--- pkg/trunk/drivers/network/wifi_ddwrt/msg/.backup-APSignal.msg 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/drivers/network/wifi_ddwrt/msg/.backup-APSignal.msg 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,2 +0,0 @@
-string name
-string msg
\ No newline at end of file
Deleted: pkg/trunk/drivers/network/wifi_ddwrt/nodes/.backup-chat
===================================================================
--- pkg/trunk/drivers/network/wifi_ddwrt/nodes/.backup-chat 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/drivers/network/wifi_ddwrt/nodes/.backup-chat 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,69 +0,0 @@
-#!/usr/bin/env python
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2008, Willow Garage, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of the Willow Garage nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# Revision $Id: gossipbot.py 1013 2008-05-21 01:08:56Z sfkwc $
-
-## chat is a simple IM-like test node. It demonstrates publishing and
-## subscribing to the same topic.
-
-PKG = 'rospy_demo'
-import rostools; rostools.update_path(PKG)
-
-import sys
-
-import rospy
-from rospy_demo.msg import *
-
-def chat(name):
- def callback(msg):
- print "%s: %s"%(msg.name, msg.msg)
- rospy.Subscriber("chat", Msg, callback)
- pub = rospy.Publisher("chat", Msg)
- rospy.init_node(name)
- while not rospy.is_shutdown():
- utter = sys.stdin.readline().strip()
- if utter:
- pub.publish(Msg(name, utter))
-
-if __name__ == '__main__':
- name = None
- try:
- print "Please type your name:"
- while not name:
- name = sys.stdin.readline().strip()
- chat(name)
- except KeyboardInterrupt, k:
- pass
- print "exiting"
-
-
Deleted: pkg/trunk/drivers/network/wifi_ddwrt/nodes/.backup-ddwrt
===================================================================
--- pkg/trunk/drivers/network/wifi_ddwrt/nodes/.backup-ddwrt 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/drivers/network/wifi_ddwrt/nodes/.backup-ddwrt 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,110 +0,0 @@
-#!/usr/bin/env python
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2008, Willow Garage, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of the Willow Garage nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# Revision $Id: gossipbot.py 1013 2008-05-21 01:08:56Z sfkwc $
-
-## chat is a simple IM-like test node. It demonstrates publishing and
-## subscribing to the same topic.
-
-PKG = 'wifi_ddwrt'
-import rostools; rostools.update_path(PKG)
-
-import sys, time, StringIO, string
-
-import rospy
-from wifi_ddwrt.msg import *
-
-from mechanize import Browser
-import csv
-
-class WifiAP:
- def __init__(self, hostname):
- self.hostname = hostname
- self.br = Browser()
- self.br.add_password(hostname, "root", "willow")
- self.br.set_handle_robots(None)
-
- def fetchSiteSurvey(self):
- url = "http://%s/Site_Survey.asp" % self.hostname
-
- response = self.br.open(url)
-
- body = response.read()
-
- networks = []
- survey = SiteSurvey(networks)
-
- lines = body.split("\n")
- for i in range(len(lines)):
- if lines[i].startswith("var table = "):
- break
-
- aplines = []
- for j in range(i+1, len(lines)):
- if lines[j].startswith(");"): break
- line = lines[j].strip()
- if not line: continue
- if line[0] == ",": line = line[1:]
-
- aplines.append(line)
-
- fp = StringIO.StringIO(string.join(aplines, '\n'))
- reader = csv.reader(fp)
- for row in reader:
- essid = row[0]
- macattr = row[2]
- channel = int(row[3])
- rssi = int(row[4])
- noise = int(row[5])
- beacon = int(row[6])
-
- network = Network(macattr, essid, channel, rssi, noise, beacon)
- survey.networks.append(network)
- return survey
-
-def loop():
- ap = WifiAP("10.68.0.5")
-
- pub = rospy.Publisher("ddwrt", SiteSurvey)
- rospy.init_node("ddwrt")
-
- while not rospy.is_shutdown():
- survey = ap.fetchSiteSurvey()
- pub.publish(survey)
- time.sleep(3)
-
-if __name__ == '__main__':
- loop()
- print "exiting"
-
-
Deleted: pkg/trunk/drivers/network/wifi_ddwrt/nodes/.backup-listener
===================================================================
--- pkg/trunk/drivers/network/wifi_ddwrt/nodes/.backup-listener 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/drivers/network/wifi_ddwrt/nodes/.backup-listener 2008-11-18 00:46:16 UTC (rev 6849)
@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2008, Willow Garage, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of the Willow Garage nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# Revision $Id: gossipbot.py 1013 2008-05-21 01:08:56Z sfkwc $
-
-## Simple talker demo that listens to std_msgs/Strings published to the 'chatter' topic
-
-PKG = 'rospy_demo' # this package name
-NAME = 'listener'
-
-import rostools; rostools.update_path(PKG)
-
-import sys
-
-import rospy
-from std_msgs.msg import *
-
-def callback(data):
- print rospy.get_caller_id(), "I heard %s"%data.data
-
-def listener():
- rospy.init_node(NAME, anonymous=True)
- rospy.Subscriber("chatter", String, callback)
- rospy.spin()
-
-if __name__ == '__main__':
- try:
- listener()
- except KeyboardInterrupt, e:
- pass
- print "exiting"
-
-
-
-
Modified: pkg/trunk/simulators/nepumuk/Makefile
===================================================================
--- pkg/trunk/simulators/nepumuk/Makefile 2008-11-18 00:39:58 UTC (rev 6848)
+++ pkg/trunk/simulators/nepumuk/Makefile 2008-11-18 00:46:16 UTC (rev 6849)
@@ -22,9 +22,9 @@
VERSION= r912
-TARBALL= nepumuk-$(VERSION).tar.gz
-TARBALL_URL= http://downloads.sourceforge.net/libsunflower/$(TARBALL)
-SOURCE_DIR= $(PWD)/nepumuk-$(VERSION)
+TARBALL= build/nepumuk-$(VERSION).tar.gz
+TARBALL_URL= http://downloads.sourceforge.net/libsunflower/nepumuk-$(VERSION).tar.gz
+SOURCE_DIR= $(PWD)/build/nepumuk-$(VERSION)
UNPACK_CMD= tar xfz
BUILD_DIR= $(PWD)/build
INST_DIR= $(PWD)/local
@@ -39,7 +39,7 @@
SIMULINKS= nepumuk rostest ros0.sh robots.ros0 layout.ros0 expodemo.sh robots.expo layout.expo
-include $(shell rospack find mk)/download_unpack.mk
+include $(shell rospack find mk)/download_unpack_build.mk
.PHONY: svn-all
svn-all: checkout_or_update
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
