You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ro...@apache.org on 2012/12/01 02:45:21 UTC
svn commit: r1415908 - in /pig/trunk: CHANGES.txt build.xml
Author: rohini
Date: Sat Dec 1 01:45:20 2012
New Revision: 1415908
URL: http://svn.apache.org/viewvc?rev=1415908&view=rev
Log:
PIG-2907: Publish pig jars for Hadoop2/23 to maven (rohini)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/build.xml
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1415908&r1=1415907&r2=1415908&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sat Dec 1 01:45:20 2012
@@ -82,6 +82,8 @@ PIG-1891 Enable StoreFunc to make intell
IMPROVEMENTS
+PIG-2907: Publish pig jars for Hadoop2/23 to maven (rohini)
+
PIG-2934: HBaseStorage filter optimizations (billgraham)
PIG-2980: documentation for DateTime datatype (zjshen via thejas)
Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1415908&r1=1415907&r2=1415908&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Sat Dec 1 01:45:20 2012
@@ -68,6 +68,7 @@
<!-- artifact jar file names -->
<property name="artifact.pig.jar" value="${final.name}.jar"/>
+ <property name="artifact.pig-h2.jar" value="${final.name}-h2.jar"/>
<property name="artifact.pig-withouthadoop.jar" value="${final.name}-withouthadoop.jar"/>
<property name="artifact.pig-withdependencies.jar" value="${final.name}-withdependencies.jar"/>
<property name="artifact.pig-sources.jar" value="${final.name}-sources.jar"/>
@@ -79,6 +80,7 @@
<property name="output.stage.jarfile.withdependencies" value="${build.dir}/${final.name}-withdependencies.stage.jar" />
<property name="output.jarfile.withouthadoop" value="${build.dir}/${artifact.pig-withouthadoop.jar}" />
<property name="output.jarfile.core" value="${build.dir}/${artifact.pig.jar}" />
+ <property name="output.jarfile.core-h2" value="${build.dir}/${artifact.pig-h2.jar}" />
<property name="output.jarfile.sources" value="${build.dir}/${artifact.pig-sources.jar}" />
<property name="output.jarfile.javadoc" value="${build.dir}/${artifact.pig-javadoc.jar}" />
<!-- Maintain old pig.jar in top level directory. -->
@@ -658,7 +660,30 @@
<antcall target="jarWithSvn" inheritRefs="true" inheritall="true"/>
<antcall target="jarWithOutSvn" inheritRefs="true" inheritall="true"/>
</target>
-
+
+ <scriptdef name="propertyreset" language="javascript"
+ description="Allows to assign @{property} new value">
+ <attribute name="name"/>
+ <attribute name="value"/>
+ project.setProperty(attributes.get("name"), attributes.get("value"));
+ </scriptdef>
+
+ <target name="mvn-jar" description="Create pig.jar for maven deploy for Hadoop2/23 and Hadoop1/20">
+ <propertyreset name="hadoopversion" value="23" />
+ <propertyreset name="isHadoop" value="true" />
+ <propertyreset name="src.shims.dir" value="${basedir}/shims/src/hadoop${hadoopversion}" />
+ <antcall target="clean" inheritRefs="true" inheritall="true"/>
+ <antcall target="jar" inheritRefs="true" inheritall="true"/>
+ <!-- Move and rename pig jar for Hadoop2/23 to a different location before compiling for Hadoop1/20 -->
+ <move file="${output.jarfile.core}" tofile="${basedir}/${artifact.pig-h2.jar}"/>
+ <antcall target="clean" inheritRefs="true" inheritall="true"/>
+ <propertyreset name="hadoopversion" value="20" />
+ <propertyreset name="isHadoop" value="" />
+ <propertyreset name="src.shims.dir" value="${basedir}/shims/src/hadoop${hadoopversion}" />
+ <antcall target="jar" inheritRefs="true" inheritall="true"/>
+ <move file="${basedir}/${artifact.pig-h2.jar}" tofile="${output.jarfile.core-h2}"/>
+ </target>
+
<target name="jarWithSvn" if="svn.revision">
<antcall target="buildJar" inheritRefs="true" inheritall="true">
<param name="svnString" value="${svn.revision}" />
@@ -1330,7 +1355,7 @@
</artifact:install>
</target>
- <target name="mvn-deploy" depends="mvn-taskdef,jar,source-jar, javadoc-jar,
+ <target name="mvn-deploy" depends="mvn-taskdef, mvn-jar, source-jar, javadoc-jar,
smoketests-jar, pigunit-jar, set-version, signanddeploy, simpledeploy"
description="To deploy pig jar to apache snapshot's repository">
</target>
@@ -1341,8 +1366,10 @@
<artifact:deploy file="${output.jarfile.core}">
<remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
<pom refid="pig"/>
- <attach file="${output.jarfile.core}.asc" type="jar.asc"/>
- <attach file="${pig.pom}.asc" type="pom.asc"/>
+ <attach file="${output.jarfile.core}.asc" type="jar.asc"/>
+ <attach file="${pig.pom}.asc" type="pom.asc"/>
+ <attach file="${output.jarfile.core-h2}.asc" type="jar.asc" classifier="h2"/>
+ <attach file="${output.jarfile.core-h2}" classifier="h2" />
<attach file="${output.jarfile.sources}.asc" type="jar.asc" classifier="sources"/>
<attach file="${output.jarfile.sources}" classifier="sources" />
<attach file="${output.jarfile.javadoc}.asc" type="jar.asc" classifier="javadoc"/>
@@ -1356,8 +1383,9 @@
<artifact:deploy file="${output.jarfile.core}">
<remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
<pom refid="pig"/>
+ <attach file="${output.jarfile.core-h2}" classifier="h2" />
<attach file="${output.jarfile.sources}" classifier="sources" />
- <attach file="${output.jarfile.javadoc}" classifier="javadoc" />
+ <attach file="${output.jarfile.javadoc}" classifier="javadoc" />
</artifact:deploy>
<artifact:pom file="${pigunit.pom}" id="pigunit"/>
<artifact:deploy file="${pigunit.jarfile}">
@@ -1370,7 +1398,7 @@
<pom refid="pigsmoke"/>
</artifact:deploy>
</target>
-
+
<target name="sign" depends="clean-sign" if="staging">
<input message="password:>" addproperty="gpg.passphrase">
<handler classname="org.apache.tools.ant.input.SecureInputHandler" />
@@ -1394,12 +1422,14 @@
</macrodef>
<sign-artifact input.file="${output.jarfile.core}"
output.file="${output.jarfile.core}.asc" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${output.jarfile.core-h2}"
+ output.file="${output.jarfile.core-h2}.asc" gpg.passphrase="${gpg.passphrase}"/>
<sign-artifact input.file="${output.jarfile.sources}"
output.file="${output.jarfile.sources}.asc" gpg.passphrase="${gpg.passphrase}"/>
<sign-artifact input.file="${output.jarfile.javadoc}"
- output.file="${output.jarfile.javadoc}.asc" gpg.passphrase="${gpg.passphrase}"/>
- <sign-artifact input.file="${pig.pom}"
- output.file="${pig.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
+ output.file="${output.jarfile.javadoc}.asc" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${pig.pom}"
+ output.file="${pig.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
</target>
<target name="clean-sign" description="Clean. Delete .asc files">