ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/helper ProjectHelperImpl.java
Date Wed, 24 Jul 2002 15:43:28 GMT
bodewig     2002/07/24 08:43:28

  Modified:    docs/manual using.html
               src/etc/testcases/core/topleveltasks notarget.xml
                        toplevelant.xml
               src/etc/testcases/taskdefs java.xml
               src/main/org/apache/tools/ant/helper ProjectHelperImpl.java
  Log:
  Make <project>'s default attribute required to stop the sky from falling.
  
  Revision  Changes    Path
  1.25      +1 -1      jakarta-ant/docs/manual/using.html
  
  Index: using.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/using.html,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- using.html	15 Jul 2002 14:41:46 -0000	1.24
  +++ using.html	24 Jul 2002 15:43:28 -0000	1.25
  @@ -30,7 +30,7 @@
     <tr>
       <td valign="top">default</td>
       <td valign="top">the default target to use when no target is supplied.</td>
  -    <td align="center" valign="top">No.  No target will be run if omitted.</td>
  +    <td align="center" valign="top"><!-- No.  No target will be run if omitted.-->
Yes.</td>
     </tr>
     <tr>
       <td valign="top">basedir</td>
  
  
  
  1.2       +2 -1      jakarta-ant/src/etc/testcases/core/topleveltasks/notarget.xml
  
  Index: notarget.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/core/topleveltasks/notarget.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- notarget.xml	15 Jul 2002 14:41:46 -0000	1.1
  +++ notarget.xml	24 Jul 2002 15:43:28 -0000	1.2
  @@ -1,3 +1,4 @@
  -<project>
  +<project default="foo">
     <echo message="Called" />
  +  <target name="foo" />
   </project>
  
  
  
  1.2       +2 -1      jakarta-ant/src/etc/testcases/core/topleveltasks/toplevelant.xml
  
  Index: toplevelant.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/core/topleveltasks/toplevelant.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- toplevelant.xml	15 Jul 2002 14:41:47 -0000	1.1
  +++ toplevelant.xml	24 Jul 2002 15:43:28 -0000	1.2
  @@ -1,3 +1,4 @@
  -<project basedir=".">
  +<project basedir="." default="foo">
     <ant antfile="notarget.xml" />
  +  <target name="foo" />
   </project>
  
  
  
  1.4       +2 -1      jakarta-ant/src/etc/testcases/taskdefs/java.xml
  
  Index: java.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/java.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- java.xml	8 Apr 2002 15:40:33 -0000	1.3
  +++ java.xml	24 Jul 2002 15:43:28 -0000	1.4
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<project name="java-test" basedir="." default="">
  +<project name="java-test" basedir="." default="foo">
   
     <property name="app" 
       value="org.apache.tools.ant.taskdefs.JavaTest$$EntryPoint" />
  @@ -89,4 +89,5 @@
       </java>
     </target>
     
  +  <target name="foo" />
   </project>
  
  
  
  1.13      +2 -0      jakarta-ant/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
  
  Index: ProjectHelperImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ProjectHelperImpl.java	23 Jul 2002 06:53:29 -0000	1.12
  +++ ProjectHelperImpl.java	24 Jul 2002 15:43:28 -0000	1.13
  @@ -454,6 +454,8 @@
   
               if (def != null && !def.equals("")) {
                   helperImpl.project.setDefaultTarget(def);
  +            } else {
  +                throw new BuildException("The default attribute is required");
               }
   
               if (name != null) {
  
  
  

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


Mime
View raw message