Author: cos
Date: Tue Dec 8 01:30:39 2009
New Revision: 888218
URL: http://svn.apache.org/viewvc?rev=888218&view=rev
Log:
HDFS-423. Unbreak FUSE build and fuse_dfs_wrapper.sh. Contributed by Todd
Lipcon.
Modified:
hadoop/hdfs/trunk/CHANGES.txt
hadoop/hdfs/trunk/build.xml
hadoop/hdfs/trunk/src/contrib/build-contrib.xml
hadoop/hdfs/trunk/src/contrib/fuse-dfs/build.xml
hadoop/hdfs/trunk/src/contrib/fuse-dfs/src/Makefile.am
hadoop/hdfs/trunk/src/contrib/fuse-dfs/src/fuse_dfs_wrapper.sh
Modified: hadoop/hdfs/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=888218&r1=888217&r2=888218&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Tue Dec 8 01:30:39 2009
@@ -90,6 +90,8 @@
HDFS-802. Update Eclipse configuration to match changes to Ivy
configuration (Edwin Chan via cos)
+ HDFS-423. Unbreak FUSE build and fuse_dfs_wrapper.sh (Todd Lipcon via cos)
+
Release 0.21.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hdfs/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/build.xml?rev=888218&r1=888217&r2=888218&view=diff
==============================================================================
--- hadoop/hdfs/trunk/build.xml (original)
+++ hadoop/hdfs/trunk/build.xml Tue Dec 8 01:30:39 2009
@@ -1086,6 +1086,8 @@
<env key="JVM_ARCH" value="${jvm.arch}"/>
<arg value="install"/>
</exec>
+ <!-- Create a build platform-agnostic link to c++ libs -->
+ <symlink overwrite="true" link="${build.dir}/c++/lib"
resource="${install.c++}/lib"/>
</target>
<target name="compile-ant-tasks" depends="compile-core">
Modified: hadoop/hdfs/trunk/src/contrib/build-contrib.xml
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/contrib/build-contrib.xml?rev=888218&r1=888217&r2=888218&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/contrib/build-contrib.xml (original)
+++ hadoop/hdfs/trunk/src/contrib/build-contrib.xml Tue Dec 8 01:30:39 2009
@@ -43,6 +43,9 @@
<property name="test.timeout" value="900000"/>
<property name="build.dir" location="${hadoop.root}/build/contrib/${name}"/>
<property name="build.classes" location="${build.dir}/classes"/>
+ <!-- NB: sun.arch.data.model is not supported on all platforms -->
+ <property name="build.platform"
+ value="${os.name}-${os.arch}-${sun.arch.data.model}"/>
<property name="build.test" location="${build.dir}/test"/>
<property name="build.examples" location="${build.dir}/examples"/>
<property name="hadoop.log.dir" location="${build.dir}/test/logs"/>
Modified: hadoop/hdfs/trunk/src/contrib/fuse-dfs/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/contrib/fuse-dfs/build.xml?rev=888218&r1=888217&r2=888218&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/contrib/fuse-dfs/build.xml (original)
+++ hadoop/hdfs/trunk/src/contrib/fuse-dfs/build.xml Tue Dec 8 01:30:39 2009
@@ -32,9 +32,9 @@
<target name="check-libhdfs-exists" if="fusedfs">
- <property name="libhdfs.lib"
value="${hadoop.root}/build/libhdfs/libhdfs.so"/>
+ <property name="libhdfs.lib"
value="${hadoop.root}/build/c++/${build.platform}/lib/libhdfs.so"/>
<available file="${libhdfs.lib}" property="libhdfs-exists"/>
- <fail message="libhdfs.so does not exist: ${libhdfs.lib}. Please check
flags -Dlibhdfs=1 -Dfusedfs=1 are set or first try ant compile-libhdfs
-Dlibhdfs=1">
+ <fail message="libhdfs.so does not exist: ${libhdfs.lib}. Please check
flags -Dlibhdfs=1 -Dfusedfs=1 are set or first try ant compile
-Dcompile.c++=true -Dlibhdfs=true">
<condition>
<not><isset property="libhdfs-exists"/></not>
</condition>
@@ -59,7 +59,7 @@
<env key="OS_ARCH" value="${os.arch}"/>
<env key="HADOOP_HOME" value="${hadoop.root}"/>
<env key="PACKAGE_VERSION" value="0.1.0"/>
-
+ <env key="BUILD_PLATFORM" value="${build.platform}" />
<env key="PERMS" value="${perms}"/>
</exec>
<mkdir dir="${build.dir}"/>
Modified: hadoop/hdfs/trunk/src/contrib/fuse-dfs/src/Makefile.am
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/contrib/fuse-dfs/src/Makefile.am?rev=888218&r1=888217&r2=888218&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/contrib/fuse-dfs/src/Makefile.am (original)
+++ hadoop/hdfs/trunk/src/contrib/fuse-dfs/src/Makefile.am Tue Dec 8 01:30:39
2009
@@ -17,5 +17,4 @@
bin_PROGRAMS = fuse_dfs
fuse_dfs_SOURCES = fuse_dfs.c fuse_options.c fuse_trash.c fuse_stat_struct.c
fuse_users.c fuse_init.c fuse_connect.c fuse_impls_access.c fuse_impls_chmod.c
fuse_impls_chown.c fuse_impls_create.c fuse_impls_flush.c
fuse_impls_getattr.c fuse_impls_mkdir.c fuse_impls_mknod.c fuse_impls_open.c
fuse_impls_read.c fuse_impls_release.c fuse_impls_readdir.c fuse_impls_rename.c
fuse_impls_rmdir.c fuse_impls_statfs.c fuse_impls_symlink.c
fuse_impls_truncate.c fuse_impls_utimens.c fuse_impls_unlink.c
fuse_impls_write.c
AM_CPPFLAGS= -DPERMS=$(PERMS) -D_FILE_OFFSET_BITS=64 -I$(JAVA_HOME)/include
-I$(HADOOP_HOME)/src/c++/libhdfs/ -I$(JAVA_HOME)/include/linux/
-D_FUSE_DFS_VERSION=\"$(PACKAGE_VERSION)\"
-DPROTECTED_PATHS=\"$(PROTECTED_PATHS)\" -I$(FUSE_HOME)/include
-AM_LDFLAGS= -L$(HADOOP_HOME)/build/libhdfs -lhdfs -L$(FUSE_HOME)/lib -lfuse
-L$(JAVA_HOME)/jre/lib/$(OS_ARCH)/server -ljvm
-
+AM_LDFLAGS= -L$(HADOOP_HOME)/build/c++/$(BUILD_PLATFORM)/lib -lhdfs
-L$(FUSE_HOME)/lib -lfuse -L$(JAVA_HOME)/jre/lib/$(OS_ARCH)/server -ljvm
Modified: hadoop/hdfs/trunk/src/contrib/fuse-dfs/src/fuse_dfs_wrapper.sh
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/contrib/fuse-dfs/src/fuse_dfs_wrapper.sh?rev=888218&r1=888217&r2=888218&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/contrib/fuse-dfs/src/fuse_dfs_wrapper.sh (original)
+++ hadoop/hdfs/trunk/src/contrib/fuse-dfs/src/fuse_dfs_wrapper.sh Tue Dec 8
01:30:39 2009
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -19,12 +20,6 @@
export HADOOP_HOME=/usr/local/share/hadoop
fi
-export PATH=$HADOOP_HOME/contrib/fuse_dfs:$PATH
-
-for f in ls $HADOOP_HOME/lib/*.jar $HADOOP_HOME/*.jar ; do
-export CLASSPATH=$CLASSPATH:$f
-done
-
if [ "$OS_ARCH" = "" ]; then
export OS_ARCH=amd64
fi
@@ -37,4 +32,17 @@
export
LD_LIBRARY_PATH=$JAVA_HOME/jre/lib/$OS_ARCH/server:/usr/local/share/hdfs/libhdfs/:/usr/local/lib
fi
-./fuse_dfs $@
+# If dev build set paths accordingly
+if [ -d $HADOOP_HDFS_HOME/build ]; then
+ export HADOOP_HOME=$HADOOP_HDFS_HOME
+ for f in ${HADOOP_HOME}/build/*.jar ; do
+ export CLASSPATH=$CLASSPATH:$f
+ done
+ for f in $HADOOP_HOME/build/ivy/lib/Hadoop-Hdfs/common/*.jar ; do
+ export CLASSPATH=$CLASSPATH:$f
+ done
+ export PATH=$HADOOP_HOME/build/contrib/fuse-dfs:$PATH
+ export
LD_LIBRARY_PATH=$HADOOP_HOME/build/c++/lib:$JAVA_HOME/jre/lib/$OS_ARCH/server
+fi
+
+fuse_dfs $@
