Author: thejas
Date: Thu Sep 30 22:49:37 2010
New Revision: 1003328
URL: http://svn.apache.org/viewvc?rev=1003328&view=rev
Log:
PIG-1607: pig should have separate javadoc.jar in the maven repository (nrai
via thejas)
Modified:
hadoop/pig/trunk/CHANGES.txt
hadoop/pig/trunk/build.xml
Modified: hadoop/pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=1003328&r1=1003327&r2=1003328&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Thu Sep 30 22:49:37 2010
@@ -207,6 +207,9 @@ PIG-1309: Map-side Cogroup (ashutoshc)
BUG FIXES
+PIG-1607: pig should have separate javadoc.jar in the maven
+ repository (nrai via thejas)
+
PIG-1651: PIG class loading mishandled (rding)
PIG-1650: pig grunt shell breaks for many commands like perl , awk ,
Modified: hadoop/pig/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/pig/trunk/build.xml?rev=1003328&r1=1003327&r2=1003328&view=diff
==============================================================================
--- hadoop/pig/trunk/build.xml (original)
+++ hadoop/pig/trunk/build.xml Thu Sep 30 22:49:37 2010
@@ -72,6 +72,7 @@
<property name="output.jarfile.withouthadoop"
value="${build.dir}/${final.name}-withouthadoop.jar" />
<property name="output.jarfile.core"
value="${build.dir}/${final.name}-core.jar" />
<property name="output.jarfile.sources"
value="${build.dir}/${final.name}-sources.jar" />
+ <property name="output.jarfile.javadoc"
value="${build.dir}/${final.name}-javadoc.jar" />
<!-- Maintain old pig.jar in top level directory. -->
<property name="output.jarfile.backcompat.withouthadoop"
value="${basedir}/${name}-withouthadoop.jar" />
<property name="output.jarfile.backcompat" value="${basedir}/${name}.jar"
/>
@@ -171,7 +172,8 @@
<property name="ivy.publish.pattern"
value="[artifact]-[revision].[ext]"/>
<property name="pig.jar" value="${output.jarfile}"/>
<property name="pig-core.jar" value="${output.jarfile.core}"/>
- <property name="pig-sources.jar"
location="${build.dir}/${final.name}-sources.jar" />
+ <property name="pig-sources.jar"
location="${build.dir}/${final.name}-sources.jar" />
+ <property name="pig-javadoc.jar"
location="${build.dir}/${final.name}-javadoc.jar" />
<!-- jdiff properties -->
<property name="jdiff.jar"
value="${ivy.lib.dir}/jdiff-${jdiff.version}.jar"/>
@@ -410,7 +412,7 @@
</target>
<target name="source-jar" depends="cc-compile">
- <jar duplicate="preserve" jarfile="${output.jarfile.sources}"
basedir="${src.dir}">
+ <jar duplicate="preserve" jarfile="${output.jarfile.sources}"
basedir="${src.dir}/" excludes="docs/**, overview.html">
<manifest>
<section name="org/apache/pig">
<attribute name="Implementation-Vendor" value="Apache" />
@@ -418,11 +420,21 @@
<attribute name="Implementation-Version"
value="${version}" />
</section>
</manifest>
- <fileset dir="${src.gen.dir}"/>
<fileset dir="${src.lib.dir}/shock"/>
<fileset dir="${src.lib.dir}/bzip2"/>
</jar>
</target>
+ <target name="javadoc-jar" depends="cc-compile, javadoc">
+ <jar duplicate="preserve" jarfile="${output.jarfile.javadoc}"
basedir="${build.javadoc}/">
+ <manifest>
+ <section name="org/apache/pig">
+ <attribute name="Implementation-Vendor" value="Apache" />
+ <attribute name="Implementation-Title" value="Pig" />
+ <attribute name="Implementation-Version"
value="${version}" />
+ </section>
+ </manifest>
+ </jar>
+ </target>
<!-- ================================================================== -->
<!-- Make pig.jar -->
@@ -796,15 +808,16 @@
uri="urn:maven-artifact-ant"
classpathref="mvn-ant-task.classpath"/>
</target>
- <target name="mvn-install" depends="mvn-taskdef,jar, set-version,
source-jar"
+ <target name="mvn-install" depends="mvn-taskdef,jar, set-version,
source-jar, javadoc-jar"
description="To install pig to local filesystem's m2 cache">
<artifact:pom file="${pig.pom}" id="pig"/>
<artifact:install file="${pig-core.jar}">
<pom refid="pig"/>
<attach file="${output.jarfile.sources}" classifier="sources" />
+ <attach file="${output.jarfile.javadoc}" classifier="javadoc" />
</artifact:install>
</target>
- <target name="mvn-deploy" depends="mvn-taskdef,jar,source-jar,
set-version, signanddeploy, simpledeploy"
+ <target name="mvn-deploy" depends="mvn-taskdef,jar,source-jar,
javadoc-jar, set-version, signanddeploy, simpledeploy"
description="To deploy pig jar to apache snapshot's repository">
</target>
@@ -818,6 +831,8 @@
<attach file="${pig.pom}.asc" type="pom.asc"/>
<attach file="${output.jarfile.sources}.asc" type="jar.asc" />
<attach file="${output.jarfile.sources}" classifier="sources" />
+ <attach file="${output.jarfile.javadoc}.asc" type="jar.asc" />
+ <attach file="${output.jarfile.javadoc}" classifier="javadoc" />
</artifact:deploy>
</target>
@@ -828,6 +843,7 @@
<remoteRepository id="apache.snapshots.https"
url="${asfsnapshotrepo}"/>
<pom refid="pig"/>
<attach file="${pig-sources.jar}" classifier="sources" />
+ <attach file="${pig-javadoc.jar}" classifier="javadoc" />
</artifact:deploy>
</target>
@@ -856,6 +872,8 @@
output.file="${pig-core.jar}.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}"/>
</target>
