ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant/proposal/mutant/src/java/common/org/apache/ant/common/model Project.java
Date Sat, 02 Mar 2002 14:14:49 GMT
conor       02/03/02 06:14:49

  Modified:    proposal/mutant bootstrap.sh
               proposal/mutant/build ant1compat.xml
               proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution
                        ExecutionManager.java
               proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant
                        Task.java
               proposal/mutant/src/java/bootstrap/org/apache/ant/builder
                        Builder.java
               proposal/mutant/src/java/common/org/apache/ant/common/model
                        Project.java
  Log:
  Small fixes from Gump testing
  
  Revision  Changes    Path
  1.4       +3 -0      jakarta-ant/proposal/mutant/bootstrap.sh
  
  Index: bootstrap.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/bootstrap.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -u -r1.3 -r1.4
  --- bootstrap.sh	20 Feb 2002 13:43:14 -0000	1.3
  +++ bootstrap.sh	2 Mar 2002 14:14:49 -0000	1.4
  @@ -26,3 +26,6 @@
   
   # Use the full build as the build used by the build script
   cp -r dist/lib bootstrap
  +
  +#clean up after bootstrap
  +java -classpath bootstrap/lib/start.jar:bootstrap/lib/init.jar org.apache.ant.start.Main
clean
  
  
  
  1.4       +3 -4      jakarta-ant/proposal/mutant/build/ant1compat.xml
  
  Index: ant1compat.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/build/ant1compat.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -u -r1.3 -r1.4
  --- ant1compat.xml	26 Feb 2002 13:43:53 -0000	1.3
  +++ ant1compat.xml	2 Mar 2002 14:14:49 -0000	1.4
  @@ -26,16 +26,14 @@
       <exclude name="org/apache/tools/ant/taskdefs/AntStructure.java"/>
       <exclude name="org/apache/tools/ant/taskdefs/Recorder.java"/>
       <exclude name="org/apache/tools/ant/taskdefs/RecorderEntry.java"/>
  -    <exclude name="org/apache/tools/ant/taskdefs/optional/Native2Ascii.java"/>
  -    <exclude name="org/apache/tools/ant/taskdefs/optional/Javah.java"/>
       <exclude name="org/apache/tools/ant/taskdefs/optional/jdepend/*.java"/>
     </patternset>
     
     <patternset id="converted">
       <exclude name="org/apache/tools/ant/taskdefs/Ant.java"/>
       <exclude name="org/apache/tools/ant/taskdefs/CallTarget.java"/>
  -<!--    <exclude name="org/apache/tools/ant/taskdefs/Parallel.java"/>
  -    <exclude name="org/apache/tools/ant/taskdefs/Sequential.java"/> -->
  +    <exclude name="org/apache/tools/ant/taskdefs/Parallel.java"/>
  +    <exclude name="org/apache/tools/ant/taskdefs/Sequential.java"/>
     </patternset>
   
     <fileset id="ant1src" dir="../../src/main">
  @@ -55,6 +53,7 @@
       <include name="org/apache/tools/ant/PathTokenizer.java"/>
       <include name="org/apache/tools/ant/FileScanner.java"/>
       <include name="org/apache/tools/ant/TaskAdapter.java"/>
  +    <include name="org/apache/tools/ant/MatchingTask.java"/>
       <include name="org/apache/tools/ant/Location.java"/>
       <include name="org/apache/tools/ant/AntClassLoader.java"/>
       <include name="org/apache/tools/ant/BuildEvent.java"/>
  
  
  
  1.11      +5 -2      jakarta-ant/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ExecutionManager.java
  
  Index: ExecutionManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ExecutionManager.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -w -u -r1.10 -r1.11
  --- ExecutionManager.java	25 Feb 2002 13:28:57 -0000	1.10
  +++ ExecutionManager.java	2 Mar 2002 14:14:49 -0000	1.11
  @@ -222,8 +222,11 @@
        * @param isErr true if this content is from the thread's error stream.
        */
       public void threadOutput(String line, boolean isErr) {
  +        if (mainFrame == null) {
           eventSupport.threadOutput(line, isErr);
  +        } else {
  +            mainFrame.threadOutput(line, isErr);
  +        }
       }
  -
   }
   
  
  
  
  1.8       +3 -3      jakarta-ant/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Task.java
  
  Index: Task.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Task.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -w -u -r1.7 -r1.8
  --- Task.java	26 Feb 2002 13:43:54 -0000	1.7
  +++ Task.java	2 Mar 2002 14:14:49 -0000	1.8
  @@ -133,10 +133,10 @@
   
   
       /**
  -     * XXX Adds a feature to the NestedTask attribute of the Task object
  +     * Add a nested task to this Ant1 task. 
        *
  -     * @param task XXX The feature to be added to the NestedTask attribute
  -     * @exception ExecutionException XXX Description of Exception
  +     * @param task The task to be added
  +     * @exception ExecutionException if the task cannot be added.
        */
       public void addNestedTask(org.apache.ant.common.antlib.Task task)
            throws ExecutionException {
  
  
  
  1.4       +2 -0      jakarta-ant/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java
  
  Index: Builder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -u -r1.3 -r1.4
  --- Builder.java	20 Feb 2002 13:43:15 -0000	1.3
  +++ Builder.java	2 Mar 2002 14:14:49 -0000	1.4
  @@ -124,6 +124,8 @@
           files.add(new File(PACKAGE_ROOT, "DirectoryScanner.java"));
           files.add(new File(PACKAGE_ROOT, "FileScanner.java"));
           files.add(new File(PACKAGE_ROOT, "PathTokenizer.java"));
  +        files.add(new File(PACKAGE_ROOT, "TaskAdapter.java"));
  +        files.add(new File(PACKAGE_ROOT, "MatchingTask.java"));
           files.add(new File(PACKAGE_ROOT, "util/FileUtils.java"));
           files.add(new File(PACKAGE_ROOT, "defaultManifest.mf"));
           files.add(new File(TASKDEFS_ROOT, "defaults.properties"));
  
  
  
  1.4       +3 -1      jakarta-ant/proposal/mutant/src/java/common/org/apache/ant/common/model/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/mutant/src/java/common/org/apache/ant/common/model/Project.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -u -r1.3 -r1.4
  --- Project.java	25 Feb 2002 13:28:58 -0000	1.3
  +++ Project.java	2 Mar 2002 14:14:49 -0000	1.4
  @@ -524,7 +524,9 @@
                        = fullProjectName == null ? localDependencyName
                        : fullProjectName + REF_DELIMITER + localDependencyName;
                   flattenDependency(flattenedList, fullDependencyName);
  +                if (!flattenedList.contains(fullDependencyName)) {
                   flattenedList.add(fullDependencyName);
  +                }
               }
           } catch (ModelException e) {
               throw new ConfigException(e);
  
  
  

--
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