You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by zs...@apache.org on 2010/01/13 20:23:03 UTC
svn commit: r898905 - in /hadoop/hive/branches/branch-0.5: CHANGES.txt
build.xml
Author: zshao
Date: Wed Jan 13 19:23:03 2010
New Revision: 898905
URL: http://svn.apache.org/viewvc?rev=898905&view=rev
Log:
HIVE-1049. Fix ant targets eclipse-files and javadoc. (Carl Steinbach via zshao)
Modified:
hadoop/hive/branches/branch-0.5/CHANGES.txt
hadoop/hive/branches/branch-0.5/build.xml
Modified: hadoop/hive/branches/branch-0.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.5/CHANGES.txt?rev=898905&r1=898904&r2=898905&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.5/CHANGES.txt (original)
+++ hadoop/hive/branches/branch-0.5/CHANGES.txt Wed Jan 13 19:23:03 2010
@@ -436,6 +436,9 @@
HIVE-1039 bug in multi table/directory inserts
(Ning Zhang via namit)
+ HIVE-1049. Fix ant targets "eclipse-files" and "javadoc".
+ (Carl Steinbach via zshao)
+
Release 0.4.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hive/branches/branch-0.5/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.5/build.xml?rev=898905&r1=898904&r2=898905&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.5/build.xml (original)
+++ hadoop/hive/branches/branch-0.5/build.xml Wed Jan 13 19:23:03 2010
@@ -122,11 +122,14 @@
<iterate-all target="test-init"/>
</target>
- <target name="compile-cpp" depends="init">
+ <target name="compile-cpp"
+ depends="init"
+ description="Build CPP artifacts" >
<iterate-cpp target="compile-cpp"/>
</target>
- <target name="compile-cpp-clean">
+ <target name="compile-cpp-clean"
+ description="Clean CPP artifacts">
<iterate-cpp target="clean"/>
</target>
@@ -134,17 +137,21 @@
<iterate target="compile"/>
</target>
- <target name="jar">
+ <target name="jar"
+ description="Build JAR artifacts">
<iterate target="jar"/>
</target>
- <target name="test" depends="clean-test,jar">
+ <target name="test"
+ depends="clean-test,jar"
+ description="Run tests">
<iterate target="test"/>
<iterate-cpp target="test"/>
</target>
<!-- create an html report from junit output files -->
- <target name="testreport">
+ <target name="testreport"
+ description="Generate JUnit HTML test report">
<junitreport todir="${test.build.dir}">
<fileset dir="${build.dir.hive}">
<include name="**/TEST-*.xml"/>
@@ -153,12 +160,14 @@
</junitreport>
</target>
- <target name="clean-test">
+ <target name="clean-test"
+ description="Clean test results">
<iterate target="clean-test"/>
<delete dir="${build.dir.hive}/test"/>
</target>
- <target name="clean">
+ <target name="clean"
+ description="Clean build artifacts">
<iterate-all target="clean"/>
<iterate-cpp target="clean"/>
<delete dir="${target.dir}"/>
@@ -168,13 +177,17 @@
<!-- ====================================================== -->
<!-- Generate some of the test data. -->
<!-- ====================================================== -->
- <target name="gen-testdata" depends="jar">
+ <target name="gen-testdata"
+ depends="jar"
+ description="Generate test data">
<subant target="gen-testdata">
<fileset dir="." includes="serde/build.xml"/>
</subant>
</target>
- <target name="package-cpp" depends="package,compile-cpp">
+ <target name="package-cpp"
+ depends="package,compile-cpp"
+ description="Deploy CPP artifacts">
<mkdir dir="${target.dir}/include"/>
<copy todir="${target.dir}/include" preservelastmodified="true" flatten="true">
<fileset file="${build.dir.hive}/odbc/include/*"/>
@@ -186,7 +199,9 @@
</target>
- <target name="package" depends="jar">
+ <target name="package"
+ depends="jar"
+ description="Deploy JAR artifacts">
<echo message="Deploying Hive jars to ${target.dir}"/>
<mkdir dir="${target.dir}"/>
<mkdir dir="${target.lib.dir}"/>
@@ -275,7 +290,7 @@
<echo message="Using hadoop version ${hadoop.version.ant-internal}"/>
<taskdef name="getversionpref" classname="org.apache.hadoop.hive.ant.GetVersionPref"
- classpath="${build.dir.hive}/anttasks/hive-anttasks-{$version}.jar"/>
+ classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar"/>
<getversionpref property="hadoop.version.ant-internal.prefix" input="${hadoop.version.ant-internal}"/>
@@ -347,9 +362,10 @@
</copy>
</target>
- <target name="javadoc" depends="package" description="Generate javadoc">
+ <target name="javadoc" depends="package" description="Generate Javadoc">
<mkdir dir="${build.javadoc}"/>
<javadoc
+ maxmemory="1024m"
packagenames="org.apache.hadoop.hive.*"
destdir="${build.javadoc}"
author="true"