Skip to content

Commit 2ae4a82

Browse files
committed
Have different default name for libraries
1 parent 0a5fd32 commit 2ae4a82

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
public class JCCap extends Task {
4949

5050
static final String DEFAULT_CAP_NAME_TEMPLATE = "%n_%a_%h_%j_%J.cap"; // SomeApplet_010203040506_9a037e30_2.2.2_jdk11.cap
51+
static final String DEFAULT_CAP_NAME_TEMPLATE_LIB = "%n_%a_%v_%h.cap"; // some.library_010203040506_v1.2_9a037e30.cap
52+
5153
private final String master_jckit_path;
5254
private JavaCardSDK jckit = null;
5355
private String classes_path = null;
@@ -360,7 +362,7 @@ else if (getProject().resolveFile("src/main/java").isDirectory())
360362
}
361363
// Default output name
362364
if (output_cap == null) {
363-
output_cap = DEFAULT_CAP_NAME_TEMPLATE;
365+
output_cap = raw_applets.size() == 0 ? DEFAULT_CAP_NAME_TEMPLATE_LIB : DEFAULT_CAP_NAME_TEMPLATE;
364366
}
365367
}
366368

0 commit comments

Comments
 (0)