You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by sz...@apache.org on 2012/06/05 20:00:46 UTC
svn commit: r1346495 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project: ./ hadoop-hdfs/
hadoop-hdfs/src/ hadoop-hdfs/src/contrib/fuse-dfs/
hadoop-hdfs/src/contrib/fuse-dfs/src/ hadoop-hdfs/src/main/native/
hadoop-hdfs/src/main/native/m4/
Author: szetszwo
Date: Tue Jun 5 18:00:44 2012
New Revision: 1346495
URL: http://svn.apache.org/viewvc?rev=1346495&view=rev
Log:
svn revert -c -1346102 for reverting HADOOP-8368.
Added:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/Makefile.am
- copied unchanged from r1346101, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/Makefile.am
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/acinclude.m4
- copied unchanged from r1346101, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/acinclude.m4
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/configure.ac
- copied unchanged from r1346101, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/configure.ac
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/pom.xml
- copied unchanged from r1346101, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/pom.xml
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/src/Makefile.am
- copied unchanged from r1346101, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/src/Makefile.am
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/Makefile.am
- copied unchanged from r1346101, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/Makefile.am
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/configure.ac
- copied unchanged from r1346101, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/configure.ac
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/m4/apfunctions.m4
- copied unchanged from r1346101, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/m4/apfunctions.m4
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/m4/apjava.m4
- copied unchanged from r1346101, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/m4/apjava.m4
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/m4/apsupport.m4
- copied unchanged from r1346101, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/m4/apsupport.m4
Removed:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/CMakeLists.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/config.h.cmake
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/src/CMakeLists.txt
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/src/fuse_dfs.h
hadoop/common/branches/branch-2/hadoop-hdfs-project/pom.xml
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml?rev=1346495&r1=1346494&r2=1346495&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/pom.xml Tue Jun 5 18:00:44 2012
@@ -377,22 +377,76 @@ http://maven.apache.org/xsd/maven-4.0.0.
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>make</id>
+ <id>compile</id>
<phase>compile</phase>
- <goals><goal>run</goal></goals>
+ <goals>
+ <goal>run</goal>
+ </goals>
<configuration>
<target>
- <mkdir dir="${project.build.directory}/native"/>
- <exec executable="cmake" dir="${project.build.directory}/native"
- failonerror="true">
- <arg line="${basedir}/src/ -DGENERATED_JAVAH=${project.build.directory}/native/javah -DJVM_ARCH_DATA_MODEL=${sun.arch.data.model}"/>
- </exec>
- <exec executable="make" dir="${project.build.directory}/native" failonerror="true">
- <arg line="VERBOSE=1"/>
- </exec>
+ <copy toDir="${project.build.directory}/native">
+ <fileset dir="${basedir}/src/main/native"/>
+ </copy>
+ <mkdir dir="${project.build.directory}/native/m4"/>
</target>
</configuration>
</execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>make-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>autoreconf</goal>
+ <goal>configure</goal>
+ <goal>make-install</goal>
+ </goals>
+ <configuration>
+ <!-- autoreconf settings -->
+ <workDir>${project.build.directory}/native</workDir>
+ <arguments>
+ <argument>-i</argument>
+ <argument>-f</argument>
+ </arguments>
+
+ <!-- configure settings -->
+ <configureEnvironment>
+ <property>
+ <name>ac_cv_func_malloc_0_nonnull</name>
+ <value>yes</value>
+ </property>
+ <property>
+ <name>JVM_ARCH</name>
+ <value>${sun.arch.data.model}</value>
+ </property>
+ </configureEnvironment>
+ <configureOptions>
+ </configureOptions>
+ <configureWorkDir>${project.build.directory}/native</configureWorkDir>
+ <prefix>/usr/local</prefix>
+
+ <!-- make settings -->
+ <installEnvironment>
+ <property>
+ <name>ac_cv_func_malloc_0_nonnull</name>
+ <value>yes</value>
+ </property>
+ <property>
+ <name>JVM_ARCH</name>
+ <value>${sun.arch.data.model}</value>
+ </property>
+ </installEnvironment>
+
+ <!-- configure & make settings -->
+ <destDir>${project.build.directory}/native/target</destDir>
+
+ </configuration>
+ </execution>
+
<!-- TODO wire here native testcases
<execution>
<id>test</id>
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/src/fuse_dfs.h
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/src/fuse_dfs.h?rev=1346495&r1=1346494&r2=1346495&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/src/fuse_dfs.h (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/src/fuse_dfs.h Tue Jun 5 18:00:44 2012
@@ -31,9 +31,13 @@
#include <fuse.h>
#include <fuse/fuse_opt.h>
-#include <sys/xattr.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
-#include "config.h"
+#ifdef HAVE_SETXATTR
+#include <sys/xattr.h>
+#endif
//
// Check if a path is in the mount option supplied protected paths.
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/pom.xml?rev=1346495&r1=1346494&r2=1346495&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/pom.xml Tue Jun 5 18:00:44 2012
@@ -33,6 +33,7 @@ http://maven.apache.org/xsd/maven-4.0.0.
<modules>
<module>hadoop-hdfs</module>
<module>hadoop-hdfs-httpfs</module>
+ <module>hadoop-hdfs/src/contrib/fuse-dfs</module>
<module>hadoop-hdfs/src/contrib/bkjournal</module>
</modules>