svn commit: r806910 - in /hadoop/hive/branches/branch-0.4: CHANGES.txt build-common.xml build.xml

[rm...@apache.org]

Author: rmurthy
Date: Sat Aug 22 23:58:48 2009
New Revision: 806910

URL: http://svn.apache.org/viewvc?rev=806910&view=rev
Log:
HIVE-760. Add version info to META-INF/MANIFEST.MF 
(Bill Graham via rmurthy)


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.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=806910&r1=806909&r2=806910&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/CHANGES.txt (original)
+++ hadoop/hive/branches/branch-0.4/CHANGES.txt Sat Aug 22 23:58:48 2009
@@ -217,6 +217,9 @@
     HIVE-737. Support having hadoop jars in HADOOP_HOME/build for running
     hive cli. (Johan Oskarsson via athusoo)
 
+    HIVE-760. Add version info to META-INF/MANIFEST.MF 
+    (Bill Graham via rmurthy)
+
   OPTIMIZATIONS
 
     HIVE-279. Predicate Pushdown support (Prasad Chakka via athusoo).

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=806910&r1=806909&r2=806910&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/build-common.xml (original)
+++ hadoop/hive/branches/branch-0.4/build-common.xml Sat Aug 22 23:58:48 2009
@@ -167,8 +167,15 @@
     <echo message="Jar: ${ant.project.name}"/>
     <jar
       jarfile="${build.dir}/hive_${ant.project.name}.jar"
-      basedir="${build.classes}"
-    />
+      basedir="${build.classes}">
+      <manifest>
+        <!-- Not putting these in their own manifest section, since that inserts
+        a new-line, which breaks the reading of the attributes. -->
+        <attribute name="Implementation-Title" value="Hive"/>
+        <attribute name="Implementation-Version" value="${version}"/>
+        <attribute name="Implementation-Vendor" value="Apache"/>
+      </manifest>
+    </jar>
   </target>
 
   <!-- target to compile tests -->
@@ -271,6 +278,8 @@
   <!-- target to run the tests -->
   <target name="test"
   	depends="test-conditions,gen-test,compile-test,test-jar,test-init">
+    <!--<property name="testcp" refid="test.classpath"/>-->
+    <!--<echo message="test.classpath: ${testcp}"/>-->
     <junit showoutput="${test.output}" printsummary="yes" haltonfailure="no"
            fork="yes" maxmemory="512m" dir="${basedir}" timeout="${test.timeout}"
            errorProperty="tests.failed" failureProperty="tests.failed" filtertrace="off">

Modified: hadoop/hive/branches/branch-0.4/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.4/build.xml?rev=806910&r1=806909&r2=806910&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.4/build.xml (original)
+++ hadoop/hive/branches/branch-0.4/build.xml Sat Aug 22 23:58:48 2009
@@ -25,6 +25,11 @@
   <property file="${user.home}/build.properties" />
   <property file="${basedir}/build.properties" />
 
+  <!-- This is the version added to the manifest, which must be manually rev'ed
+  whenever a branch version is created. The non-numberic/dot characters are
+  silently dropped from the Implementation-Version when added to the manifest. -->
+  <property name="version" value="0.4.0-dev"/>
+
   <property name="target.dir" location="${build.dir.hive}/dist"/>
   <property name="target.lib.dir" location="${target.dir}/lib"/>
   <property name="target.conf.dir" location="${target.dir}/conf"/>