Author: khorgath
Date: Tue Sep 3 21:19:50 2013
New Revision: 1519853
URL: http://svn.apache.org/r1519853
Log:
HIVE-5014 : Fix HCatalog build issue on Windows (Daniel Dai via Sushanth
Sowmyan)
Modified:
hive/trunk/hcatalog/build.xml
Modified: hive/trunk/hcatalog/build.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/build.xml?rev=1519853&r1=1519852&r2=1519853&view=diff
==============================================================================
--- hive/trunk/hcatalog/build.xml (original)
+++ hive/trunk/hcatalog/build.xml Tue Sep 3 21:19:50 2013
@@ -242,15 +242,12 @@
<packageset dir="webhcat/svr/src/main/java"/>
<packageset dir="webhcat/java-client/src/main/java"/>
<classpath>
- <fileset dir="core/build/lib/test"/>
- <fileset dir="hcatalog-pig-adapter/build/lib/compile"/>
- <fileset dir="hcatalog-pig-adapter/build/lib/provided"/>
- <fileset dir="server-extensions/build/lib/compile"/>
- <fileset dir="server-extensions/build/lib/provided"/>
- <fileset dir="storage-handlers/hbase/build/lib/compile"/>
- <fileset dir="storage-handlers/hbase/build/lib/provided"/>
- <fileset dir="webhcat/svr/build/lib/compile"/>
- <fileset dir="webhcat/svr/build/lib/provided"/>
+ <fileset dir="core/build/lib/compile"/>
+ <fileset dir="hcatalog-pig-adapter/build/lib/compile"
includes="pig*.jar"/>
+ <fileset dir="server-extensions/build/lib/compile"
includes="jms*.jar"/>
+ <fileset dir="storage-handlers/hbase/build/lib/compile"
includes="hbase*.jar,hive-hbase*.jar"/>
+ <fileset dir="webhcat/svr/build/lib/provided"
includes="hcatalog-core*.jar"/>
+ <fileset dir="webhcat/svr/build/lib/compile"
includes="jetty*.jar,jersey*.jar,commons-exec*.jar,jul-to-slf4j*.jar"/>
</classpath>
<group title="hcatalog" packages="org.apache.hcatalog.*"/>
</javadoc>
@@ -362,6 +359,8 @@
<copy todir="${dist.dir}/bin">
<fileset dir="bin/">
<include name="hcat"/>
+ <include name="hcat.py"/>
+ <include name="hcatcfg.py"/>
</fileset>
</copy>
@@ -406,6 +405,8 @@
</fileset>
<fileset dir="bin">
<include name="hcat_server.sh"/>
+ <include name="hcat_server.py"/>
+ <include name="hcatcfg.py"/>
</fileset>
</copy>
@@ -428,21 +429,19 @@
<property name="dist.handlers.dir" value="${handlers.dir}"/>
</ant>
- <!--
- While ant has a native tar task, we call out to the command-line
- tar command because it preserves file permissions of our carefully
- constructed package dir.
- -->
- <!--
- <exec executable="tar">
- <arg value="-C"/>
- <arg value="${build.dir}"/>
- <arg value="-czf"/>
- <arg value="${build.dir}/${final.name}.tar.gz"/>
- <arg value="${final.name}"/>
- </exec>
+ <tar destfile="${build.dir}/${final.name}.tar.gz" longfile="gnu"
compression="gzip">
+ <tarfileset dir="${build.dir}" filemode="755">
+ <include name="${final.name}/bin/**"/>
+ <include name="${final.name}/sbin/**"/>
+ </tarfileset>
+ <tarfileset dir="${build.dir}">
+ <include name="${final.name}/**"/>
+ <exclude name="${final.name}/bin/**"/>
+ <exclude name="${final.name}/sbin/**"/>
+ </tarfileset>
+ </tar>
<checksum file="${build.dir}/${final.name}.tar.gz"
forceOverwrite="yes"/>
- -->
+
</target>
<target name="releaseaudit" depends="init" description="generate a release
audit report">
