ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional Javah.java
Date Fri, 14 Jan 2005 09:45:55 GMT
bodewig     2005/01/14 01:45:54

  Modified:    docs/manual clonevm.html sysclasspath.html
               src/main/org/apache/tools/ant/taskdefs Javadoc.java
               src/main/org/apache/tools/ant/taskdefs/optional Javah.java
  Log:
  Finalize and document bootclasspath changes
  
  Revision  Changes    Path
  1.2       +7 -4      ant/docs/manual/clonevm.html
  
  Index: clonevm.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/clonevm.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- clonevm.html	6 Apr 2004 14:09:25 -0000	1.1
  +++ clonevm.html	14 Jan 2005 09:45:54 -0000	1.2
  @@ -18,16 +18,19 @@
   attributes to control the VMs on a task-by-task basis while the system
   property applies to all forked Java VMs.</p>
   
  -<p>If the value of the property is true, then all system properties
  -and the bootclasspath of the forked Java Virtual Machine will be the
  -same as those of the Java VM running Ant.</p>
  +<p>If the value of the property is true, then all system properties of
  +the forked Java Virtual Machine will be the same as those of the Java
  +VM running Ant.  In addition, if you set build.clonevm to true and <a
  +href="sysclasspath.html">build.sysclasspath</a> has not been set, the
  +bootclasspath of forked Java VMs gets constructed as if
  +build.sysclasspath had the value "last".</p>
   
   <p>Note that this has to be a system property, so it cannot be
   specified on the Ant command line.  Use the ANT_OPTS environment
   variable instead.</p>
   
   <hr>
  -<p align="center">Copyright &copy; 2004 The Apache Software Foundation. All rights
  +<p align="center">Copyright &copy; 2004-2005 The Apache Software Foundation.
All rights
   Reserved.</p>
   </body>
   </html>
  
  
  
  1.6       +7 -1      ant/docs/manual/sysclasspath.html
  
  Index: sysclasspath.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/sysclasspath.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- sysclasspath.html	9 Feb 2004 21:50:05 -0000	1.5
  +++ sysclasspath.html	14 Jan 2005 09:45:54 -0000	1.6
  @@ -51,8 +51,14 @@
   </tr>
   </table>
   
  +<p><em>Since Ant 1.7</em> the value of this property also affects the
  +bootclasspath settings - it combines the bootclasspath that has been
  +specified for a task with the bootclasspath of the Java VM running
  +Ant.  If the property has not been set, it defaults to "ignore" in
  +this case.</p>
  +
   <hr>
  -<p align="center">Copyright &copy; 2001-2002,2004 The Apache Software Foundation.
All rights
  +<p align="center">Copyright &copy; 2001-2002,2004-2005 The Apache Software Foundation.
All rights
   Reserved.</p>
   </body>
   </html>
  
  
  
  1.132     +7 -2      ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.131
  retrieving revision 1.132
  diff -u -r1.131 -r1.132
  --- Javadoc.java	6 Jan 2005 12:05:05 -0000	1.131
  +++ Javadoc.java	14 Jan 2005 09:45:54 -0000	1.132
  @@ -1669,9 +1669,14 @@
                       }
                   }
               }
  -            if (bootclasspath != null && bootclasspath.size() > 0) {
  +            Path bcp = new Path(getProject());
  +            if (bootclasspath != null) {
  +                bcp.append(bootclasspath);
  +            }
  +            bcp = bcp.concatSystemBootClasspath("ignore");
  +            if (bcp.size() > 0) {
                   toExecute.createArgument().setValue("-bootclasspath");
  -                toExecute.createArgument().setPath(bootclasspath);
  +                toExecute.createArgument().setPath(bcp);
               }
   
               // add the links arguments
  
  
  
  1.33      +7 -2      ant/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
  
  Index: Javah.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Javah.java	22 Apr 2004 14:48:31 -0000	1.32
  +++ Javah.java	14 Jan 2005 09:45:54 -0000	1.33
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2000-2004 The Apache Software Foundation
  + * Copyright  2000-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -385,9 +385,14 @@
               }
               cmd.createArgument().setValue("-stubs");
           }
  +        Path bcp = new Path(getProject());
           if (bootclasspath != null) {
  +            bcp.append(bootclasspath);
  +        }
  +        bcp = bcp.concatSystemBootClasspath("ignore");
  +        if (bcp.size() > 0) {
               cmd.createArgument().setValue("-bootclasspath");
  -            cmd.createArgument().setPath(bootclasspath);
  +            cmd.createArgument().setPath(bcp);
           }
   
           logAndAddFilesToCompile(cmd);
  
  
  

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


Mime
View raw message