svn commit: r910834 - in /hadoop/pig/branches/load-store-redesign/contrib/zebra: CHANGES.txt build.xml

[ya...@apache.org]

Author: yanz
Date: Wed Feb 17 05:46:43 2010
New Revision: 910834

URL: http://svn.apache.org/viewvc?rev=910834&view=rev
Log:
PIG-1240 zebra manifest file enhancement (gauravj via yanz)

Modified:
    hadoop/pig/branches/load-store-redesign/contrib/zebra/CHANGES.txt
    hadoop/pig/branches/load-store-redesign/contrib/zebra/build.xml

Modified: hadoop/pig/branches/load-store-redesign/contrib/zebra/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/zebra/CHANGES.txt?rev=910834&r1=910833&r2=910834&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/zebra/CHANGES.txt (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/zebra/CHANGES.txt Wed Feb 17 05:46:43 2010
@@ -12,6 +12,8 @@
 
   IMPROVEMENTS
 
+    PIG-1240 zebra manifest file enhancement (gauravj via yanz)
+
     PIG-1140 Support of Hadoop 2.0 API (xuefuz via yanz)
 
     PIG-1170 new end-to-end and stress test cases (jing1234 via yanz)

Modified: hadoop/pig/branches/load-store-redesign/contrib/zebra/build.xml
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/contrib/zebra/build.xml?rev=910834&r1=910833&r2=910834&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/contrib/zebra/build.xml (original)
+++ hadoop/pig/branches/load-store-redesign/contrib/zebra/build.xml Wed Feb 17 05:46:43 2010
@@ -27,12 +27,23 @@
 
   <!-- Override jar target to specify main class -->
   <target name="jar" depends="compile" description="Build zebra jar">
+    <tstamp>
+       <format property="timestamp" pattern="MMM dd yyyy, HH:mm:ss" />
+    </tstamp>
+    <svnversion outputproperty="svn.revision"/>
+
     <jar
       jarfile="${build.dir}/${name}-${version}.jar"
       basedir="${build.classes}"      
     >
   	<manifest>
-	    <attribute name="Main-Class" value="org.apache.hadoop.zebra.io.BasicTable"/>
+          <section name="org/apache/hadoop/zebra">
+             <attribute name="Implementation-Vendor" value="Apache" />
+             <attribute name="Implementation-Title" value="Zebra" />
+             <attribute name="Implementation-Version" value="${version}" />
+             <attribute name="Build-TimeStamp" value="${timestamp}" />
+             <attribute name="Svn-Revision" value="${svn.revision}" />
+          </section>
 	</manifest>
 
         <zipfileset src="${pig.root}/lib/${hadoop.jarfile}">
@@ -41,6 +52,25 @@
     </jar>
   </target>
 
+  <macrodef name="svnversion">
+     <!-- the path needs to be small content otherwise it will take AGES ! -->
+     <attribute name="wcpath" default="${basedir}" />
+     <attribute name="outputproperty" />
+     <sequential>
+        <exec executable="svnversion" outputproperty="@{outputproperty}" failonerror="false" failifexecutionfails="false" >
+           <arg value="@{wcpath}" />
+           <redirector>
+             <outputfilterchain>
+                <tokenfilter>
+                   <!-- version can be xxxx, xxxx:yyyy, xxxxM, xxxxS or xxxx:yyyyMS , ... just get the working copy one -->
+                   <replaceregex pattern="((\d+).*)" replace="\2" />
+                   </tokenfilter>
+                </outputfilterchain>
+           </redirector>
+        </exec>
+    </sequential>
+  </macrodef>
+
   <target name="schema-jar" depends="compile">
     <jar
       jarfile="${build.dir}/schema-${version}.jar"