commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pste...@apache.org
Subject svn commit: r289985 - /jakarta/commons/sandbox/id/trunk/build.xml
Date Sun, 18 Sep 2005 22:01:15 GMT
Author: psteitz
Date: Sun Sep 18 15:01:14 2005
New Revision: 289985

URL: http://svn.apache.org/viewcvs?rev=289985&view=rev
Log:
Updated to use maven repo for dependencies.

Modified:
    jakarta/commons/sandbox/id/trunk/build.xml

Modified: jakarta/commons/sandbox/id/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/id/trunk/build.xml?rev=289985&r1=289984&r2=289985&view=diff
==============================================================================
--- jakarta/commons/sandbox/id/trunk/build.xml (original)
+++ jakarta/commons/sandbox/id/trunk/build.xml Sun Sep 18 15:01:14 2005
@@ -14,25 +14,54 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-  -->
+-->
+
+<!--build.xml generated by maven from project.xml version 0.1-dev
+  on date September 18 2005, time 1456-->
 
 <project default="jar" name="commons-id" basedir=".">
-  <property name="defaulttargetdir" value="target">
+  <!--Load local and user build preferences-->
+
+  <property file="build.properties">
+  </property>
+  <property file="${user.home}/build.properties">
   </property>
-  <property name="libdir" value="target/lib">
+  <!--Build properties-->
+
+  <property name="defaulttargetdir" value="${basedir}/target">
+  </property>
+  <property name="libdir" value="${user.home}/.maven/repository">
   </property>
-  <property name="classesdir" value="target/classes">
+  <property name="classesdir" value="${basedir}/target/classes">
   </property>
-  <property name="testclassesdir" value="target/test-classes">
+  <property name="testclassesdir" value="${basedir}/target/test-classes">
   </property>
-  <property name="testreportdir" value="target/test-reports">
+  <property name="testreportdir" value="${basedir}/target/test-reports">
   </property>
-  <property name="distdir" value="dist">
+  <property name="distdir" value="${basedir}/dist">
   </property>
-  <property name="javadocdir" value="dist/docs/api">
+  <property name="javadocdir" value="${basedir}/dist/docs/api">
   </property>
   <property name="final.name" value="commons-id-0.1-dev">
   </property>
+  <property name="proxy.host" value="">
+  </property>
+  <property name="proxy.port" value="">
+  </property>
+  <property name="proxy.username" value="">
+  </property>
+  <property name="proxy.password" value="">
+  </property>
+  <path id="build.classpath">
+    <pathelement location="${libdir}/ant/jars/ant-1.5.3-1.jar">
+    </pathelement>
+    <pathelement location="${libdir}/junit/jars/junit-3.8.1.jar">
+    </pathelement>
+    <pathelement location="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar">
+    </pathelement>
+    <pathelement location="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar">
+    </pathelement>
+  </path>
   <target name="init" description="o Initializes some properties">
     <mkdir dir="${libdir}">
     </mkdir>
@@ -40,31 +69,43 @@
       <equals arg2="only" arg1="${build.sysclasspath}">
       </equals>
     </condition>
+    <!--Test if JUNIT is present in ANT classpath-->
+
+    <available property="Junit.present" classname="junit.framework.Test">
+    </available>
+    <!--Test if user defined a proxy-->
+
+    <condition property="useProxy">
+      <and>
+        <isset property="proxy.host">
+        </isset>
+        <not>
+          <equals trim="true" arg2="" arg1="${proxy.host}">
+          </equals>
+        </not>
+      </and>
+    </condition>
   </target>
   <target name="compile" description="o Compile the code" depends="get-deps">
     <mkdir dir="${classesdir}">
     </mkdir>
     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
       <src>
-        <pathelement location="src/java">
+        <pathelement location="${basedir}/src/java">
         </pathelement>
       </src>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
+      <classpath refid="build.classpath">
       </classpath>
     </javac>
     <copy todir="${classesdir}">
-      <fileset dir="src/conf">
+      <fileset dir="${basedir}/src/conf">
         <include name="*.state">
         </include>
       </fileset>
     </copy>
   </target>
   <target name="jar" description="o Create the jar" depends="compile,test">
-    <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+    <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
     </jar>
   </target>
   <target name="clean" description="o Clean up the generated directories">
@@ -87,10 +128,10 @@
     <fail message="There were test failures.">
     </fail>
   </target>
-  <target name="internal-test" depends="compile-tests">
+  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
     <mkdir dir="${testreportdir}">
     </mkdir>
-    <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
+    <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true"
haltonerror="true">
       <sysproperty key="basedir" value=".">
       </sysproperty>
       <formatter type="xml">
@@ -98,42 +139,43 @@
       <formatter usefile="false" type="plain">
       </formatter>
       <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
+        <path refid="build.classpath">
+        </path>
         <pathelement path="${testclassesdir}">
         </pathelement>
         <pathelement path="${classesdir}">
         </pathelement>
       </classpath>
       <batchtest todir="${testreportdir}">
-        <fileset dir="src/test">
+        <fileset dir="${basedir}/src/test">
           <include name="**/*Test*">
           </include>
         </fileset>
       </batchtest>
     </junit>
   </target>
-  <target name="compile-tests" depends="compile">
+  <target name="junit-present" unless="Junit.present" depends="init">
+    <echo>================================= WARNING ================================</echo>
+    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
     <mkdir dir="${testclassesdir}">
     </mkdir>
     <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false"
excludes="**/package.html">
       <src>
-        <pathelement location="src/test">
+        <pathelement location="${basedir}/src/test">
         </pathelement>
       </src>
       <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
+        <path refid="build.classpath">
+        </path>
         <pathelement path="${classesdir}">
         </pathelement>
       </classpath>
     </javac>
   </target>
-  <target name="javadoc" description="o Generate javadoc" depends="jar">
+  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
     <mkdir dir="${javadocdir}">
     </mkdir>
     <tstamp>
@@ -144,32 +186,75 @@
     </property>
     <property name="title" value="Commons Id 0.1-dev API">
     </property>
-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true"
sourcepath="src/java" packagenames="org.apache.commons.id.*.*">
+    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true"
sourcepath="${basedir}/src/java" packagenames="org.apache.commons.id.*.*">
       <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement location="target/${final.name}.jar">
-        </pathelement>
+        <path refid="build.classpath">
+        </path>
       </classpath>
     </javadoc>
   </target>
-  <target name="get-deps" unless="noget" depends="init">
-    <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
+  <target name="get-dep-ant.jar" description="o Download the dependency : ant.jar" unless="ant.jar"
depends="init,setProxy,noProxy,get-custom-dep-ant.jar">
+    <mkdir dir="${libdir}/ant/jars/">
+    </mkdir>
+    <get dest="${libdir}/ant/jars/ant-1.5.3-1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.3-1.jar">
     </get>
-    <get dest="${libdir}/commons-discovery-0.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-discovery/jars/commons-discovery-0.1.jar">
+  </target>
+  <target name="get-custom-dep-ant.jar" if="ant.jar" depends="init,setProxy,noProxy">
+    <mkdir dir="${libdir}/ant/jars/">
+    </mkdir>
+    <get dest="${libdir}/ant/jars/ant-1.5.3-1.jar" usetimestamp="true" ignoreerrors="true"
src="${ant.jar}">
     </get>
-    <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar">
+  </target>
+  <target name="get-dep-junit.jar" description="o Download the dependency : junit.jar"
unless="junit.jar" depends="init,setProxy,noProxy,get-custom-dep-junit.jar">
+    <mkdir dir="${libdir}/junit/jars/">
+    </mkdir>
+    <get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
     </get>
-    <get dest="${libdir}/commons-codec-1.2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-codec/jars/commons-codec-1.2.jar">
+  </target>
+  <target name="get-custom-dep-junit.jar" if="junit.jar" depends="init,setProxy,noProxy">
+    <mkdir dir="${libdir}/junit/jars/">
+    </mkdir>
+    <get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"
src="${junit.jar}">
     </get>
-    <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
+  </target>
+  <target name="get-dep-commons-discovery.jar" description="o Download the dependency
: commons-discovery.jar" unless="commons-discovery.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-discovery.jar">
+    <mkdir dir="${libdir}/commons-discovery/jars/">
+    </mkdir>
+    <get dest="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar" usetimestamp="true"
ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-discovery/jars/commons-discovery-0.2.jar">
     </get>
-    <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
+  </target>
+  <target name="get-custom-dep-commons-discovery.jar" if="commons-discovery.jar" depends="init,setProxy,noProxy">
+    <mkdir dir="${libdir}/commons-discovery/jars/">
+    </mkdir>
+    <get dest="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar" usetimestamp="true"
ignoreerrors="true" src="${commons-discovery.jar}">
     </get>
-    <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar">
+  </target>
+  <target name="get-dep-commons-logging.jar" description="o Download the dependency :
commons-logging.jar" unless="commons-logging.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-logging.jar">
+    <mkdir dir="${libdir}/commons-logging/jars/">
+    </mkdir>
+    <get dest="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar" usetimestamp="true"
ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar">
+    </get>
+  </target>
+  <target name="get-custom-dep-commons-logging.jar" if="commons-logging.jar" depends="init,setProxy,noProxy">
+    <mkdir dir="${libdir}/commons-logging/jars/">
+    </mkdir>
+    <get dest="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar" usetimestamp="true"
ignoreerrors="true" src="${commons-logging.jar}">
     </get>
+  </target>
+  <target name="get-deps" unless="noget" depends="get-dep-ant.jar,get-dep-junit.jar,get-dep-commons-discovery.jar,get-dep-commons-logging.jar">
+  </target>
+  <target name="setProxy" if="useProxy" depends="init">
+    <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+    <echo>Proxy used :</echo>
+    <echo>Proxy host [${proxy.host}]</echo>
+    <echo>Proxy port [${proxy.port}]</echo>
+    <echo>Proxy user [${proxy.username}]</echo>
+    <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}"
proxyhost="${proxy.host}">
+    </setproxy>
+  </target>
+  <target name="noProxy" unless="useProxy" depends="init">
+    <echo>Proxy not used.</echo>
   </target>
   <target name="install-maven">
     <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message