Author: omalley
Date: Thu Nov 13 14:57:44 2008
New Revision: 713849
URL: http://svn.apache.org/viewvc?rev=713849&view=rev
Log:
HADOOP-4645. Package HdfsProxy contrib project without the extra level
of directories. (Kan Zhang via omalley)
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/contrib/hdfsproxy/build.xml
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=713849&r1=713848&r2=713849&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Nov 13 14:57:44 2008
@@ -100,6 +100,9 @@
HADOOP-4608. Don't print a stack trace when the example driver gets an
unknown program to run. (Edward Yoon via omalley)
+ HADOOP-4645. Package HdfsProxy contrib project without the extra level
+ of directories. (Kan Zhang via omalley)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/core/trunk/src/contrib/hdfsproxy/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hdfsproxy/build.xml?rev=713849&r1=713848&r2=713849&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hdfsproxy/build.xml (original)
+++ hadoop/core/trunk/src/contrib/hdfsproxy/build.xml Thu Nov 13 14:57:44 2008
@@ -64,15 +64,14 @@
<!-- ==================================================================
-->
<!--
-->
<!-- ==================================================================
-->
- <target name="package" depends="jar" description="Build distribution">
+ <target name="local-package" depends="jar" description="Package in
local build directory">
<mkdir dir="${build.dir}/${final.name}"/>
- <mkdir dir="${build.dir}/${final.name}/lib"/>
<mkdir dir="${build.dir}/${final.name}/logs"/>
<copy todir="${build.dir}/${final.name}"
includeEmptyDirs="false">
<fileset dir="${build.dir}">
- <include name="**/*.jar" />
- <include name="**/*.war" />
+ <include name="*.jar" />
+ <include name="*.war" />
</fileset>
</copy>
<copy todir="${build.dir}/${final.name}/lib"
includeEmptyDirs="false">
@@ -127,11 +126,18 @@
</chmod>
</target>
+ <target name="package" depends="local-package" description="Build
distribution">
+ <mkdir dir="${dist.dir}/contrib/${name}"/>
+ <copy todir="${dist.dir}/contrib/${name}">
+ <fileset dir="${build.dir}/${final.name}"/>
+ </copy>
+ <chmod dir="${dist.dir}/contrib/${name}/bin" perm="a+x"
includes="*"/>
+ </target>
<!-- ==================================================================
-->
<!-- Make release tarball
-->
<!-- ==================================================================
-->
- <target name="tar" depends="package" description="Make release tarball">
+ <target name="tar" depends="local-package" description="Make release
tarball">
<macro_tar param.destfile="${build.dir}/${final.name}.tar.gz">
<param.listofitems>
<tarfileset dir="${build.dir}" mode="664">
@@ -145,10 +151,11 @@
</macro_tar>
</target>
- <target name="binary" depends="package" description="Make tarball
without source and documentation">
+ <target name="binary" depends="local-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">
+ <exclude name="${final.name}/bin/*" />
<exclude name="${final.name}/src/**" />
<exclude name="${final.name}/docs/**" />
<include name="${final.name}/**" />
