Author: cdouglas
Date: Thu Mar 26 05:00:56 2009
New Revision: 758519
URL: http://svn.apache.org/viewvc?rev=758519&view=rev
Log:
Commit HADOOP-5066 to 0.20 branch
Modified:
hadoop/core/branches/branch-0.20/CHANGES.txt
hadoop/core/branches/branch-0.20/build.xml
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=758519&r1=758518&r2=758519&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Thu Mar 26 05:00:56 2009
@@ -805,6 +805,9 @@
HADOOP-5390. Remove duplicate jars from tarball, src from binary tarball
added by hdfsproxy. (Zhiyong Zhang via cdouglas)
+ HADOOP-5066. Building binary tarball should not build docs/javadocs, copy
+ src, or run jdiff. (Giridharan Kesavan via cdouglas)
+
Release 0.19.2 - Unreleased
BUG FIXES
Modified: hadoop/core/branches/branch-0.20/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/build.xml?rev=758519&r1=758518&r2=758519&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/build.xml (original)
+++ hadoop/core/branches/branch-0.20/build.xml Thu Mar 26 05:00:56 2009
@@ -1151,7 +1151,78 @@
</macro_tar>
</target>
- <target name="binary" depends="package" description="Make tarball without
source and documentation">
+ <target name="bin-package" depends="compile, jar, examples, tools-jar,
jar-test, ant-tasks, package-librecordio"
+ description="assembles artifacts for binary target">
+ <mkdir dir="${dist.dir}"/>
+ <mkdir dir="${dist.dir}/lib"/>
+ <mkdir dir="${dist.dir}/contrib"/>
+ <mkdir dir="${dist.dir}/bin"/>
+
+ <copy todir="${dist.dir}/lib" includeEmptyDirs="false" flatten="true">
+ <fileset dir="${common.ivy.lib.dir}"/>
+ </copy>
+
+ <copy todir="${dist.dir}/lib" includeEmptyDirs="false">
+ <fileset dir="lib">
+ <exclude name="**/native/**"/>
+ </fileset>
+ </copy>
+
+ <exec dir="${dist.dir}" executable="sh" failonerror="true">
+ <env key="BASE_NATIVE_LIB_DIR" value="${lib.dir}/native"/>
+ <env key="BUILD_NATIVE_DIR" value="${build.dir}/native"/>
+ <env key="DIST_LIB_DIR" value="${dist.dir}/lib/native"/>
+ <arg line="${native.src.dir}/packageNativeHadoop.sh"/>
+ </exec>
+
+ <subant target="package">
+ <!--Pass down the version in case its needed again and the target
+ distribution directory so contribs know where to install to.-->
+ <property name="version" value="${version}"/>
+ <property name="dist.dir" value="${dist.dir}"/>
+ <fileset file="${contrib.dir}/build.xml"/>
+ </subant>
+
+ <copy todir="${dist.dir}/webapps">
+ <fileset dir="${build.webapps}"/>
+ </copy>
+
+ <copy todir="${dist.dir}">
+ <fileset file="${build.dir}/${final.name}-*.jar"/>
+ </copy>
+
+ <copy todir="${dist.dir}/bin">
+ <fileset dir="bin"/>
+ </copy>
+
+ <copy todir="${dist.dir}/conf">
+ <fileset dir="${conf.dir}" excludes="**/*.template"/>
+ </copy>
+
+ <copy file="ivy.xml" tofile="${dist.dir}/ivy.xml"/>
+
+ <copy todir="${dist.dir}/ivy">
+ <fileset dir="ivy"/>
+ </copy>
+
+ <copy todir="${dist.dir}">
+ <fileset dir=".">
+ <include name="*.txt" />
+ </fileset>
+ </copy>
+
+ <copy todir="${dist.dir}/c++" includeEmptyDirs="false">
+ <fileset dir="${build.dir}/c++"/>
+ </copy>
+
+ <copy todir="${dist.dir}/" file="build.xml"/>
+
+ <chmod perm="ugo+x" type="file" parallel="false">
+ <fileset dir="${dist.dir}/bin"/>
+ </chmod>
+ </target>
+
+ <target name="binary" depends="bin-package" description="Make tarball
without source and documentation">
<macro_tar param.destfile="${build.dir}/${final.name}-bin.tar.gz">
<param.listofitems>
<tarfileset dir="${build.dir}" mode="664">
