HDFS-2040. Only build libhdfs if a flag is passed. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/trunk@1133225 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index d3da283..ff0ff4b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -488,6 +488,8 @@
HDFS-2029. In TestWriteRead, check visible length immediately after
openning the file and fix code style. (John George via szetszwo)
+ HDFS-2040. Only build libhdfs if a flag is passed. (eli)
+
OPTIMIZATIONS
HDFS-1458. Improve checkpoint performance by avoiding unnecessary image
diff --git a/build.xml b/build.xml
index af0d0f9..92b662e 100644
--- a/build.xml
+++ b/build.xml
@@ -326,10 +326,6 @@
</target>
- <target name="set-c++-libhdfs">
- <property name="libhdfs" value="true"/>
- </target>
-
<import file="${test.src.dir}/aop/build/aop.xml"/>
<target name="compile-hdfs-classes" depends="init">
@@ -1102,7 +1098,7 @@
</macro_tar>
</target>
- <target name="bin-package" depends="set-c++-libhdfs, compile, compile-c++-libhdfs, jar, jar-test, ant-tasks, jsvc"
+ <target name="bin-package" depends="compile, compile-c++-libhdfs, jar, jar-test, ant-tasks, jsvc"
description="assembles artifacts for binary target">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/lib"/>
@@ -1118,7 +1114,7 @@
</copy>
<copy todir="${dist.dir}/lib" includeEmptyDirs="false">
- <fileset dir="${build.dir}/c++/${build.platform}/lib">
+ <fileset dir="${build.dir}/c++/${build.platform}/lib" erroronmissingdir="false">
<include name="**"/>
</fileset>
</copy>
