From d9fa1b569caa7549bc6f2408229f6ca57b090aa9 Mon Sep 17 00:00:00 2001
From: samskivert <samskivert@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Fri, 27 Aug 2010 16:46:24 +0000
Subject: [PATCH] More Ivy jiggery pokery.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2821 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 build-ivy.xml | 47 ++++++++++++++++++++++++++++-------------------
 ivy.xml       |  6 +++---
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/build-ivy.xml b/build-ivy.xml
index d0f43859..2c05bbaa 100644
--- a/build-ivy.xml
+++ b/build-ivy.xml
@@ -22,21 +22,20 @@
   <property name="ivy.jar.dir" value="${ivy.home}/lib" />
   <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
   <condition property="ivy.exists"><available file="${ivy.jar.file}"/></condition>
-  <target name="download-ivy" unless="ivy.exists">
+  <target name="-download-ivy" unless="ivy.exists">
     <mkdir dir="${ivy.jar.dir}"/>
     <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.vers}/ivy-${ivy.vers}.jar" 
          dest="${ivy.jar.file}" usetimestamp="true"/>
   </target>
-  <target name="init-ivy" depends="download-ivy">
+  <target name="-init-ivy" depends="-download-ivy">
     <path id="ivy.lib.path"><fileset dir="${ivy.jar.dir}" includes="*.jar"/></path>
     <taskdef resource="org/apache/ivy/ant/antlib.xml"
              uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
-    <ivy:cachepath pathid="compile.classpath" conf="compile" log="download-only"/>
+    <ivy:cachepath pathid="compile.classpath" conf="runtime" log="download-only"/>
     <ivy:cachepath pathid="test.classpath" conf="test" log="download-only"/>
   </target>
 
-  <!-- prepares the application directories -->
-  <target name="prepare" depends="init-ivy">
+  <target name="-prepare" depends="-init-ivy">
     <tstamp><format property="year" pattern="yyyy" /></tstamp>
     <mkdir dir="${deploy.dir}"/>
     <mkdir dir="${classes.dir}"/>
@@ -51,8 +50,14 @@
     </copy>
   </target>
 
-  <!-- cleans out the intermediate build files -->
-  <target name="clean">
+  <target name="check-ivy" depends="-init-ivy" description="Computes and prints Ivy classpath.">
+    <property refid="compile.classpath" name="compile.str"/>
+    <echo>Compile: ${compile.str}</echo>
+    <property refid="test.classpath" name="test.str"/>
+    <echo>Test: ${test.str}</echo>
+  </target>
+
+  <target name="clean" description="Cleans out most build results.">
     <delete dir="${classes.dir}"/>
     <delete dir="${tclasses.dir}"/>
     <delete dir="${deploy.dir}/docs"/>
@@ -60,13 +65,11 @@
     <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.jar"/></delete>
   </target>
 
-  <!-- wipes the entire build directory clean -->
-  <target name="distclean">
+  <target name="distclean" description="Completely cleans out build results.">
     <delete dir="${deploy.dir}"/>
   </target>
 
-  <!-- build the java class files -->
-  <target name="compile" depends="prepare">
+  <target name="compile" depends="-prepare" description="Compiles main classes.">
     <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
            debug="on" optimize="${build.optimize}" source="1.5" target="1.5" encoding="utf-8">
       <classpath refid="compile.classpath"/>
@@ -77,7 +80,7 @@
     </javac>
   </target>
 
-  <target name="test-compile" depends="compile">
+  <target name="test-compile" depends="compile" description="Compiles test classes.">
     <javac srcdir="${test.dir}" destdir="${tclasses.dir}" includeAntRuntime="false"
            debug="on" optimize="${build.optimize}" source="1.5" target="1.5" encoding="utf-8">
       <classpath>
@@ -91,8 +94,7 @@
     </javac>
   </target>
 
-  <!-- build the javadoc documentation -->
-  <target name="javadoc" depends="prepare">
+  <target name="javadoc" depends="-prepare" description="Builds javadocs.">
     <javadoc windowtitle="${app.name} API"
              doctitle="${app.name} API"
              overview="${src.dir}/${doc.overview}"
@@ -109,10 +111,8 @@
     </javadoc>
   </target>
 
-  <!-- a target for rebuilding everything -->
-  <target name="all" depends="clean,compile,javadoc,dist"/>
+  <target name="all" depends="clean,compile,javadoc,dist" description="Rebuilds everything."/>
 
-  <!-- runs our unit tests -->
   <property name="test" value=""/>
   <target name="tests" depends="test-compile" 
           description="Runs unit tests. Use -Dtest=Foo to run only FooTest.">
@@ -137,8 +137,7 @@
     </unit>
   </target>
 
-  <!-- builds our jar file -->
-  <target name="dist" depends="compile">
+  <target name="dist" depends="compile" description="Builds jar files.">
     <jar destfile="${deploy.dir}/${app.name}.jar" basedir="${classes.dir}"/>
     <!-- we export a small selection of classes for use by GWT -->
     <mkdir dir="${gwtjar.dir}"/>
@@ -151,4 +150,14 @@
     <jar basedir="${gwtjar.dir}" destfile="${deploy.dir}/${app.name}-gwt.jar"/>
     <delete dir="${gwtjar.dir}"/>
   </target>
+
+  <target name="gen-pom" depends="-prepare" description="Generates a POM file.">
+    <ivy:makepom ivyfile="ivy.xml" pomfile="${deploy.dir}/${app.name}.pom">
+      <!-- this is kind of a hack, but we use 'compile' to indicate dependencies that -->
+      <!-- will be "provided" and "runtime" to indicate our transitive dependencies -->
+      <mapping conf="compile" scope="provided"/>
+      <mapping conf="runtime" scope="compile"/>
+      <mapping conf="test" scope="test"/>
+    </ivy:makepom>
+  </target>
 </project>
diff --git a/ivy.xml b/ivy.xml
index de10dd8c..0c40ff50 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -2,7 +2,7 @@
   <info organisation="com.samskivert" module="samskivert" revision="1.0">
     <description homepage="http://code.google.com/p/samskivert"/>
   </info>
-  <configurations defaultconfmapping="test->master(*);compile->master(*)">
+  <configurations defaultconfmapping="test->master(*);compile->master(*);runtime->master(*)">
     <conf name="master" visibility="public"/>
     <conf name="compile" visibility="public"/>
     <conf name="runtime" visibility="public" extends="compile"/>
@@ -10,9 +10,9 @@
     <conf name="default" visibility="public" extends="runtime,master"/>
   </configurations>
   <dependencies>
-    <dependency org="log4j" name="log4j" rev="1.2.15" conf="compile"/>
-    <dependency org="javax.mail" name="mail" rev="1.4.1" transitive="false" conf="compile"/>
     <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="compile"/>
+    <dependency org="log4j" name="log4j" rev="1.2.15" conf="runtime"/>
+    <dependency org="javax.mail" name="mail" rev="1.4.1" transitive="false" conf="runtime"/>
     <dependency org="junit" name="junit" rev="4.8.1" conf="test"/>
   </dependencies>
 </ivy-module>