Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update ant-javacard and jc-sdk #20

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.gradle
build/**
*/build

ext/ant-javacard/
6 changes: 1 addition & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
[submodule "ext/ant-javacard"]
path = ext/ant-javacard
url = https://github.com/promovicz/ant-javacard.git
branch = master
[submodule "ext/javacard-sdks"]
path = ext/javacard-sdks
url = https://github.com/martinpaljak/oracle_javacard_sdks.git
[submodule "ext/globalplatform-exports"]
path = ext/globalplatform-exports
url = https://github.com/OpenJavaCard/globalplatform-exports.git
url = https://github.com/OpenJavaCard/globalplatform-exports.git
22 changes: 12 additions & 10 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,27 @@
<property name="ext.ant-javacard" value="ext/ant-javacard"/>

<property name="sdk.globalplatform" value="ext/globalplatform-exports"/>
<property name="sdk.jc222" value="ext/javacard-sdks/jc222_kit"/>
<property name="sdk.jc" value="ext/javacard-sdks/jc310r20210706_kit"/>

<!-- Cleanup target -->
<target name="clean" description="Delete build output">
<delete dir="build"/>
<delete dir="ext/ant-javacard"/>
</target>

<!-- Prepare build tools and directories -->
<target name="prepare" description="Prepare build">
<ant dir="ext/ant-javacard"/>
<taskdef name="javacard"
classpath="${ext.ant-javacard}/ant-javacard.jar"
classname="pro.javacard.ant.JavaCard"/>

<mkdir dir="build/javacard"/>
<mkdir dir="build/classes/advanced"/>
<mkdir dir="build/classes/full"/>
<mkdir dir="build/classes/stub"/>
<mkdir dir="build/classes/tiny"/>
<mkdir dir="ext/ant-javacard"/>

<get src="https://github.com/martinpaljak/ant-javacard/releases/latest/download/ant-javacard.jar" dest="ext/ant-javacard/ant-javacard.jar" skipexisting="true"/>
<taskdef name="javacard"
classpath="${ext.ant-javacard}/ant-javacard.jar"
classname="pro.javacard.ant.JavaCard"/>
</target>

<!-- Build-all target -->
Expand All @@ -51,7 +53,7 @@
</target>

<target name="build-advanced">
<javacard jckit="${sdk.jc222}">
<javacard jckit="${sdk.jc}">
<cap output="build/javacard/openjavacard-ndef-advanced.cap"
jar="build/javacard/openjavacard-ndef-advanced.jar"
classes="build/classes/advanced"
Expand All @@ -67,7 +69,7 @@
</target>

<target name="build-full">
<javacard jckit="${sdk.jc222}">
<javacard jckit="${sdk.jc}">
<cap output="build/javacard/openjavacard-ndef-full.cap"
jar="build/javacard/openjavacard-ndef-full.jar"
classes="build/classes/full"
Expand All @@ -81,7 +83,7 @@
</target>

<target name="build-tiny">
<javacard jckit="${sdk.jc222}">
<javacard jckit="${sdk.jc}">
<cap output="build/javacard/openjavacard-ndef-tiny.cap"
jar="build/javacard/openjavacard-ndef-tiny.jar"
classes="build/classes/tiny"
Expand All @@ -95,7 +97,7 @@
</target>

<target name="build-stub">
<javacard jckit="${sdk.jc222}">
<javacard jckit="${sdk.jc}">
<cap output="build/javacard/openjavacard-ndef-stub.cap"
jar="build/javacard/openjavacard-ndef-stub.jar"
classes="build/classes/stub"
Expand Down
1 change: 0 additions & 1 deletion ext/ant-javacard
Submodule ant-javacard deleted from 769c72
2 changes: 1 addition & 1 deletion ext/javacard-sdks
Submodule javacard-sdks updated 688 files