You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hcatalog-commits@incubator.apache.org by ga...@apache.org on 2012/04/12 00:23:22 UTC
svn commit: r1325078 - in /incubator/hcatalog/trunk: CHANGES.txt build.xml
storage-handlers/hbase/build.xml
Author: gates
Date: Thu Apr 12 00:23:22 2012
New Revision: 1325078
URL: http://svn.apache.org/viewvc?rev=1325078&view=rev
Log:
HCATALOG-359 hcatalog tar.gz should only have hcatalog binaries
Modified:
incubator/hcatalog/trunk/CHANGES.txt
incubator/hcatalog/trunk/build.xml
incubator/hcatalog/trunk/storage-handlers/hbase/build.xml
Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1325078&r1=1325077&r2=1325078&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Thu Apr 12 00:23:22 2012
@@ -37,6 +37,8 @@ Trunk (unreleased changes)
Release 0.4.0 - Unreleased
INCOMPATIBLE CHANGES
+ HCAT-359 hcatalog tar.gz should only have hcatalog binaries (gkesavan via gates)
+
HCAT-267 rename 64 bit rpm/deb package (gkesavan via gates)
HCAT-289 InputJobInfo still uses serverUri and serverKerberosPrincipal (khorgath via gates)
Modified: incubator/hcatalog/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.xml?rev=1325078&r1=1325077&r2=1325078&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.xml (original)
+++ incubator/hcatalog/trunk/build.xml Thu Apr 12 00:23:22 2012
@@ -132,6 +132,20 @@
<path refid="common.classpath"/>
</path>
+ <condition property="os-arch" value="x86_64">
+ <and>
+ <os arch="amd64" />
+ </and>
+ </condition>
+ <condition property="os-arch" value="i386">
+ <or>
+ <os arch="i386" />
+ <os arch="i486" />
+ <os arch="i586" />
+ <os arch="i686" />
+ </or>
+ </condition>
+
<path id="test.classpath">
<pathelement location="${test.build.classes}" />
<pathelement location="${build.classes}" />
@@ -393,7 +407,7 @@
</target>
<!-- Clean up children -->
- <target name="clean" depends="clean-builds" description="Cleanup all build artifacts">
+ <target name="clean" depends="clean-builds" description="Cleanup all build artifacts">
<delete dir="${artifacts.dir}" />
<ant dir="${test.e2e.dir}" target="clean"/>
</target>
@@ -458,8 +472,6 @@
<mkdir dir="${dist.dir}/share/${ant.project.name}/lib" />
<mkdir dir="${dist.dir}/etc/hcatalog" />
<mkdir dir="${dist.dir}/bin" />
- <mkdir dir="${dist.dir}/bin/ext" />
- <mkdir dir="${dist.dir}/bin/ext/util" />
<mkdir dir="${dist.dir}/sbin" />
<mkdir dir="${dist.dir}/share/${ant.project.name}/scripts" />
<mkdir dir="${dist.dir}/share/${ant.project.name}/templates/conf" />
@@ -467,8 +479,6 @@
<mkdir dir="${dist.dir}/share/doc/${ant.project.name}/api" />
<mkdir dir="${dist.dir}/share/doc/${ant.project.name}/jdiff"/>
<mkdir dir="${dist.dir}/share/doc/${ant.project.name}/license" />
- <mkdir dir="${dist.dir}/share/${ant.project.name}/hive" />
- <mkdir dir="${dist.dir}/share/${ant.project.name}/hive/external" />
<copy todir="${dist.dir}/share/${ant.project.name}" includeEmptyDirs="false">
<fileset dir="${build.dir}/${ant.project.name}/">
@@ -478,89 +488,14 @@
<copy todir="${dist.dir}/share/${ant.project.name}/lib" includeEmptyDirs="false">
<fileset dir="${lib.dir}"/>
-
- <fileset dir="hive/external/build/ivy/lib/default">
- <include name="antlr-runtime-*.jar"/>
- <include name="asm-*.jar"/>
- <include name="commons-cli-*.jar"/>
- <include name="commons-collections-*.jar"/>
- <include name="commons-dbcp-*.jar"/>
- <include name="commons-lang-*.jar"/>
- <include name="commons-logging-*.jar"/>
- <include name="commons-logging-api-*.jar"/>
- <include name="commons-pool-*.jar"/>
- <include name="jackson-mapper-asl-*.jar"/>
- <include name="jackson-core-asl-*.jar"/>
- <include name="datanucleus-connectionpool-*.jar"/>
- <include name="datanucleus-core-*.jar"/>
- <include name="datanucleus-enhancer-*.jar"/>
- <include name="datanucleus-rdbms-*.jar"/>
- <include name="derby-*.jar"/>
- <include name="guava-*.jar"/>
- <include name="jdo2-api-*.jar"/>
- <include name="jline-*.jar"/>
- <include name="libthrift-*.jar"/>
- <include name="libfb*.jar"/>
- <include name="log4j-*.jar"/>
- <include name="slf4j-*.jar"/>
- </fileset>
-
- <fileset dir="hive/external/build/shims">
- <include name="hive-shims-*.jar"/>
- </fileset>
-
- <fileset dir="hive/external/build/builtins">
- <include name="hive-builtins-*.jar"/>
- </fileset>
-
- <fileset dir="hive/external/build/common">
- <include name="hive-common-*.jar"/>
- </fileset>
-
- <fileset dir="hive/external/build/cli">
- <include name="hive-cli-*.jar"/>
- </fileset>
-
- <fileset dir="hive/external/build/hbase-handler">
- <include name="hive-hbase-handler-*.jar"/>
- </fileset>
-
- <fileset dir="hive/external/build/service">
- <include name="hive-service-*.jar"/>
- </fileset>
-
- <fileset dir="hive/external/build/serde">
- <include name="hive-serde-*.jar"/>
- </fileset>
-
- <fileset dir="hive/external/build/ql">
- <include name="hive-exec-*.jar"/>
- </fileset>
-
- <fileset dir="hive/external/build/metastore">
- <include name="hive-metastore-*.jar"/>
- </fileset>
-
- <fileset dir="hive/external/build/hwi">
- <include name="hive-hwi-*.war"/>
- </fileset>
-
- <fileset dir="hive/external/build/hwi">
- <include name="hive-hwi-*.jar"/>
- </fileset>
-
- </copy>
+ </copy>
<copy todir="${dist.dir}/bin">
<fileset dir="bin/">
<include name="hcat"/>
</fileset>
- <fileset file="hive/external/bin/hive"/>
- <fileset dir="bin">
- <include name="hive-config.sh"/>
- </fileset>
- </copy>
+ </copy>
<copy todir="${dist.dir}/libexec">
<fileset dir="bin">
<include name="hcat-config.sh"/>
@@ -568,71 +503,6 @@
<!-- fileset file="hive/external/bin/hive-config.sh" /-->
</copy>
- <copy todir="${dist.dir}/sbin">
- <fileset dir="${package.dir}">
- <include name="*.sh"/>
- </fileset>
- <fileset dir="bin">
- <include name="hcat_server.sh"/>
- </fileset>
- </copy>
-
- <copy todir="${dist.dir}/bin/ext">
- <fileset file="hive/external/bin/ext/metastore.sh"/>
- <fileset file="hive/external/bin/ext/cli.sh"/>
- <fileset file="hive/external/bin/ext/help.sh"/>
- <fileset file="hive/external/bin/ext/hwi.sh"/>
- </copy>
-
- <copy todir="${dist.dir}/bin/ext/util">
- <fileset file="hive/external/bin/ext/util/execHiveCmd.sh"/>
- </copy>
-
- <copy todir="${dist.dir}/share/doc/${ant.project.name}">
- <fileset dir="${build.docs}" />
- </copy>
-
- <copy todir="${dist.dir}/etc/${ant.project.name}">
- <fileset dir="conf" />
- <fileset file="hive/external/conf/hive-default.xml"/>
- </copy>
-
- <copy todir="${dist.dir}/share/${ant.project.name}/templates/conf">
- <fileset dir="src/packages/templates/conf">
- <include name="*"/>
- </fileset>
- </copy>
-
- <copy todir="${dist.dir}/share/${ant.project.name}/scripts">
- <fileset file="hive/external/metastore/scripts/upgrade/mysql/hive-schema-0.7.0.mysql.sql"/>
- <fileset dir="scripts">
- <include name="*.sh"/>
- </fileset>
- </copy>
-
- <!-- Copy source files for reference -->
- <copy todir="${dist.dir}/src/java" includeEmptyDirs="true">
- <fileset dir="${src.dir}" />
- </copy>
-
- <copy todir="${dist.dir}/src/test" includeEmptyDirs="true">
- <fileset dir="${test.src.dir}" />
- </copy>
-
- <copy todir="${dist.dir}/src/docs" includeEmptyDirs="true">
- <fileset dir="${docs.src}" />
- </copy>
-
- <copy todir="${dist.dir}/src/packages" includeEmptyDirs="true">
- <fileset dir="${package.dir}" />
- </copy>
-
- <copy todir="${dist.dir}/share/${ant.project.name}/hive/external" includeEmptyDirs="true">
- <fileset dir="${hive.root}">
- <exclude name="build/**"/>
- </fileset>
- </copy>
-
<!-- Copy the licenses and such -->
<copy todir="${dist.dir}/share/doc/${ant.project.name}">
<fileset dir=".">
@@ -866,5 +736,4 @@
<ant dir="${test.e2e.dir}" target="deploy"/>
</target>
-
</project>
Modified: incubator/hcatalog/trunk/storage-handlers/hbase/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/build.xml?rev=1325078&r1=1325077&r2=1325078&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/build.xml (original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/build.xml Thu Apr 12 00:23:22 2012
@@ -316,23 +316,14 @@
-->
<target name="package" depends="jar, docs" description="Create an HCatalog release">
<mkdir dir="${dist.dir}" />
- <mkdir dir="${dist.dir}/src" />
<mkdir dir="${dist.dir}/lib" />
<mkdir dir="${dist.dir}/docs" />
- <mkdir dir="${dist.dir}/ivy" />
<copy todir="${dist.dir}/lib" includeEmptyDirs="false">
<fileset dir="${lib.dir}" erroronmissingdir="false" />
<fileset dir="${build.dir}/${ant.project.name}">
<include name="*.jar"/>
</fileset>
- <fileset dir="${build.dir}/ivy/lib/${ant.project.name}">
- <include name="**/hbase*"/>
- <include name="**/zookeeper*"/>
- <!-- exclude test jars -->
- <exclude name="*-tests.jar"/>
- </fileset>
- <fileset dir="${hive.root}/build/hbase-handler" includes="*.jar"/>
</copy>
@@ -340,28 +331,15 @@
<fileset dir="${build.docs}" />
</copy>
- <!-- Copy source files so the tar ball can build -->
- <copy todir="${dist.dir}/src/java" includeEmptyDirs="true">
- <fileset dir="${src.dir}" />
- </copy>
-
- <copy todir="${dist.dir}/src/test" includeEmptyDirs="true">
- <fileset dir="${test.src.dir}" />
- </copy>
-
- <copy todir="${dist.dir}/" file="build.xml" />
- <copy todir="${dist.dir}/" file="ivy.xml" />
-
- <copy todir="${dist.dir}/ivy">
- <fileset dir="ivy"/>
- </copy>
<antcall target="package-to-handlers"/>
</target>
<target name="package-to-handlers" if="dist.handlers.dir">
<mkdir dir="${dist.handlers.dir}/hbase"/>
<copy todir="${dist.handlers.dir}/hbase" includeEmptyDirs="true">
- <fileset dir="${dist.dir}"/>
+ <fileset dir="${dist.dir}">
+ <include name="**/lib/hbase-storage-handler-*.jar"/>
+ </fileset>
</copy>
</target>
</project>