costin      01/10/30 12:55:39

  Modified:    jk/jkant/java/org/apache/jk/ant SoTask.java
  Added:       jk/jkant/java/org/apache/jk/ant Def.java
  Log:
  Add support for <def>ines, see build.xml for usage.
  
  Revision  Changes    Path
  1.7       +20 -0     jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/SoTask.java
  
  Index: SoTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/SoTask.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SoTask.java	2001/10/29 17:59:20	1.6
  +++ SoTask.java	2001/10/30 20:55:38	1.7
  @@ -107,6 +107,7 @@
       String cflags;
       File buildDir;
       int debug;
  +    Vector defines = new Vector();
       
       public SoTask() {};
   
  @@ -117,6 +118,11 @@
       public void setDebug(int i) {
   	debug=i;
       }
  +
  +    public void addDef(Def var ) {
  +	var.setProject( project );
  +	defines.addElement(var);
  +    }
       
       public void setTarget(String s ) {
   	soFile=s;
  @@ -370,6 +376,20 @@
   	    cmd.createArgument().setValue(includeList[i] );
   	}
   
  +	if( defines.size() > 0 ) {
  +	    Enumeration defs=defines.elements();
  +	    while( defs.hasMoreElements() ) {
  +		Def d=(Def)defs.nextElement();
  +		String name=d.getName();
  +		String val=d.getValue();
  +		if( name==null ) continue;
  +		String arg="-D" + name;
  +		if( val!=null )
  +		    arg+= "=" + val;
  +		cmd.createArgument().setValue( arg );
  +		if( debug > 0 ) project.log(arg);
  +            }
  +        }
   
   	cmd.createArgument().setValue( "-c" );
   
  
  
  
  1.1                  jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/Def.java
  
  Index: Def.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Ant", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.jk.ant;
  
  import org.apache.tools.ant.*;
  
  /** Define name/value, value is optional
   *  The define will take place if the condition
   *  is met.
   *
   *  A <so> task should include all the defines it supports,
   *  with the default value. This allows the builder to customize
   *  without having to look at the source.
   */
  public class Def {
      String name;
      String info;
      String value;
      String ifCond;
      String unlessCond;
      Project project;
  
      public Def() {
      }
  
      public void setProject( Project p ) {
  	project=p;
      }
      
      public void setName(String n) {
  	name=n;
      }
  
      public void setValue( String v ) {
  	value=v;
      }
  
      public void setIf( String ifCond ) {
  	this.ifCond=ifCond;
      }
  
      public void setUnless( String unlessCond ) {
  	this.unlessCond=unlessCond;
      }
  
      /** Informations about the option
       */
      public void setInfo(String n ) {
  	info=n;
      }
  
      // -------------------- Getters --------------------
  
      /** Return the name of the define, or null if the define is not
       *  valid ( if/unless conditions )
       */
      public String getName() {
  	if( ifCond!=null && project.getProperty(ifCond) == null )
  	    return null;
  	if (unlessCond != null && project.getProperty(unlessCond) != null) 
  	    return null;
  	return name;
      }
  
      public String getValue() {
  	return value;
      }
  }
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>