Mercurial > public > ssdtant

changeset 5:de1522a9d4bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ignore missing target in adddependency
author smith@nwoca.org
date Mon, 08 Aug 2011 13:38:54 -0400
parents bace8c04e066
children c989b9aa8820
files nbproject/build-impl.xml nbproject/genfiles.properties src/org/ssdt_ohio/tools/ant/AddDependencyTask.java
diffstat 3 files changed, 12 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/nbproject/build-impl.xml	Thu Jun 09 12:24:29 2011 -0400
+++ b/nbproject/build-impl.xml	Mon Aug 08 13:38:54 2011 -0400
@@ -20,8 +20,8 @@
 
         -->
 <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="SSDT_Ant_Tasks-impl">
+    <import file="ivy-impl.xml"/>
     <import file="groovy-build.xml"/>
-    <import file="ivy-impl.xml"/>
     <fail message="Please build using Ant 1.7.1 or higher.">
         <condition>
             <not>
@@ -845,11 +845,12 @@
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+            <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
                 <include name="**/*.java"/>
+                <exclude name="*.java"/>
             </fileset>
         </javadoc>
         <copy todir="${dist.javadoc.dir}">
--- a/nbproject/genfiles.properties	Thu Jun 09 12:24:29 2011 -0400
+++ b/nbproject/genfiles.properties	Mon Aug 08 13:38:54 2011 -0400
@@ -4,8 +4,8 @@
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=f0bc348c
-nbproject/build-impl.xml.script.CRC32=0c44830b
-nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
+nbproject/build-impl.xml.script.CRC32=a9aaebb9
+nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
 nbproject/groovy-build.xml.data.CRC32=f0bc348c
 nbproject/groovy-build.xml.script.CRC32=542f299d
 nbproject/groovy-build.xml.stylesheet.CRC32=451a613c@1.12.1
--- a/src/org/ssdt_ohio/tools/ant/AddDependencyTask.java	Thu Jun 09 12:24:29 2011 -0400
+++ b/src/org/ssdt_ohio/tools/ant/AddDependencyTask.java	Mon Aug 08 13:38:54 2011 -0400
@@ -8,7 +8,6 @@
 /** @author smith */
 public class AddDependencyTask extends Task {
 
-  
     private String target;
     private String depends;
 
@@ -22,13 +21,15 @@
         }
 
         Target t = (Target) getProject().getTargets().get(target);
+        if (t != null) {
 
-        if (t.dependsOn(depends)) {
-            log(target + " already depends on " + depends, Project.MSG_VERBOSE);
-        } else {
-            log("Adding \"" + depends + "\" dependency to \"" + target + "\"", Project.MSG_VERBOSE);
+            if (t.dependsOn(depends)) {
+                log(target + " already depends on " + depends, Project.MSG_VERBOSE);
+            } else {
+                log("Adding \"" + depends + "\" dependency to \"" + target + "\"", Project.MSG_VERBOSE);
 
-            t.addDependency(depends);
+                t.addDependency(depends);
+            }
         }
     }
 
@@ -40,4 +41,3 @@
         this.depends = depends;
     }
 }
-