cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eev...@apache.org
Subject git commit: -javadoc and -sources jars for clientutil
Date Thu, 29 Dec 2011 22:37:41 GMT
Updated Branches:
  refs/heads/trunk 952c6e536 -> a7db75f49


-javadoc and -sources jars for clientutil

Patch by satish babu krishnamoorthy w/ minor changes; reviewed by eevans for CASSANDRA-3426


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7db75f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7db75f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7db75f4

Branch: refs/heads/trunk
Commit: a7db75f498717a6d957d431f33bd01806d13c6d6
Parents: 952c6e5
Author: Eric Evans <eevans@apache.org>
Authored: Thu Dec 29 15:33:45 2011 -0600
Committer: Eric Evans <eevans@apache.org>
Committed: Thu Dec 29 16:35:46 2011 -0600

----------------------------------------------------------------------
 build.xml |   46 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 38 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7db75f4/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 56b25ab..23f69aa 100644
--- a/build.xml
+++ b/build.xml
@@ -788,17 +788,29 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
 
       <create-javadoc destdir="${javadoc.jars.dir}/main">
         <filesets>
-        <fileset dir="${build.src.java}" defaultexcludes="yes">
-          <include name="org/apache/**/*.java"/>
-        </fileset>
-        <fileset dir="${build.src.gen-java}" defaultexcludes="yes">
-          <include name="org/apache/**/*.java"/>
-        </fileset>
+          <fileset dir="${build.src.java}" defaultexcludes="yes">
+            <include name="org/apache/**/*.java"/>
+          </fileset>
+          <fileset dir="${build.src.gen-java}" defaultexcludes="yes">
+            <include name="org/apache/**/*.java"/>
+          </fileset>
         </filesets>
       </create-javadoc>
       <jar jarfile="${build.dir}/${final.name}-javadoc.jar"
            basedir="${javadoc.jars.dir}/main"/>
 
+      <create-javadoc destdir="${javadoc.jars.dir}/clientutil">
+        <filesets>
+          <fileset dir="${build.src.java}" defaultexcludes="yes">
+            <include name="org/apache/cassandra/cql/jdbc/*" />
+            <include name="org/apache/cassandra/utils/ByteBufferUtil*.java" />
+            <include name="org/apache/cassandra/utils/Hex.java" />
+            <include name="org/apache/cassandra/utils/UUIDGen*.java" />
+          </fileset>
+        </filesets>
+      </create-javadoc>
+      <jar jarfile="${build.dir}/${ant.project.name}-clientutil-${version}-javadoc.jar"
+           basedir="${javadoc.jars.dir}/clientutil"/>
       <!-- javadoc task always rebuilds so might as well remove the generated docs to
prevent 
            being pulled into the distribution by accident -->
       <delete quiet="true" dir="${javadoc.jars.dir}"/>
@@ -821,6 +833,14 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
           <include name="org/apache/**/*.java"/>
         </fileset>
       </jar>
+      <jar jarfile="${build.dir}/${ant.project.name}-clientutil-${version}-sources.jar">
+        <fileset dir="${build.src.java}" defaultexcludes="yes">
+          <include name="org/apache/cassandra/cql/jdbc/*" />
+          <include name="org/apache/cassandra/utils/ByteBufferUtil*.java" />
+          <include name="org/apache/cassandra/utils/Hex.java" />
+          <include name="org/apache/cassandra/utils/UUIDGen*.java" />
+        </fileset>
+      </jar>
     </target>
 
     <!-- creates release tarballs -->
@@ -1250,6 +1270,12 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
     <!-- the cassandra-clientutil jar -->  
     <install pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom"
              file="${build.dir}/${ant.project.name}-clientutil-${version}.jar"/>
+    <install pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom"
+             file="${build.dir}/${ant.project.name}-clientutil-${version}-sources.jar"
+             classifier="sources"/>
+    <install pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom"
+             file="${build.dir}/${ant.project.name}-clientutil-${version}-javadoc.jar"
+             classifier="javadoc"/>
 
     <!-- the cassandra-all jar -->
     <install pomFile="${build.dir}/${final.name}.pom"
@@ -1298,7 +1324,12 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
     <!-- the cassandra-clientutil jar -->  
     <deploy pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom"
             file="${build.dir}/${ant.project.name}-clientutil-${version}.jar"/>
-
+    <deploy pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom"
+             file="${build.dir}/${ant.project.name}-clientutil-${version}-sources.jar"
+             classifier="sources"/>
+    <deploy pomFile="${build.dir}/${ant.project.name}-clientutil-${version}.pom"
+             file="${build.dir}/${ant.project.name}-clientutil-${version}-javadoc.jar"
+             classifier="javadoc"/>
     <!-- the cassandra-all jar -->
     <deploy pomFile="${build.dir}/${final.name}.pom"
             file="${build.dir}/${final.name}.jar"/>
@@ -1309,5 +1340,4 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
             file="${build.dir}/${final.name}-javadoc.jar"
             classifier="javadoc"/>
   </target>
-
 </project>


Mime
View raw message