svn commit: r1478428 - /hive/trunk/build.xml

[ha...@apache.org]

Author: hashutosh
Date: Thu May  2 16:21:40 2013
New Revision: 1478428

URL: http://svn.apache.org/r1478428
Log:
HIVE-4455 : HCatalog build directories get included in tar file produced by ant tar (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=1478428&r1=1478427&r2=1478428&view=diff
==============================================================================
--- hive/trunk/build.xml (original)
+++ hive/trunk/build.xml Thu May  2 16:21:40 2013
@@ -506,8 +506,8 @@
     <!-- 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">
+    <mkdir dir="${target.dir}/hcatalog"/>
+    <copy todir="${target.dir}/hcatalog">
         <fileset dir="${hive.root}/hcatalog/build/hcatalog-${hcatalog.version}"/>
     </copy>
   </target>
@@ -711,6 +711,7 @@
         <tarfileset dir="${hive.root}" mode="664" prefix="${tar.final.name}/src"
                     excludes="${vcs.excludes}">
           <exclude name="build/**" />
+          <exclude name="hcatalog/**/build/**" />
           <exclude name="bin/**" />
           <exclude name="**/py/**/*-remote" />
           <exclude name="data/scripts/**" />
@@ -720,6 +721,7 @@
         <tarfileset dir="${hive.root}" mode="755" prefix="${tar.final.name}/src"
                     excludes="${vcs.excludes}">
           <exclude name="build/**" />
+          <exclude name="hcatalog/**/build/**" />
           <include name="bin/**" />
           <include name="**/py/**/*-remote" />
           <include name="data/scripts/**" />
@@ -750,9 +752,6 @@
           <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>