From hcatalog-commits-return-254-apmail-incubator-hcatalog-commits-archive=incubator.apache.org@incubator.apache.org  Fri Jun  3 01:30:07 2011
Return-Path: <hcatalog-commits-return-254-apmail-incubator-hcatalog-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-hcatalog-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 7B51047D9
	for <apmail-incubator-hcatalog-commits-archive@minotaur.apache.org>; Fri,  3 Jun 2011 01:30:07 +0000 (UTC)
Received: (qmail 12106 invoked by uid 500); 3 Jun 2011 01:30:07 -0000
Delivered-To: apmail-incubator-hcatalog-commits-archive@incubator.apache.org
Received: (qmail 12084 invoked by uid 500); 3 Jun 2011 01:30:07 -0000
Mailing-List: contact hcatalog-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:hcatalog-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:hcatalog-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:hcatalog-commits@incubator.apache.org>
List-Id: <hcatalog-commits.incubator.apache.org>
Reply-To: hcatalog-dev@incubator.apache.org
Delivered-To: mailing list hcatalog-commits@incubator.apache.org
Received: (qmail 12077 invoked by uid 99); 3 Jun 2011 01:30:07 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jun 2011 01:30:07 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jun 2011 01:30:04 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1C83B23889E1; Fri,  3 Jun 2011 01:29:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1130882 - in /incubator/hcatalog/trunk: CHANGES.txt build.xml
Date: Fri, 03 Jun 2011 01:29:42 -0000
To: hcatalog-commits@incubator.apache.org
From: hashutosh@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110603012943.1C83B23889E1@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hashutosh
Date: Fri Jun  3 01:29:42 2011
New Revision: 1130882

URL: http://svn.apache.org/viewvc?rev=1130882&view=rev
Log:
HCATALOG-37: Misc. build.xml changes

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/build.xml

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1130882&r1=1130881&r2=1130882&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Fri Jun  3 01:29:42 2011
@@ -12,6 +12,9 @@ Trunk (unreleased changes)
     (Krishna Kumar via macyang)
     
   IMPROVEMENTS
+
+    HCAT-37. Misc. build.xml changes (macyang via hashutosh)
+  
     HCAT-27. Start and stop scripts for the server (gates)
 
     HCAT-21. Install documenation and script (gates)

Modified: incubator/hcatalog/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.xml?rev=1130882&r1=1130881&r2=1130882&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.xml (original)
+++ incubator/hcatalog/trunk/build.xml Fri Jun  3 01:29:42 2011
@@ -18,7 +18,7 @@
 -->
 
 
-<project name="hcatalog" default="fatjar" xmlns:ivy="antlib:org.apache.ivy.ant" >
+<project name="hcatalog" default="jar" xmlns:ivy="antlib:org.apache.ivy.ant" >
 
   <!--
   ================================================================================
@@ -32,7 +32,7 @@
 
   <!-- hive properties -->
   <property name="hive.root" value="${basedir}/hive/external"/>
-  <property name="hive.version" value="0.8.0"/>
+  <property name="hive.version" value="0.8.0-SNAPSHOT"/>
 
   <!-- build properties -->
   <property name="lib.dir" value="${basedir}/lib/" />
@@ -110,7 +110,7 @@
 
   <path id="test.classpath">
     <pathelement location="${test.build.classes}" />
-    <pathelement location="" />
+    <pathelement location="${build.classes}" />
     <pathelement location="conf"/>
     <pathelement location="${hive.conf.dir}"/>
     <!-- jars Hive depends on -->
@@ -227,12 +227,12 @@
  
   <!-- Build the jar, this is the default -->
   <target name="fatjar" depends="compile-src">
-     <jar jarfile="${hcatalog.jar}" basedir="${build.classes}">
+     <jar jarfile="${build.dir}/${ant.project.name}/${hcatalog.jar}" basedir="${build.classes}">
         <zipgroupfileset dir="${hive.root}/lib" includes="thrift-fb303-${thrift-fb303.version}.jar,thrift-${thrift.version}.jar,commons-lang-2.4.jar,derby.jar"/> 
-        <zipgroupfileset dir="${hive.root}/metastore" includes="hive-metastore-${version}.jar"/> 
-        <zipgroupfileset dir="${hive.root}/ql" includes="hive-exec-${version}.jar"/> 
-        <zipgroupfileset dir="${hive.root}/common" includes="hive-common-${version}.jar"/> 
-        <zipgroupfileset dir="${hive.root}/serde" includes="hive-serde-${version}.jar"/> 
+        <zipgroupfileset dir="${hive.root}/build/metastore" includes="hive-metastore-${hive.version}.jar"/> 
+        <zipgroupfileset dir="${hive.root}/build/ql" includes="hive-exec-${hive.version}.jar"/> 
+        <zipgroupfileset dir="${hive.root}/build/common" includes="hive-common-${hive.version}.jar"/> 
+        <zipgroupfileset dir="${hive.root}/build/serde" includes="hive-serde-${hive.version}.jar"/> 
     </jar>
   </target>
 
@@ -245,9 +245,16 @@
   <target name="server-extensions" depends="compile-src">
      <jar jarfile="${build.dir}/${ant.project.name}/${final.name}-server-extensions.jar" basedir="${build.classes}"
  	  includes="org/apache/hcatalog/listener/**,org/apache/hcatalog/metadata/**">
- </jar>
+  </jar>
   </target>
 
+  <!--
+  ================================================================================
+  Build both fatjar and server-extensions
+  ================================================================================
+  -->
+  <target name="jar" depends="fatjar,server-extensions"/>
+
 
  <!--
   ================================================================================