Better logging for sources tag

Author: martinpaljak

task/src/main/java/pro/javacard/ant/JCCap.java

@@ -431,6 +431,7 @@ private void compile() {
 
         if (!raw_sources.isEmpty()) {
             // Per-path includes/excludes via nested <sources> elements
+            setTaskName("sources");
             Path mergedDir = Misc.makeTemp("sources-" + runIdentifier());
             for (JCSources src : raw_sources) {
                 File srcDir = project.resolveFile(src.path);
@@ -447,6 +448,7 @@ private void compile() {
                 for (String rel : matched) {
                     Path from = srcDir.toPath().resolve(rel);
                     Path to = mergedDir.resolve(rel);
+                    log(from + " -> " + to, Project.MSG_INFO);
                     try {
                         Path parent = to.getParent();
                         if (parent != null) {
@@ -458,6 +460,7 @@ private void compile() {
                     }
                 }
             }
+            setTaskName("compile");
             sources.append(mkPath(mergedDir.toAbsolutePath().toString()));
         } else {
             // Legacy: flat sources/sources2/includes/excludes attributes

tests-21.xml

@@ -3,7 +3,7 @@
     <import file="kits.xml"/>
 
     <!-- Build test applets -->
-    <target name="test" depends="jcpro,test-sdks"/>
+    <target name="test" depends="jcpro,test-sdks,test-nested-sources"/>
 
     <!-- Different SDK-s-->
     <target name="test-sdks">
@@ -23,4 +23,13 @@
             </cap>
         </javacard>
     </target>
+    <!-- Nested sources with per-path includes/excludes -->
+    <target name="test-nested-sources" depends="jcpro">
+        <javacard>
+            <cap jckit="${JC320_2}" aid="010203040506">
+                <applet class="testapplets.empty.Empty"/>
+                <sources path="src/testapplets/empty"/>
+            </cap>
+        </javacard>
+    </target>
 </project>