Skip to content

Commit 201c388

Browse files
StarGate01StarGate01
committed
Version fixes
1 parent 08ea94e commit 201c388

File tree

11 files changed

+39
-19
lines changed

11 files changed

+39
-19
lines changed

‎scripts/compile/SatochipApplet.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
source "${0%/*}/res/compile.sh"
44

55
prepare_build SatochipApplet
6-
patch_version $BUILD/src/org/satochip/applet/CardEdge.java
76
cp -f /app/src/scripts/compile/res/SatochipApplet.build.xml $BUILD/build.xml
7+
patch_version $BUILD/src/org/satochip/applet/CardEdge.java
88
JC_HOME=/app/sdks/jc304_kit build_default

‎scripts/compile/Satodime-Applet.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
source "${0%/*}/res/compile.sh"
44

55
prepare_build Satodime-Applet
6-
patch_version $BUILD/src/org/satodime/applet/Satodime.java
76
cp /app/src/scripts/compile/res/Satodime-Applet.build.xml $BUILD/build.xml
7+
patch_version $BUILD/src/org/satodime/applet/Satodime.java
88
JC_HOME=/app/sdks/jc304_kit build_default

‎scripts/compile/Seedkeeper-Applet.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
source "${0%/*}/res/compile.sh"
44

55
prepare_build Seedkeeper-Applet
6-
patch_version $BUILD/src/org/seedkeeper/applet/SeedKeeper.java
76
cp /app/src/scripts/compile/res/Seedkeeper-Applet.build.xml $BUILD/build.xml
7+
patch_version $BUILD/src/org/seedkeeper/applet/SeedKeeper.java
88
JC_HOME=/app/sdks/jc304_kit build_default

‎scripts/compile/SmartPGP.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
source "${0%/*}/res/compile.sh"
44

55
prepare_build SmartPGP
6-
patch_version $BUILD/src/fr/anssi/smartpgp/SmartPGPApplet.java
76
cp /app/src/scripts/compile/res/SmartPGP.build.xml $BUILD/build.xml
7+
patch_version $BUILD/src/fr/anssi/smartpgp/SmartPGPApplet.java
88
JC_HOME=/app/sdks/jc304_kit build_default

‎scripts/compile/openjavacard-ndef.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
source "${0%/*}/res/compile.sh"
44

55
prepare_build openjavacard-ndef
6+
cd $BUILD
7+
cp -f /app/src/scripts/compile/res/openjavacard-ndef.build.xml build.xml
68
patch_version $BUILD/applet-advanced/src/main/java/org/openjavacard/ndef/advanced/NdefApplet.java
79
patch_version $BUILD/applet-full/src/main/java/org/openjavacard/ndef/full/NdefApplet.java
810
patch_version $BUILD/applet-stub/src/main/java/org/openjavacard/ndef/stub/NdefApplet.java
911
patch_version $BUILD/applet-tiny/src/main/java/org/openjavacard/ndef/tiny/NdefApplet.java
10-
cd $BUILD
11-
cp -f /app/src/scripts/compile/res/openjavacard-ndef.build.xml build.xml
1212
ant -DJAVACARD_HOME=/app/sdks/jc222_kit build
1313
cd build/javacard
1414
cp *full.cap *tiny.cap /app/src/bin/

‎scripts/compile/res/SatochipApplet.build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<get src="https://github.com/martinpaljak/ant-javacard/releases/download/v20.03.25/ant-javacard.jar" skipexisting="true" dest="."/>
55
<taskdef name="javacard" classname="pro.javacard.ant.JavaCard" classpath="ant-javacard.jar"/>
66
<javacard>
7-
<cap output="target/SatoChip.cap" sources="src" classes="target" aid="5361746F43686970" version="0.1">
7+
<cap output="target/SatoChip.cap" sources="src" classes="target" aid="5361746F43686970" version="0.6">
88
<applet class="org.satochip.applet.CardEdge" aid="5361746F4368697000"/>
99
</cap>
1010
</javacard>

‎scripts/compile/res/Satodime-Applet.build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<get src="https://github.com/martinpaljak/ant-javacard/releases/download/v20.03.25/ant-javacard.jar" skipexisting="true" dest="."/>
55
<taskdef name="javacard" classname="pro.javacard.ant.JavaCard" classpath="ant-javacard.jar"/>
66
<javacard>
7-
<cap output="target/Satodime.cap" sources="src" classes="target" aid="5361746f44696d65" version="0.1">
7+
<cap output="target/Satodime.cap" sources="src" classes="target" aid="5361746f44696d65" version="0.2">
88
<applet class="org.satodime.applet.Satodime" aid="5361746f44696d6500"/>
99
</cap>
1010
</javacard>

‎scripts/compile/res/compile.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ prepare_build() {
1111

1212
patch_version() {
1313
git config --global --add safe.directory /app/src
14+
cd /app/src
1415
TAG=`git tag --points-at HEAD`
1516
SRC="$BUILD/build.xml"
1617
if [ ! -f $SRC ]; then

‎scripts/compile/res/openjavacard-ndef.build.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
classes="build/classes/advanced"
5858
sources="applet-advanced/src/main/java"
5959
aid="D276000085"
60-
version="0.0">
60+
version="1.0">
6161
<applet aid="D2760000850101"
6262
class="org.openjavacard.ndef.advanced.NdefApplet"/>
6363
<import jar="${sdk.globalplatform}/org.globalplatform-1.1/gpapi-globalplatform.jar"
@@ -73,7 +73,7 @@
7373
classes="build/classes/full"
7474
sources="applet-full/src/main/java"
7575
aid="D276000085"
76-
version="0.0">
76+
version="1.0">
7777
<applet aid="D2760000850101"
7878
class="org.openjavacard.ndef.full.NdefApplet"/>
7979
</cap>
@@ -87,7 +87,7 @@
8787
classes="build/classes/tiny"
8888
sources="applet-tiny/src/main/java"
8989
aid="D276000085"
90-
version="0.0">
90+
version="1.0">
9191
<applet aid="D2760000850101"
9292
class="org.openjavacard.ndef.tiny.NdefApplet"/>
9393
</cap>
@@ -101,7 +101,7 @@
101101
classes="build/classes/stub"
102102
sources="applet-stub/src/main/java"
103103
aid="D276000085"
104-
version="0.0">
104+
version="1.0">
105105
<applet aid="D2760000850101"
106106
class="org.openjavacard.ndef.stub.NdefApplet"/>
107107
</cap>

‎scripts/compile/res/version.py‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env python3
22

3-
import argparse, os
3+
import argparse, os, re
44

5-
if __name__ == "__main__":
5+
if __name__ == '__main__':
66
# Parse CLI arguments
77
parser = argparse.ArgumentParser(description = 'FlexSecure-Applets version patching tool')
88
parser.add_argument('-s', '--source', nargs='?', dest='source', type=str,
@@ -13,14 +13,33 @@
1313
const='255.255.255', default='255.255.255', help='Build version to encode')
1414
args = parser.parse_args()
1515

16-
version = args.version.strip("v")
16+
version = args.version.strip('v')
1717

18-
print("Patching file " + args.patch + " using the applet version from " + args.source + " and the additional build version " + version)
18+
print('Patching file ' + args.patch + ' using the applet version from ' + args.source + ' and the additional build version ' + version)
1919

2020
if(not os.path.isfile(args.source)):
21-
print("error: source file " + args.source + "does not exist")
21+
print('error: source file ' + args.source + 'does not exist')
2222
exit(1)
23+
24+
# Parse version source file
25+
_, ext = os.path.splitext(args.source)
26+
with open(args.source, 'r') as f:
27+
config = f.read()
28+
if(ext == '.xml'):
29+
# Ant XML file
30+
matches = re.findall("cap.*version[\s='\"]*([^\s'\"]*)", config, flags=re.DOTALL)
31+
elif(ext == '.gradle'):
32+
# Gradle config
33+
matches = re.findall("javacard {.*version[\s=']*([^\s']*)", config, flags=re.DOTALL)
34+
else:
35+
print('error: Unknown source file format: ' + ext)
36+
37+
if(len(matches) == 0):
38+
print("error: Cannot find version in config file")
39+
exit(1)
40+
appversion = matches[0]
41+
print("info: Found source version: " + appversion)
2342

2443
if(not os.path.isfile(args.patch)):
25-
print("error: patch file " + args.patch + "does not exist")
44+
print('error: patch file ' + args.patch + 'does not exist')
2645
exit(1)

0 commit comments

Comments
 (0)