ann is replaced by flann & liccd is now a .deb

git-svn-id: https://kforge.ros.org/fcl/fcl_ros@73 253336fb-580f-4252-a368-f3cef5a2a82b

trunk/ann/Makefile

-all: installed
-
-#
-# Download, extract and compile from a released tarball:
-#
-TARBALL = build/ann_1.1.2.tar.gz
-TARBALL_URL = http://www.cs.umd.edu/~mount/ANN/Files/1.1.2/ann_1.1.2.tar.gz
-TARBALL_PATCH = fANN.diff
-INITIAL_DIR = build/ann_1.1.2
-SOURCE_DIR = build/ann-tar
-include $(shell rospack find mk)/download_unpack_build.mk
-
-INSTALL_DIR = ann
-CMAKE = cmake 
-CMAKE_ARGS = -D CMAKE_BUILD_TYPE="Release" -D CMAKE_INSTALL_PREFIX=`rospack find ann`/$(INSTALL_DIR) 
-MAKE_ARGS = linux-g++
-MAKE = make
-
-installed: wiped $(SOURCE_DIR)/unpacked
-	cd $(SOURCE_DIR) && make $(ROS_PARALLEL_JOBS) $(MAKE_ARGS)
-	mkdir -p $(INSTALL_DIR)/include
-	mkdir -p $(INSTALL_DIR)/include/ANN
-	cp -r $(SOURCE_DIR)/include/ANN/*.h $(INSTALL_DIR)/include/ANN
-	cp -r $(SOURCE_DIR)/bin $(INSTALL_DIR)
-	cp -r $(SOURCE_DIR)/lib $(INSTALL_DIR)
-	touch installed
-
-clean:
-	rm -rf build
-	rm -rf $(INSTALL_DIR) installed
-
-wiped: Makefile
-	make wipe
-	touch wiped
-
-wipe: clean
-	rm -rf build patched

trunk/ann/fANN.diff

-diff -purN ann_1.1.2/include/ANN/ANN.h ann_1.1.2_modified/include/ANN/ANN.h
---- include/ANN/ANN.h	2010-01-27 20:40:01.000000000 -0800
-+++ include/ANN/ANN.h	2011-08-30 12:13:26.629632052 -0700
-@@ -232,7 +232,7 @@ const ANNdist	ANN_DIST_INF = ANN_DBL_MAX
- //	strictly positive.
- //----------------------------------------------------------------------
- 
--const ANNbool	ANN_ALLOW_SELF_MATCH	= ANNtrue;
-+const ANNbool	ANN_ALLOW_SELF_MATCH	= ANNfalse;
- 
- //----------------------------------------------------------------------
- //	Norms and metrics:
-diff -purN ann_1.1.2/Make-config ann_1.1.2_modified/Make-config
---- Make-config	2010-01-27 20:40:01.000000000 -0800
-+++ Make-config	2011-08-30 12:12:42.916876291 -0700
-@@ -72,7 +72,7 @@ linux-g++:
- 	$(MAKE) targets \
- 	"ANNLIB = libANN.a" \
- 	"C++ = g++" \
--	"CFLAGS = -O3" \
-+	"CFLAGS = -O3 -fPIC" \
- 	"MAKELIB = ar ruv" \
- 	"RANLIB = true"
- 

trunk/ann/fPIC.diff

---- Make-config	2010-01-27 20:40:01.000000000 -0800
-+++ Make-config	2011-08-25 14:29:00.000000000 -0700
-@@ -72,7 +72,7 @@ linux-g++:
- 	$(MAKE) targets \
- 	"ANNLIB = libANN.a" \
- 	"C++ = g++" \
--	"CFLAGS = -O3" \
-+	"CFLAGS = -O3 -fPIC" \
- 	"MAKELIB = ar ruv" \
- 	"RANLIB = true"
- 

trunk/ann/mainpage.dox

-/**
-\mainpage
-\htmlinclude manifest.html
-
-\b ann is ... 
-
-<!-- 
-Provide an overview of your package.
--->
-
-
-\section codeapi Code API
-
-<!--
-Provide links to specific auto-generated API documentation within your
-package that is of particular interest to a reader. Doxygen will
-document pretty much every part of your code, so do your best here to
-point the reader to the actual API.
-
-If your codebase is fairly large or has different sets of APIs, you
-should use the doxygen 'group' tag to keep these APIs together. For
-example, the roscpp documentation has 'libros' group.
--->
-
-
-*/

trunk/ann/manifest.xml

-<package>
-  <description brief="ann">
-    This package is a wrapper on the ann library available from <a href="http://www.cs.umd.edu/~mount/ANN/">ANN library</a>. This package does not modify the contents of the original library in any manner and only wraps it for easy distribution with the ROS packaging system.
-  </description>
-  <author>Maintained by Jia Pan, Sachin Chitta</author>
-  <license>BSD</license>
-  <review status="unreviewed" notes=""/>
-  <url>http://ros.org/wiki/ann</url>
-  <export>
-    <cpp cflags="-I${prefix}/ann/include" lflags="-L${prefix}/ann/lib -Wl,-rpath,${prefix}/ann/lib -lANN"/>
-  </export>
-
-</package>
-
-

trunk/fcl/manifest.xml

@@ -8,10 +8,12 @@
   <license>BSD</license>
   <review status="unreviewed" notes=""/>
   <url>http://ros.org/wiki/fcl</url>
-  <depend package="libccd"/>
+
   <!-- <depend package="ann"/> -->
   <depend package="common_rosdeps"/>
   <rosdep name="flann" />
+  <rosdep name="libccd" />
+
   <export>
     <cpp cflags="-I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lfcl"/>
   </export>

trunk/libccd/Makefile

-all: installed
-
-#
-# Download, extract and compile from a released tarball:
-#
-TARBALL = build/libccd_1.0.tar.gz
-TARBALL_URL = http://libccd.danfis.cz/files/libccd-1.0.tar.gz
-TARBALL_PATCH = fPIC.diff
-INITIAL_DIR = build/libccd-1.0
-SOURCE_DIR = build/libccd-tar
-include $(shell rospack find mk)/download_unpack_build.mk
-
-INSTALL_DIR = libccd
-CMAKE = cmake 
-CMAKE_ARGS = -D CMAKE_BUILD_TYPE="Release" -D CMAKE_INSTALL_PREFIX=`rospack find libccd`/$(INSTALL_DIR) 
-MAKE = make
-
-installed: wiped $(SOURCE_DIR)/unpacked
-	cd $(SOURCE_DIR)/src && make $(ROS_PARALLEL_JOBS)
-	mkdir -p $(INSTALL_DIR)/lib
-	mkdir -p $(INSTALL_DIR)/include
-	mkdir -p $(INSTALL_DIR)/include/ccd
-	cp -r $(SOURCE_DIR)/src/ccd/*.h $(INSTALL_DIR)/include/ccd
-	cp -r $(SOURCE_DIR)/src/*.a $(INSTALL_DIR)/lib
-	touch installed
-
-clean:
-	rm -rf build
-	rm -rf $(INSTALL_DIR) installed
-
-wiped: Makefile
-	make wipe
-	touch wiped
-
-wipe: clean
-	rm -rf build patched

trunk/libccd/fPIC.diff

---- src/Makefile	2010-11-04 09:46:32.000000000 -0700
-+++ src/Makefile	2011-08-25 14:49:52.000000000 -0700
-@@ -17,7 +17,7 @@
- 
- -include Makefile.include
- 
--CFLAGS += -I.
-+CFLAGS += -I. -fPIC
- 
- TARGETS = libccd.a
- OBJS = ccd.o mpr.o support.o vec3.o alloc.o polytope.o

trunk/libccd/mainpage.dox

-/**
-\mainpage
-\htmlinclude manifest.html
-
-\b libccd is ... 
-
-<!-- 
-Provide an overview of your package.
--->
-
-
-\section codeapi Code API
-
-<!--
-Provide links to specific auto-generated API documentation within your
-package that is of particular interest to a reader. Doxygen will
-document pretty much every part of your code, so do your best here to
-point the reader to the actual API.
-
-If your codebase is fairly large or has different sets of APIs, you
-should use the doxygen 'group' tag to keep these APIs together. For
-example, the roscpp documentation has 'libros' group.
--->
-
-
-*/

trunk/libccd/manifest.xml

-<package>
-  <description brief="libccd">
-    This package is a wrapper on the libccd library available from <a href="http://libccd.danfis.cz/">here</a>. This package does not modify the contents of the original library in any manner and only wraps it for easy distribution with the ROS packaging system.
-  </description>
-  <author>Maintained by Jia Pan and Sachin Chitta</author>
-  <license>BSD</license>
-  <review status="unreviewed" notes=""/>
-  <url>http://ros.org/wiki/libccd</url>
-  <export>
-    <cpp cflags="-I${prefix}/libccd/include" lflags="-L${prefix}/libccd/lib -Wl,-rpath,${prefix}/libccd/lib -lccd"/>
-  </export>
-
-</package>
-
-