ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject cvs commit: ant/lib libraries.properties
Date Thu, 14 Jul 2005 14:41:41 GMT
stevel      2005/07/14 07:41:41

  Modified:    .        fetch.xml
               lib      libraries.properties
  Log:
  repostitory fetch will pull down the maven2 library on demand.
  
  Revision  Changes    Path
  1.4       +14 -31    ant/fetch.xml
  
  Index: fetch.xml
  ===================================================================
  RCS file: /home/cvs/ant/fetch.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- fetch.xml	17 May 2005 14:09:25 -0000	1.3
  +++ fetch.xml	14 Jul 2005 14:41:41 -0000	1.4
  @@ -20,21 +20,15 @@
     -Ddest=system   ant lib dir   ${ant.home}/lib --Default--
     -Ddest=optional optional dir  ${ant.home}/lib/optional  (for Ant developers)
     
  -  You may also need to set proxy settings. This can be done on the command line,
  -  or in ${user.home}/.ant/proxy.properties 
  -    proxy.host  hostname of proxy
  -    proxy.port  port (default 80)
  -    proxy.user  user (default="")
  -    proxy.pass  pass (default="" )
  -
  -  Note that this project does not download any scripting language implementations.
  +  You may also need to set proxy settings. This can be done by
  +  setting the JVM proxy values in the ANT_OPTS environment
  +  variables.
       
   </description>
   
     <!-- Give user a chance to override without editing this file
          (and without typing -D each time it compiles it) -->
  -  <property file=".ant.properties"/>
  -  <property file="${user.home}/.ant.properties"/>
  +  <property file="${user.home}/.ant/ant.properties"/>
     <property name="lib.dir" location="lib" />
     <property name="optional.dir" location="${lib.dir}/optional" />
     <property name="userlib.dir" location="${user.home}/.ant/lib" />
  @@ -42,21 +36,7 @@
     <!-- load in our properties table -->
     <property file="${lib.dir}/libraries.properties"/>
     
  -    <!-- configure an HTTP proxy -->
  -  <property file="${user.home}/.ant/proxy.properties" />
  -  <target name="setproxy" unless="setproxy.disabled" >
  -    <property name="proxy.host" value="" />
  -    <property name="proxy.port" value="80" />
  -    <property name="proxy.user" value="" />
  -    <property name="proxy.pass" value="" />
  -    <echo level="verbose">
  -      proxy: ${proxy.host}:${proxy.port} [${proxy.user}/${proxy.pass}]
  -    </echo>
  -      <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
  -        proxyuser="${proxy.user}" proxypassword="${proxy.pass}" />
  -  </target> 
  -  
  -  
  + 
     <target name="pick-dest">
       <condition property="dest.dir" 
         value="${lib.dir}">
  @@ -83,7 +63,7 @@
     </target>
   
     
  -  <target name="probe-m2" >
  +  <target name="probe-m2" depends="pick-dest">
       <!-- Look for M2 ant tasks in our classpath-->
       <available property="m2.antlib.found"
         resource="org/apache/maven/artifact/ant/antlib.xml" />
  @@ -93,12 +73,15 @@
     </target>
     
   
  -  <target name="get-m2" depends="setproxy,probe-m2" unless="m2.antlib.found">
  +  <target name="get-m2" depends="probe-m2,pick-dest" unless="m2.antlib.found">
       <!-- fetch M2 ant tasks into our repository, if it is not there-->
  -    <!-- <property name="" /> -->
  -    <fail>
  +    <get src="${m2.antlib.url}" 
  +      dest="${dest.dir}/${m2.jar.name}" 
  +      verbose="true"
  +      usetimestamp="false"/>
  +<!--     <fail>
       Fetch the ant task JAR from http://maven.apache.org/maven2/ant-tasks.html
  -    </fail>
  +    </fail> -->
     </target>  
     
     
  @@ -134,7 +117,7 @@
   
     
     <!-- any init stuff -->
  -  <target name="init" depends="setproxy,pick-dest,macros" >
  +  <target name="init" depends="pick-dest,macros" >
   
     </target>
     
  
  
  
  1.5       +11 -0     ant/lib/libraries.properties
  
  Index: libraries.properties
  ===================================================================
  RCS file: /home/cvs/ant/lib/libraries.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- libraries.properties	17 May 2005 14:09:25 -0000	1.4
  +++ libraries.properties	14 Jul 2005 14:41:41 -0000	1.5
  @@ -1,6 +1,17 @@
   #this file declares the libraries for use in 
   #a given release of the components
   
  +m2.version=2.0-alpha-3
  +m2.url=http://ibiblio.org/maven2/
  +m2.artifact-name=maven-artifact-ant
  +m2.jar.name=${m2.artifact-name}-${m2.version}.jar
  +#this is the URL of the antlib library, that is pulled down for everything else.
  +m2.antlib.url=${m2.url}/org/apache/maven/${m2.artifact-name}/${m2.version}/${m2.jar.name}
  +
  +
  +
  +#versions of different libraries. Please keep in alphabetical order, except
  +#when a specific dependency forces them to be out-of-order
   antlr.version=2.7.2
   bcel.version=5.1
   bsf.version=2.3.0
  
  
  

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


Mime
View raw message