#167929: <classpath location="..."/> was not being honored. autoproject_fixes
authorJesse Glick <jglick@netbeans.org>
Wed, 01 Jul 2009 00:17:06 -0400
branchautoproject_fixes
changeset 15200a64b8f081100
parent 15197 a617ca7a8da5
child 15201 d9d5cd036234
child 17318 1011600543b8
#167929: <classpath location="..."/> was not being honored.
autoproject.java/src/org/netbeans/modules/autoproject/java/BuildSniffer.java
autoproject.java/test/unit/src/org/netbeans/modules/autoproject/java/BuildSnifferTest.java
     1.1 --- a/autoproject.java/src/org/netbeans/modules/autoproject/java/BuildSniffer.java	Tue Jun 30 20:44:51 2009 -0400
     1.2 +++ b/autoproject.java/src/org/netbeans/modules/autoproject/java/BuildSniffer.java	Wed Jul 01 00:17:06 2009 -0400
     1.3 @@ -441,6 +441,7 @@
     1.4      }
     1.5  
     1.6      private static void appendPathStructure(TaskStructure s, AntEvent event, List<String> entries, State state) {
     1.7 +        appendPath(s.getAttribute("location"), event, entries, false);
     1.8          appendPath(s.getAttribute("path"), event, entries, true);
     1.9          String ref = s.getAttribute("refid");
    1.10          if (ref != null) {
     2.1 --- a/autoproject.java/test/unit/src/org/netbeans/modules/autoproject/java/BuildSnifferTest.java	Tue Jun 30 20:44:51 2009 -0400
     2.2 +++ b/autoproject.java/test/unit/src/org/netbeans/modules/autoproject/java/BuildSnifferTest.java	Wed Jul 01 00:17:06 2009 -0400
     2.3 @@ -169,6 +169,8 @@
     2.4                  "    <dirset dir='c'/>\n" +
     2.5                  "    <fileset refid='stuff'/>\n" +
     2.6                  "   </classpath>\n" +
     2.7 +                "   <classpath location='cpl.jar'/>\n" +
     2.8 +                "   <classpath path='cpp1.jar:cpp2.jar'/>\n" +
     2.9                  "  </javac>\n" +
    2.10                  " </target>\n" +
    2.11                  "</project>\n");
    2.12 @@ -179,6 +181,7 @@
    2.13              "pe-loc.jar", "pe-path-1.jar", "pe-path-2.jar",
    2.14              "lib/aw.jar", "lib/b.jar", "c",
    2.15              "lib/r1.jar", "lib/r2.jar",
    2.16 +            "cpl.jar", "cpp1.jar", "cpp2.jar", // #167929
    2.17          }) {
    2.18              cp.add(prefix + entry);
    2.19          }