hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1462674 - /hive/trunk/build.xml
Date Fri, 29 Mar 2013 23:27:05 GMT
Author: hashutosh
Date: Fri Mar 29 23:27:05 2013
New Revision: 1462674

URL: http://svn.apache.org/r1462674
Log:
HIVE-4263 : Adjust build.xml package command to move all hcat jars and binaries into build
(Alan Gates via Ashutosh Chauhan)

Modified:
    hive/trunk/build.xml

Modified: hive/trunk/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build.xml?rev=1462674&r1=1462673&r2=1462674&view=diff
==============================================================================
--- hive/trunk/build.xml (original)
+++ hive/trunk/build.xml Fri Mar 29 23:27:05 2013
@@ -474,7 +474,6 @@
       <fileset file="${build.dir.hive}/common/hive-common-${version}.jar"/>
       <fileset file="${build.dir.hive}/ql/hive-exec-${version}.jar"/>
       <fileset file="${build.dir.hive}/metastore/hive-metastore-${version}.jar"/>
-      <fileset file="${build.dir.hive}/hcatalog/hive-hcatalog-${version}.jar"/>
       <fileset file="${build.dir.hive}/hwi/hive-hwi-${version}.war"/>
       <fileset file="${build.dir.hive}/contrib/hive-contrib-${version}.jar"/>
       <fileset dir="${build.dir.hive}/ivy/lib/default">
@@ -511,6 +510,14 @@
       <fileset dir="${target.bin.dir}"/>
     </chmod>
 
+    <!-- Package the hcat stuff and pull it up into Hive's build dir -->
+    <ant antfile="${hive.root}/hcatalog/build.xml" target="package"
+        inheritAll="false"/>
+    <mkdir dir="${build.dir.hive}/hcatalog"/>
+    <copy todir="${build.dir.hive}/hcatalog">
+        <fileset dir="${hive.root}/hcatalog/build/hcatalog-${version}"/>
+    </copy>
+
     <!-- special case because builtins compilation depends on packaging
          up everything else first -->
     <ant antfile="${hive.root}/builtins/build.xml" target="package"
@@ -759,6 +766,9 @@
           <exclude name="docs/**"/>
           <exclude name="lib/py/**/*-remote"/>
         </tarfileset>
+        <tarfileset dir="${build.dir.hive}/hcatalog" mode="755" prefix="${bin.final.name}"
+                    excludes="${vcs.excludes}">
+        </tarfileset>
       </param.listofitems>
     </macro_tar>
   </target>



Mime
View raw message