Add JC 3.2.0u1 (24.1) and adjust tests accordingly

martinpaljak · Oct 14, 2024 · 30c3dc2 · 30c3dc2
1 parent 03b3f02
commit 30c3dc2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -34,8 +34,10 @@ cap:
 17:
 	JAVA_HOME=$(JAVA17) ant test
 
+21:
+	JAVA_HOME=$(JAVA21) ant test
 
-all: cap 8 11 17
+all: cap 8 11 17 21
 
 clean:
 	rm -f *~ *.cap
diff --git a/kits.xml b/kits.xml
@@ -12,5 +12,5 @@
     <property name="JC305_3" value="sdks/jc305u3_kit"/>
     <property name="JC305" value="sdks/jc305u4_kit"/>
     <property name="JC310" value="sdks/jc310r20210706_kit"/>
-    <property name="JC320" value="sdks/jc320v24.0_kit"/>
+    <property name="JC320" value="sdks/jc320v24.1_kit"/>
 </project>    
diff --git a/sdks b/sdks
diff --git a/tests-1.8.xml b/tests-1.8.xml
@@ -6,10 +6,6 @@
     <!-- Different SDK-s-->
     <target name="test-sdks">
         <javacard>
-            <!-- JC 3.2.0 -->
-            <cap jckit="${JC320}" sources="src/testapplets/empty">
-                <applet class="testapplets.empty.Empty" aid="0102030405060708"/>
-            </cap>
             <!-- JC 3.1.0 -->
             <cap jckit="${JC310}" sources="src/testapplets/empty">
                 <applet class="testapplets.empty.Empty" aid="0102030405060708"/>
@@ -68,7 +64,7 @@
     </target>
     <!-- Library -->
     <target name="test-library" depends="jcpro,test-library-old">
-        <javacard jckit="${JC320}">
+        <javacard jckit="${JC310}">
             <cap targetsdk="3.0.4" sources="src/testapplets/library" package="testapplets.library" aid="01020304050607" export="testlib" version="0.127"/>
         </javacard>
     </target>
+39 −0		jc320v24.1_kit/bin/capdump.bat
+23 −0		jc320v24.1_kit/bin/capdump.sh
+39 −0		jc320v24.1_kit/bin/capgen.bat
+23 −0		jc320v24.1_kit/bin/capgen.sh
+39 −0		jc320v24.1_kit/bin/converter.bat
+23 −0		jc320v24.1_kit/bin/converter.sh
+39 −0		jc320v24.1_kit/bin/exp2text.bat
+23 −0		jc320v24.1_kit/bin/exp2text.sh
+39 −0		jc320v24.1_kit/bin/verifycap.bat
+23 −0		jc320v24.1_kit/bin/verifycap.sh
+39 −0		jc320v24.1_kit/bin/verifyexp.bat
+23 −0		jc320v24.1_kit/bin/verifyexp.sh
+39 −0		jc320v24.1_kit/bin/verifyrev.bat
+23 −0		jc320v24.1_kit/bin/verifyrev.sh
+ −		jc320v24.1_kit/lib/api_classic-3.0.4.jar
+ −		jc320v24.1_kit/lib/api_classic-3.0.5.jar
+ −		jc320v24.1_kit/lib/api_classic-3.1.0.jar
+ −		jc320v24.1_kit/lib/api_classic-3.2.0.jar
+ −		jc320v24.1_kit/lib/api_classic_annotations-3.0.4.jar
+ −		jc320v24.1_kit/lib/api_classic_annotations-3.0.5.jar
+ −		jc320v24.1_kit/lib/api_classic_annotations-3.1.0.jar
+ −		jc320v24.1_kit/lib/api_classic_annotations-3.2.0.jar
+ −		jc320v24.1_kit/lib/asm-9.6.jar
+ −		jc320v24.1_kit/lib/commons-cli-1.6.0.jar
+ −		jc320v24.1_kit/lib/commons-logging-1.3.0.jar
+ −		jc320v24.1_kit/lib/jctasks_tools.jar
+ −		jc320v24.1_kit/lib/json.jar
+64 −0		jc320v24.1_kit/lib/logging.properties
+ −		jc320v24.1_kit/lib/tools.jar