bkinnightskytw
/
kdl_parser
mirror of https://github.com/existedinnettw/kdl_parser.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update colladadom import, install and export

This commit is contained in:
hsu 2010-03-04 00:04:59 +00:00
parent 8931941e9d
commit d35626c330
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
colladadom/Makefile
View File

@ -2,25 +2,25 @@ all: installed
TARBALL = build/collada-dom-2.2.zip TARBALL = build/collada-dom-2.2.zip
TARBALL_URL = http://sourceforge.net/projects/collada-dom/files/Collada%20DOM/Collada%20DOM%202.2/collada-dom-2.2.zip/download TARBALL_URL = http://sourceforge.net/projects/collada-dom/files/Collada%20DOM/Collada%20DOM%202.2/collada-dom-2.2.zip/download
SOURCE_DIR = build/colladadom SOURCE_DIR = build/colladadom
INITIAL_DIR = build/collada-dom/dom INITIAL_DIR = build/collada-dom
UNPACK_CMD = unzip UNPACK_CMD = unzip
TARBALL_PATCH=use_1_5.patch TARBALL_PATCH=use_1_5.patch
MD5SUM_FILE = collada-dom-2.2.zip.md5sum MD5SUM_FILE = collada-dom-2.2.zip.md5sum
include $(shell rospack find mk)/download_unpack_build.mk include $(shell rospack find mk)/download_unpack_build.mk
ROOT = $(shell rospack find colladadom)/colladadom ROOT = $(shell rospack find colladadom)
installed: wiped $(SOURCE_DIR)/unpacked installed: wiped $(SOURCE_DIR)/unpacked
@echo "ROOT is: $(ROOT)" @echo "ROOT is: $(ROOT)"
-mkdir -p $(ROOT)
-mkdir -p $(ROOT)/include -mkdir -p $(ROOT)/include
-mkdir -p $(ROOT)/include/colladadom -mkdir -p $(ROOT)/include/colladadom
-mkdir -p $(ROOT)/lib -mkdir -p $(ROOT)/lib
@echo "making it" @echo "making it"
cd $(SOURCE_DIR) && make && make install cd $(SOURCE_DIR)/dom && make $(ROS_PARALLEL_JOBS)
#cd $(SOURCE_DIR) ; make $(ROS_PARALLEL_JOBS); cp -rf $(SOURCE_DIR)/dom/include/* $(ROOT)/include/colladadom/
#mv $(SOURCE_DIR)/boost $(ROOT)/ mv $(ROOT)/include/1.5/dom $(ROOT)/include/dom
cp -f $(SOURCE_DIR)/dom/build/linux-1.5/*.* $(ROOT)/lib/
touch installed touch installed
wiped: Makefile wiped: Makefile
@ -29,7 +29,7 @@ wiped: Makefile
clean: clean:
-cd $(SOURCE_DIR) && make clean -cd $(SOURCE_DIR) && make clean
rm -rf $(ROOT) installed rm -rf $(ROOT)/include $(ROOT)/lib installed
wipe: clean wipe: clean
rm -rf build rm -rf build

4
colladadom/manifest.xml
View File

@ -9,6 +9,10 @@
<review status="unreviewed" notes=""/> <review status="unreviewed" notes=""/>
<url>http://ros.org/wiki/colladadom</url> <url>http://ros.org/wiki/colladadom</url>
<export>
<cpp lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -l" cflags="-I${prefix}/include"/>
<doxymaker external="http://playerstage.sourceforge.net/doc/Gazebo-manual-svn-html/"/>
</export>
</package> </package>

8
colladadom/use_1_5.patch
View File

@ -1,7 +1,7 @@
Index: Makefile Index: dom/Makefile
=================================================================== ===================================================================
--- Makefile 2008-10-02 17:48:30.000000000 -0700 --- dom/Makefile 2008-10-02 17:48:30.000000000 -0700
+++ Makefile 2010-03-03 14:44:09.162398249 -0800 +++ dom/Makefile 2010-03-03 14:44:09.162398249 -0800
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
conf := release conf := release
@ -16,7 +16,7 @@ Index: Makefile
# You can only install on Mac or Linux. Check for that. # You can only install on Mac or Linux. Check for that.
ifeq ($(oss),linux) ifeq ($(oss),linux)
-prefix := /usr/local -prefix := /usr/local
+prefix := ../../colladadom +prefix := ../../../
else ifeq ($(oss),mac) else ifeq ($(oss),mac)
prefix := /Library/Frameworks prefix := /Library/Frameworks
else else