Browse files

HIVE-4263 : Adjust build.xml package command to move all hcat jars an…

…d binaries into build (Alan Gates via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1462674 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent e94ac09 commit 54691dd5eb2664fb51fc20aa2b5c80f9e74457e4 @ashutoshc ashutoshc committed Mar 29, 2013
Showing with 11 additions and 1 deletion.
  1. +11 −1 build.xml
View
12 build.xml
@@ -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>

0 comments on commit 54691dd

Please sign in to comment.