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 2009/09/08 20:24:00 UTC
svn commit: r812609 - in /hadoop/hive/branches/branch-0.4: CHANGES.txt
build-common.xml build.properties build.xml cli/ivy.xml common/ivy.xml
contrib/ivy.xml metastore/ivy.xml ql/ivy.xml serde/ivy.xml shims/build.xml
Author: zshao
Date: Tue Sep 8 18:23:59 2009
New Revision: 812609
URL: http://svn.apache.org/viewvc?rev=812609&view=rev
Log:
HIVE-726. Make "ant package -Dhadoop.version=0.17.0" work. (Todd Lipcon via zshao)
Modified:
hadoop/hive/branches/branch-0.4/CHANGES.txt
hadoop/hive/branches/branch-0.4/build-common.xml
hadoop/hive/branches/branch-0.4/build.properties
hadoop/hive/branches/branch-0.4/build.xml
hadoop/hive/branches/branch-0.4/cli/ivy.xml
hadoop/hive/branches/branch-0.4/common/ivy.xml
hadoop/hive/branches/branch-0.4/contrib/ivy.xml
hadoop/hive/branches/branch-0.4/metastore/ivy.xml
hadoop/hive/branches/branch-0.4/ql/ivy.xml
hadoop/hive/branches/branch-0.4/serde/ivy.xml
hadoop/hive/branches/branch-0.4/shims/build.xml
Modified: hadoop/hive/branches/branch-0.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/CHANGES.txt?rev=812609&r1=812608&r2=812609&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/CHANGES.txt (original)
+++ hadoop/hive/branches/branch-0.4/CHANGES.txt Tue Sep 8 18:23:59 2009
@@ -547,6 +547,9 @@
HIVE-750. New partitionpruner does not work with test mode.
(Namit Jain via zshao)
+ HIVE-726. Make "ant package -Dhadoop.version=0.17.0" work.
+ (Todd Lipcon via zshao)
+
Release 0.3.1 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hive/branches/branch-0.4/build-common.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/build-common.xml?rev=812609&r1=812608&r2=812609&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/build-common.xml (original)
+++ hadoop/hive/branches/branch-0.4/build-common.xml Tue Sep 8 18:23:59 2009
@@ -79,12 +79,12 @@
<ivy:retrieve pattern="${build.dir.hadoop}/[artifact]-[revision].[ext]"/>
</target>
- <available property="hadoopcore.${hadoop.version}.install.done" file="${build.dir.hadoop}/hadoop-${hadoop.version}.installed"/>
+ <available property="hadoopcore.${hadoop.version.ant-internal}.install.done" file="${build.dir.hadoop}/hadoop-${hadoop.version.ant-internal}.installed"/>
- <target name="install-hadoopcore-internal" depends="resolve" unless="hadoopcore.${hadoop.version}.install.done">
- <untar src="${build.dir.hadoop}/hadoop-${hadoop.version}.tar.gz" dest="${build.dir.hadoop}" compression="gzip"/>
+ <target name="install-hadoopcore-internal" depends="resolve" unless="hadoopcore.${hadoop.version.ant-internal}.install.done">
+ <untar src="${build.dir.hadoop}/hadoop-${hadoop.version.ant-internal}.tar.gz" dest="${build.dir.hadoop}" compression="gzip"/>
<chmod file="${hadoop.root}/bin/hadoop" perm="+x"/>
- <touch file="${build.dir.hadoop}/hadoop-${hadoop.version}.installed"/>
+ <touch file="${build.dir.hadoop}/hadoop-${hadoop.version.ant-internal}.installed"/>
</target>
<target name="install-hadoopcore-default" unless="hadoop.root.nondefault">
Modified: hadoop/hive/branches/branch-0.4/build.properties
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/build.properties?rev=812609&r1=812608&r2=812609&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/build.properties (original)
+++ hadoop/hive/branches/branch-0.4/build.properties Tue Sep 8 18:23:59 2009
@@ -9,10 +9,12 @@
build.dir.hive=${hive.root}/build
build.dir.hadoop=${build.dir.hive}/hadoopcore
-hadoop.root.default=${build.dir.hadoop}/hadoop-${hadoop.version}
+
+hadoop.version.ant-internal=${hadoop.version}
+hadoop.root.default=${build.dir.hadoop}/hadoop-${hadoop.version.ant-internal}
hadoop.root=${hadoop.root.default}
-hadoop.jar=${hadoop.root}/hadoop-${hadoop.version}-core.jar
-hadoop.test.jar=${hadoop.root}/hadoop-${hadoop.version}-test.jar
+hadoop.jar=${hadoop.root}/hadoop-${hadoop.version.ant-internal}-core.jar
+hadoop.test.jar=${hadoop.root}/hadoop-${hadoop.version.ant-internal}-test.jar
jetty.test.jar=${hadoop.root}/lib/jetty-5.1.4.jar
servlet.test.jar=${hadoop.root}/lib/servlet-api.jar
jasper.test.jar=${hadoop.root}/lib/jetty-ext/jasper-runtime.jar
Modified: hadoop/hive/branches/branch-0.4/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/build.xml?rev=812609&r1=812608&r2=812609&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/build.xml (original)
+++ hadoop/hive/branches/branch-0.4/build.xml Tue Sep 8 18:23:59 2009
@@ -45,7 +45,7 @@
<property name="images.src" value="${docs.src}/images"/>
<property name="javadoc.link.java"
value="http://java.sun.com/javase/6/docs/api/"/>
- <property name="final.name" value="${name}-${version}-hadoop-${hadoop.version}"/>
+ <property name="final.name" value="${name}-${version}-hadoop-${hadoop.version.ant-internal}"/>
<property name="dev.final.name" value="${final.name}-dev"/>
<property name="bin.final.name" value="${final.name}-bin"/>
@@ -248,17 +248,17 @@
<target name="eclipse-files" depends="init"
description="Generate files for Eclipse">
- <condition property="hadoop.version" value="0.19">
+ <condition property="hadoop.version.ant-internal" value="0.19">
<not>
- <isset property="hadoop.version"/>
+ <isset property="hadoop.version.ant-internal"/>
</not>
</condition>
- <echo message="Using hadoop version ${hadoop.version}"/>
+ <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.jar"/>
- <getversionpref property="hadoop.version.prefix" input="${hadoop.version}"/>
+ <getversionpref property="hadoop.version.ant-internal.prefix" input="${hadoop.version.ant-internal}"/>
<pathconvert property="eclipse.project">
<path path="${basedir}"/>
@@ -271,8 +271,8 @@
</fileset>
<filterset>
<filter token="PROJECT" value="${eclipse.project}"/>
- <filter token="HADOOPVER" value="${hadoop.version}"/>
- <filter token="HADOOPVERPREF" value="${hadoop.version.prefix}"/>
+ <filter token="HADOOPVER" value="${hadoop.version.ant-internal}"/>
+ <filter token="HADOOPVERPREF" value="${hadoop.version.ant-internal.prefix}"/>
</filterset>
</copy>
<move todir="." includeemptydirs="false">
Modified: hadoop/hive/branches/branch-0.4/cli/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/cli/ivy.xml?rev=812609&r1=812608&r2=812609&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/cli/ivy.xml (original)
+++ hadoop/hive/branches/branch-0.4/cli/ivy.xml Tue Sep 8 18:23:59 2009
@@ -1,7 +1,7 @@
<ivy-module version="2.0">
<info organisation="org.apache.hadoop.hive" module="cli"/>
<dependencies>
- <dependency org="hadoop" name="core" rev="${hadoop.version}">
+ <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
<artifact name="hadoop" type="source" ext="tar.gz"/>
</dependency>
</dependencies>
Modified: hadoop/hive/branches/branch-0.4/common/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/common/ivy.xml?rev=812609&r1=812608&r2=812609&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/common/ivy.xml (original)
+++ hadoop/hive/branches/branch-0.4/common/ivy.xml Tue Sep 8 18:23:59 2009
@@ -1,7 +1,7 @@
<ivy-module version="2.0">
<info organisation="org.apache.hadoop.hive" module="common"/>
<dependencies>
- <dependency org="hadoop" name="core" rev="${hadoop.version}">
+ <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
<artifact name="hadoop" type="source" ext="tar.gz"/>
</dependency>
</dependencies>
Modified: hadoop/hive/branches/branch-0.4/contrib/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/contrib/ivy.xml?rev=812609&r1=812608&r2=812609&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/contrib/ivy.xml (original)
+++ hadoop/hive/branches/branch-0.4/contrib/ivy.xml Tue Sep 8 18:23:59 2009
@@ -1,7 +1,7 @@
<ivy-module version="2.0">
<info organisation="org.apache.hadoop.hive" module="contrib"/>
<dependencies>
- <dependency org="hadoop" name="core" rev="${hadoop.version}">
+ <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
<artifact name="hadoop" type="source" ext="tar.gz"/>
</dependency>
</dependencies>
Modified: hadoop/hive/branches/branch-0.4/metastore/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/metastore/ivy.xml?rev=812609&r1=812608&r2=812609&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/metastore/ivy.xml (original)
+++ hadoop/hive/branches/branch-0.4/metastore/ivy.xml Tue Sep 8 18:23:59 2009
@@ -1,7 +1,7 @@
<ivy-module version="2.0">
<info organisation="org.apache.hadoop.hive" module="metastore"/>
<dependencies>
- <dependency org="hadoop" name="core" rev="${hadoop.version}">
+ <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
<artifact name="hadoop" type="source" ext="tar.gz"/>
</dependency>
</dependencies>
Modified: hadoop/hive/branches/branch-0.4/ql/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/ql/ivy.xml?rev=812609&r1=812608&r2=812609&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/ql/ivy.xml (original)
+++ hadoop/hive/branches/branch-0.4/ql/ivy.xml Tue Sep 8 18:23:59 2009
@@ -1,7 +1,7 @@
<ivy-module version="2.0">
<info organisation="org.apache.hadoop.hive" module="ql"/>
<dependencies>
- <dependency org="hadoop" name="core" rev="${hadoop.version}">
+ <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
<artifact name="hadoop" type="source" ext="tar.gz"/>
</dependency>
</dependencies>
Modified: hadoop/hive/branches/branch-0.4/serde/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/serde/ivy.xml?rev=812609&r1=812608&r2=812609&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/serde/ivy.xml (original)
+++ hadoop/hive/branches/branch-0.4/serde/ivy.xml Tue Sep 8 18:23:59 2009
@@ -1,7 +1,7 @@
<ivy-module version="2.0">
<info organisation="org.apache.hadoop.hive" module="serde"/>
<dependencies>
- <dependency org="hadoop" name="core" rev="${hadoop.version}">
+ <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
<artifact name="hadoop" type="source" ext="tar.gz"/>
</dependency>
</dependencies>
Modified: hadoop/hive/branches/branch-0.4/shims/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/shims/build.xml?rev=812609&r1=812608&r2=812609&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/shims/build.xml (original)
+++ hadoop/hive/branches/branch-0.4/shims/build.xml Tue Sep 8 18:23:59 2009
@@ -35,8 +35,8 @@
</path>
<target name="build_shims" description="Build shims against a particular hadoop version" depends="install-hadoopcore-internal, resolve">
- <getversionpref property="hadoop.version.prefix" input="${hadoop.version}" />
- <echo message="Compiling shims against hadoop ${hadoop.version}"/>
+ <getversionpref property="hadoop.version.ant-internal.prefix" input="${hadoop.version.ant-internal}" />
+ <echo message="Compiling shims against hadoop ${hadoop.version.ant-internal} (${hadoop.root})"/>
<javac
encoding="${build.encoding}"
includes="**/*.java"
@@ -45,23 +45,23 @@
deprecation="${javac.deprecation}">
<compilerarg line="${javac.args} ${javac.args.warnings}" />
<classpath refid="classpath"/>
- <src path="${basedir}/src/${hadoop.version.prefix}/java" />
+ <src path="${basedir}/src/${hadoop.version.ant-internal.prefix}/java" />
<src path="${basedir}/src/common/java" />
</javac>
</target>
- <target name="compile" depends="init, install-hadoopcore, setup">
+ <target name="compile" depends="init">
<antcall target="build_shims" inheritRefs="false" inheritAll="false">
- <param name="hadoop.version" value="0.17.2.1" />
+ <param name="hadoop.version.ant-internal" value="0.17.2.1" />
</antcall>
<antcall target="build_shims" inheritRefs="false" inheritAll="false">
- <param name="hadoop.version" value="0.18.3" />
+ <param name="hadoop.version.ant-internal" value="0.18.3" />
</antcall>
<antcall target="build_shims" inheritRefs="false" inheritAll="false">
- <param name="hadoop.version" value="0.19.0" />
+ <param name="hadoop.version.ant-internal" value="0.19.0" />
</antcall>
<antcall target="build_shims" inheritRefs="false" inheritAll="false">
- <param name="hadoop.version" value="0.20.0" />
+ <param name="hadoop.version.ant-internal" value="0.20.0" />
</antcall>
</target>