dion        2002/07/24 15:15:30

  Modified:    .        build-bootstrap.xml
  Log:
  Allow bootstrap to be done offline without pages of errors
  
  Revision  Changes    Path
  1.139     +25 -2     jakarta-turbine-maven/build-bootstrap.xml
  
  Index: build-bootstrap.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
  retrieving revision 1.138
  retrieving revision 1.139
  diff -u -r1.138 -r1.139
  --- build-bootstrap.xml       24 Jul 2002 11:51:29 -0000      1.138
  +++ build-bootstrap.xml       24 Jul 2002 22:15:30 -0000      1.139
  @@ -24,6 +24,13 @@
       value="${maven.bootstrap.dir}/classes"
     />
   
  +  <!-- bootstrap is offline or online - online by default . Pass this property
  +       as -o from the command prompt if you are offline -->  
  +  <property
  +    name="maven.bootstrap.online"
  +    value=""
  +  />
  +
     <property
       name="maven.conf.dir"
       value="src/conf"
  @@ -47,6 +54,20 @@
     <target
       name="check-properties"
       depends="check-maven-home,check-maven-repo-local">
  +      <!-- are we online? -->
  +      <condition property="online">
  +        <equals arg1="${maven.bootstrap.online}" arg2="" />
  +      </condition>
  +
  +      <!-- are we online via a proxy -->
  +      <condition property="proxied-online">
  +        <and>
  +            <not><equals arg1="${maven.proxy.host}" 
arg2="$${maven.proxy.host}"/></not>
  +            <equals arg1="${maven.bootstrap.online}" arg2="" />
  +        </and>
  +      </condition>
  +
  +
     </target>
   
     <target
  @@ -140,6 +161,7 @@
   
       <exec executable="${maven.home}/bin/${maven.script}"
             failonerror="true">
  +      <arg line="${maven.bootstrap.online}"/>
         <arg line="maven:plugins-build"/>
   <!--
         <arg line="-X"/>
  @@ -149,6 +171,7 @@
   
       <exec executable="${maven.home}/bin/${maven.script}"
             failonerror="true">
  +      <arg line="${maven.bootstrap.online}"/>
         <arg line="clean"/>
         <arg line="java:jar"/>
         <env key="MAVEN_HOME" value="${maven.home}"/>
  @@ -227,7 +250,7 @@
     <!-- available until maven is built.                                    -->
     <!-- ================================================================== -->
   
  -  <target name="get-jars-no-proxy" unless="maven.proxy.host">
  +  <target name="get-jars-no-proxy" if="online" unless="maven.proxy.host">
       <taskdef
         name="get-list"
         classname="org.apache.maven.ant.GetList">
  @@ -241,7 +264,7 @@
       />
     </target>
   
  -  <target name="get-jars-proxy" if="maven.proxy.host">
  +  <target name="get-jars-proxy" if="proxied-online">
       <taskdef
         name="get-list"
         classname="org.apache.maven.ant.GetList">
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to