svn commit: r1024493 - in /hadoop/hive/trunk: CHANGES.txt build.xml

[jv...@apache.org]

Author: jvs
Date: Wed Oct 20 02:02:34 2010
New Revision: 1024493

URL: http://svn.apache.org/viewvc?rev=1024493&view=rev
Log:
HIVE-1736. Remove "-dev" suffix from release package name and
generate MD5 checksum using Ant (Carl Steinbach via jvs)


Modified:
    hadoop/hive/trunk/CHANGES.txt
    hadoop/hive/trunk/build.xml

Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=1024493&r1=1024492&r2=1024493&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Wed Oct 20 02:02:34 2010
@@ -661,6 +661,9 @@ Release 0.6.0 - 2010-10-19
     HIVE-1729. Satisfy ASF release management requirements
     (Carl Steinbach via jvs)
 
+    HIVE-1736. Remove "-dev" suffix from release package name and
+    generate MD5 checksum using Ant (Carl Steinbach via jvs)
+
   OPTIMIZATIONS
 
     HIVE-1348. Move inputFileChanged() from ExecMapper to where it is needed

Modified: hadoop/hive/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/build.xml?rev=1024493&r1=1024492&r2=1024493&view=diff
==============================================================================
--- hadoop/hive/trunk/build.xml (original)
+++ hadoop/hive/trunk/build.xml Wed Oct 20 02:02:34 2010
@@ -44,11 +44,12 @@
   <property name="javadoc.link.java"
             value="http://java.sun.com/javase/6/docs/api/"/>
   <property name="final.name" value="${name}-${version}"/>
-  <property name="dev.final.name" value="${final.name}-dev"/>
+  <property name="tar.final.name" value="${final.name}"/>
   <property name="bin.final.name" value="${final.name}-bin"/>
   <property name="vcs.excludes" value="**/.svn,**/.svn/**,**/.git,**/.git/**"/>
   <property name="checkstyle.conf.dir" location="${hive.root}/checkstyle"/>
   <property name="checkstyle.build.dir" location="${build.dir.hive}/checkstyle"/>
+  <property name="md5sum.format" value="{0}  {1}"/>
 
   <!-- hbase-handler is enabled by default only for Hadoop 0.20.x -->
   <condition property="hbase.enabled" value="true" else="false">
@@ -71,10 +72,10 @@
     <attribute name="param.destfile"/>
     <element name="param.listofitems"/>
     <sequential>
-      <tar compression="gzip" longfile="gnu"
-      destfile="@{param.destfile}">
+      <tar compression="gzip" longfile="gnu" destfile="@{param.destfile}">
       <param.listofitems/>
       </tar>
+      <checksum file="@{param.destfile}" algorithm="md5" pattern="${md5sum.format}"/>
     </sequential>
   </macrodef>
 
@@ -483,23 +484,23 @@
   <!-- ================================================================== -->
 
   <target name="tar" depends="package, docs, javadoc" description="Make release tarball">
-    <macro_tar param.destfile="${build.dir.hive}/${dev.final.name}.tar.gz">
+    <macro_tar param.destfile="${build.dir.hive}/${tar.final.name}.tar.gz">
       <param.listofitems>
-        <tarfileset dir="${build.dir.hive}/dist" mode="755" prefix="${dev.final.name}"
+        <tarfileset dir="${build.dir.hive}/dist" mode="755" prefix="${tar.final.name}"
                     excludes="${vcs.excludes}">
           <include name="bin/**"/>
         </tarfileset>
-        <tarfileset dir="${build.dir.hive}/dist" mode="755" prefix="${dev.final.name}"
+        <tarfileset dir="${build.dir.hive}/dist" mode="755" prefix="${tar.final.name}"
                     excludes="${vcs.excludes}">
           <include name="lib/py/**/*-remote"/>
         </tarfileset>
-        <tarfileset dir="${build.dir.hive}/dist" mode="664" prefix="${dev.final.name}"
+        <tarfileset dir="${build.dir.hive}/dist" mode="664" prefix="${tar.final.name}"
                     excludes="${vcs.excludes}">
           <include name="**"/>
           <exclude name="bin/**"/>
           <exclude name="lib/py/**/*-remote"/>
         </tarfileset>
-        <tarfileset dir="${hive.root}" mode="664" prefix="${dev.final.name}/src"
+        <tarfileset dir="${hive.root}" mode="664" prefix="${tar.final.name}/src"
                     excludes="${vcs.excludes}">
           <exclude name="build/**" />
           <exclude name="bin/**" />
@@ -508,7 +509,7 @@
           <exclude name="metastore/scripts/**" />
           <exclude name="ql/src/test/scripts/**" />
         </tarfileset>
-        <tarfileset dir="${hive.root}" mode="755" prefix="${dev.final.name}/src"
+        <tarfileset dir="${hive.root}" mode="755" prefix="${tar.final.name}/src"
                     excludes="${vcs.excludes}">
           <exclude name="build/**" />
           <include name="bin/**" />