Shift around ant smoke tests and add a handy makefile

martinpaljak · Mar 4, 2024 · 09474a8 · 09474a8
1 parent 521fef5
commit 09474a8
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 59 deletions.
diff --git a/Makefile b/Makefile
@@ -0,0 +1,32 @@
+SHELL := /bin/bash
+JDK := zulu
+JAVA8 := /Library/Java/JavaVirtualMachines/$(JDK)-8.jdk/Contents/Home
+JAVA11 := /Library/Java/JavaVirtualMachines/$(JDK)-11.jdk/Contents/Home
+JAVA17 := /Library/Java/JavaVirtualMachines/$(JDK)-17.jdk/Contents/Home
+JAVA21 := /Library/Java/JavaVirtualMachines/$(JDK)-21.jdk/Contents/Home
+
+default: reportjava
+	./mvnw package
+	ant test
+
+reportjava:
+	@echo using java $(shell java -version 2>&1 | grep version) from \"$(JAVA_HOME)\"
+
+jar:
+	JAVA_HOME=$(JAVA8) ant clean dist
+
+cap:
+	# run maven with JDK21
+	JAVA_HOME=$(JAVA21) ./mvnw package
+
+8:
+	JAVA_HOME=$(JAVA8) ant clean test
+
+11:
+	JAVA_HOME=$(JAVA11) ant clean test
+
+17:
+	JAVA_HOME=$(JAVA17) ant clean test
+
+
+all: cap 8 11 17
diff --git a/build.xml b/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="dist" name="ant-javacard build">
     <!-- Build and load the JavaCard task -->
-    <target name="jcpro" depends="clean">
+    <target name="jcpro">
         <mkdir dir="build"/>
         <javac debug="true" destdir="build" includeantruntime="true" target="8" source="8">
             <src path="capfile/src/main/java"/>
@@ -19,7 +19,7 @@
     <!-- Package it into a JAR -->
     <target name="dist" depends="jcpro">
         <jar destfile="ant-javacard.jar" level="9" basedir="build">
-            <!-- Some people try to execute ant-javacard.jar... -->
+            <!-- It is possible to execute ant-javacard.jar... -->
             <manifest>
                 <attribute name="Main-Class" value="pro.javacard.ant.DummyMain"/>
             </manifest>
@@ -29,7 +29,7 @@
         <!-- lib folder and having the following in your target: -->
         <!-- <taskdef name="javacard" classname="pro.javacard.ant.JavaCard" classpath="lib/ant-javacard.jar"/> -->
     </target>
-    <!-- Build test applets -->
+    <!-- Build smoke test applets -->
     <import file="tests-${ant.java.version}.xml"/>
     <!-- Cleanup! -->
     <target name="clean">

diff --git a/fails.xml b/fails.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." name="ant-javacard failed tests">
-    <!-- Some handy shorthands -->
-    <property name="JC211" value="sdks/jc211_kit"/>
-    <property name="JC212" value="sdks/jc212_kit"/>
-    <property name="JC221" value="sdks/jc221_kit"/>
-    <property name="JC222" value="sdks/jc222_kit"/>
-    <property name="JC303" value="sdks/jc303_kit"/>
-    <property name="JC304" value="sdks/jc304_kit"/>
-    <property name="JC305_1" value="sdks/jc305u1_kit"/>
-    <property name="JC305_2" value="sdks/jc305u2_kit"/>
-    <property name="JC305" value="sdks/jc305u3_kit"/>
-    <property name="JC310" value="sdks/jc310r20210706_kit"/>
+    <include file="kits.xml"/>
 
     <taskdef name="javacard" classname="pro.javacard.ant.JavaCard" classpath="ant-javacard.jar"/>
 

diff --git a/kits.xml b/kits.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir="." name="kit defs">
+    <!-- Some handy shorthands -->
+    <property name="JC211" value="sdks/jc211_kit"/>
+    <property name="JC212" value="sdks/jc212_kit"/>
+    <property name="JC221" value="sdks/jc221_kit"/>
+    <property name="JC222" value="sdks/jc222_kit"/>
+    <property name="JC303" value="sdks/jc303_kit"/>
+    <property name="JC304" value="sdks/jc304_kit"/>
+    <property name="JC305_1" value="sdks/jc305u1_kit"/>
+    <property name="JC305_2" value="sdks/jc305u2_kit"/>
+    <property name="JC305" value="sdks/jc305u3_kit"/>
+    <property name="JC310" value="sdks/jc310r20210706_kit"/>
+    <property name="JC320" value="sdks/jc320v24.0_kit"/>
+</project>    
diff --git a/tests-1.8.xml b/tests-1.8.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="test" name="ant-javacard tests">
-    <!-- Some handy shorthands -->
-    <property name="JC211" value="sdks/jc211_kit"/>
-    <property name="JC212" value="sdks/jc212_kit"/>
-    <property name="JC221" value="sdks/jc221_kit"/>
-    <property name="JC222" value="sdks/jc222_kit"/>
-    <property name="JC303" value="sdks/jc303_kit"/>
-    <property name="JC304" value="sdks/jc304_kit"/>
-    <property name="JC305_1" value="sdks/jc305u1_kit"/>
-    <property name="JC305_2" value="sdks/jc305u2_kit"/>
-    <property name="JC305" value="sdks/jc305u3_kit"/>
-    <property name="JC310" value="sdks/jc310r20210706_kit"/>
+    <import file="kits.xml"/>
     <!-- Build test applets -->
     <target name="test" depends="jcpro,test-library-user,test-multiapp,test-no-output,test-sdks,test-stringdef,test-targetsdk,test-oldcross,test-exp-version"/>
     <!-- Different SDK-s-->
@@ -59,11 +49,17 @@
         </javacard>
     </target>
     <!-- Library -->
-    <target name="test-library" depends="jcpro">
+    <target name="test-library-old" depends="jcpro">
         <javacard jckit="${JC305}">
             <cap targetsdk="${JC222}" sources="src/testapplets/library" package="testapplets.library" aid="01020304050607" export="testlib" version="0.127"/>
         </javacard>
     </target>
+    <!-- Library -->
+    <target name="test-library" depends="jcpro,test-library-old">
+        <javacard jckit="${JC320}">
+            <cap targetsdk="3.0.4" sources="src/testapplets/library" package="testapplets.library" aid="01020304050607" export="testlib" version="0.127"/>
+        </javacard>
+    </target>
     <!-- JC 2.2.2 with 3.0.4 library -->
     <target name="test-library-user" depends="jcpro,test-library">
         <javacard>

diff --git a/tests-11.xml b/tests-11.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="test" name="ant-javacard tests">
-    <!-- Some handy shorthands -->
-    <property name="JC211" value="sdks/jc211_kit"/>
-    <property name="JC212" value="sdks/jc212_kit"/>
-    <property name="JC221" value="sdks/jc221_kit"/>
-    <property name="JC222" value="sdks/jc222_kit"/>
-    <property name="JC303" value="sdks/jc303_kit"/>
-    <property name="JC304" value="sdks/jc304_kit"/>
-    <property name="JC305_1" value="sdks/jc305u1_kit"/>
-    <property name="JC305_2" value="sdks/jc305u2_kit"/>
-    <property name="JC305" value="sdks/jc305u3_kit"/>
-    <property name="JC310" value="sdks/jc310r20210706_kit"/>
+    <import file="kits.xml"/>
     <!-- Build test applets -->
     <target name="test" depends="jcpro,test-library-user,test-multiapp,test-no-output,test-sdks,test-stringdef,test-targetsdk,test-oldcross,test-jca"/>
     <!-- Different SDK-s-->

diff --git a/tests-17.xml b/tests-17.xml
@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="test" name="ant-javacard tests">
-    <!-- Some handy shorthands -->
-    <property name="JC211" value="sdks/jc211_kit"/>
-    <property name="JC212" value="sdks/jc212_kit"/>
-    <property name="JC221" value="sdks/jc221_kit"/>
-    <property name="JC222" value="sdks/jc222_kit"/>
-    <property name="JC303" value="sdks/jc303_kit"/>
-    <property name="JC304" value="sdks/jc304_kit"/>
-    <property name="JC305_1" value="sdks/jc305u1_kit"/>
-    <property name="JC305_2" value="sdks/jc305u2_kit"/>
-    <property name="JC305" value="sdks/jc305u3_kit"/>
-    <property name="JC310" value="sdks/jc310r20210706_kit"/>
-    <property name="JC320" value="sdks/jc320v24.0_kit"/>
+    <import file="kits.xml"/>
+
     <!-- Build test applets -->
     <target name="test" depends="jcpro,test-sdks"/>
+
     <!-- Different SDK-s-->
     <target name="test-sdks">
         <javacard>

diff --git a/tests-21.xml b/tests-21.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir="." default="test" name="ant-javacard tests">
+    <!-- Build test applets -->
+    <target name="test">
+        <echo message="JDK 21 does not work with any JavaCard kit. See https://github.com/martinpaljak/ant-javacard/wiki/JavaCard-SDK-and-JDK-version-compatibility"/>
+    </target>
+</project>
diff --git a/tests.xml b/tests.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="test" name="ant-javacard tests">
-    <!-- Some handy shorthands -->
-    <property name="JC211" value="sdks/jc211_kit"/>
-    <property name="JC212" value="sdks/jc212_kit"/>
-    <property name="JC221" value="sdks/jc221_kit"/>
-    <property name="JC222" value="sdks/jc222_kit"/>
-    <property name="JC303" value="sdks/jc303_kit"/>
-    <property name="JC304" value="sdks/jc304_kit"/>
-    <property name="JC305_1" value="sdks/jc305u1_kit"/>
-    <property name="JC305_2" value="sdks/jc305u2_kit"/>
-    <property name="JC305" value="sdks/jc305u3_kit"/>
+    <include file="kits.xml"/>
     <!-- Build test applets -->
     <target name="test" depends="jcpro,test-library-user,test-multiapp,test-no-output,test-sdks,test-stringdef,test-targetsdk,test-oldcross"/>
     <!-- Different SDK-s-->