From a7f8b09f38294c89d40c993f106b8b610681f99c Mon Sep 17 00:00:00 2001 From: "marc.obrador@gi-de.com" Date: Thu, 28 Nov 2013 18:43:36 +0000 Subject: [PATCH] ServiceLayerTester/JavaCardApplets/*.sh were windows-formatted and giving problems when running on Linux. Fix it. --- .../AuthenticationApplet/compile.sh | 18 +++++++-------- .../AuthenticationApplet/convert.sh | 22 +++++++++---------- .../FileManagementApplet/compile.sh | 18 +++++++-------- .../FileManagementApplet/convert.sh | 22 +++++++++---------- .../SecureStorageApplet/compile.sh | 18 +++++++-------- .../SecureStorageApplet/convert.sh | 22 +++++++++---------- 6 files changed, 60 insertions(+), 60 deletions(-) diff --git a/samples/ServiceLayerTester/JavaCardApplets/AuthenticationApplet/compile.sh b/samples/ServiceLayerTester/JavaCardApplets/AuthenticationApplet/compile.sh index 753818e..bfbebf8 100644 --- a/samples/ServiceLayerTester/JavaCardApplets/AuthenticationApplet/compile.sh +++ b/samples/ServiceLayerTester/JavaCardApplets/AuthenticationApplet/compile.sh @@ -1,9 +1,9 @@ -#!/bin/sh - -export JAVA_HOME=$PWD/jdk -export JC_HOME=$PWD/java_card_kit-2_2_1 -export JAVA_SOURCE_ROOT=$PWD/src -export PATH=$PATH:$JC_HOME/bin - -#following call to javac must be on one line -$JAVA_HOME/bin/javac -g -source 1.3 -target 1.1 -classpath $JC_HOME/lib/api.jar $JAVA_SOURCE_ROOT/com/gieseckedevrient/javacard/authenticationtester/*.java +#!/bin/sh + +export JAVA_HOME=$PWD/jdk +export JC_HOME=$PWD/java_card_kit-2_2_1 +export JAVA_SOURCE_ROOT=$PWD/src +export PATH=$PATH:$JC_HOME/bin + +#following call to javac must be on one line +$JAVA_HOME/bin/javac -g -source 1.3 -target 1.1 -classpath $JC_HOME/lib/api.jar $JAVA_SOURCE_ROOT/com/gieseckedevrient/javacard/authenticationtester/*.java diff --git a/samples/ServiceLayerTester/JavaCardApplets/AuthenticationApplet/convert.sh b/samples/ServiceLayerTester/JavaCardApplets/AuthenticationApplet/convert.sh index ab6161a..2e48014 100644 --- a/samples/ServiceLayerTester/JavaCardApplets/AuthenticationApplet/convert.sh +++ b/samples/ServiceLayerTester/JavaCardApplets/AuthenticationApplet/convert.sh @@ -1,11 +1,11 @@ -#!/bin/sh - -export JAVA_HOME=$PWD/jdk -export JC_HOME=$PWD/java_card_kit-2_2_1 -export JAVA_SOURCE_ROOT=$PWD/src -export PATH=$PATH:$JC_HOME/bin - -#following to converter must be on one line -$JAVA_HOME/bin/java -classpath $JC_HOME/lib/converter.jar:$JC_HOME/lib/api.jar com.sun.javacard.converter.Converter -noverify -i -classdir ./src -out CAP -exportpath $JC_HOME/api_export_files -applet 0xD2:0x76:0x00:0x01:0x18:0x00:0x03:0xFF:0x34:0x00:0x7E:0x89:0xAA:0x00:0x80:0x09 com.gieseckedevrient.javacard.authenticationtester.AuthenticationServiceApplet com.gieseckedevrient.javacard.authenticationtester 0xD2:0x76:0x00:0x01:0x18:0x00:0x03:0xFF:0x34:0x00:0x7E:0x89:0xAA:0x00:0x80:0x00 1.0 - -cp $JAVA_SOURCE_ROOT/com/gieseckedevrient/javacard/authenticationtester/javacard/authenticationtester.cap . +#!/bin/sh + +export JAVA_HOME=$PWD/jdk +export JC_HOME=$PWD/java_card_kit-2_2_1 +export JAVA_SOURCE_ROOT=$PWD/src +export PATH=$PATH:$JC_HOME/bin + +#following to converter must be on one line +$JAVA_HOME/bin/java -classpath $JC_HOME/lib/converter.jar:$JC_HOME/lib/api.jar com.sun.javacard.converter.Converter -noverify -i -classdir ./src -out CAP -exportpath $JC_HOME/api_export_files -applet 0xD2:0x76:0x00:0x01:0x18:0x00:0x03:0xFF:0x34:0x00:0x7E:0x89:0xAA:0x00:0x80:0x09 com.gieseckedevrient.javacard.authenticationtester.AuthenticationServiceApplet com.gieseckedevrient.javacard.authenticationtester 0xD2:0x76:0x00:0x01:0x18:0x00:0x03:0xFF:0x34:0x00:0x7E:0x89:0xAA:0x00:0x80:0x00 1.0 + +cp $JAVA_SOURCE_ROOT/com/gieseckedevrient/javacard/authenticationtester/javacard/authenticationtester.cap . diff --git a/samples/ServiceLayerTester/JavaCardApplets/FileManagementApplet/compile.sh b/samples/ServiceLayerTester/JavaCardApplets/FileManagementApplet/compile.sh index 941b5eb..f072527 100644 --- a/samples/ServiceLayerTester/JavaCardApplets/FileManagementApplet/compile.sh +++ b/samples/ServiceLayerTester/JavaCardApplets/FileManagementApplet/compile.sh @@ -1,9 +1,9 @@ -#!/bin/sh - -export JAVA_HOME=$PWD/jdk -export JC_HOME=$PWD/java_card_kit-2_2_1 -export JAVA_SOURCE_ROOT=$PWD/src -export PATH=$PATH:$JC_HOME/bin - -#following call to javac must be on one line -$JAVA_HOME/bin/javac -g -source 1.3 -target 1.1 -classpath $JC_HOME/lib/api.jar $JAVA_SOURCE_ROOT/com/gieseckedevrient/javacard/fileviewtest/*.java +#!/bin/sh + +export JAVA_HOME=$PWD/jdk +export JC_HOME=$PWD/java_card_kit-2_2_1 +export JAVA_SOURCE_ROOT=$PWD/src +export PATH=$PATH:$JC_HOME/bin + +#following call to javac must be on one line +$JAVA_HOME/bin/javac -g -source 1.3 -target 1.1 -classpath $JC_HOME/lib/api.jar $JAVA_SOURCE_ROOT/com/gieseckedevrient/javacard/fileviewtest/*.java diff --git a/samples/ServiceLayerTester/JavaCardApplets/FileManagementApplet/convert.sh b/samples/ServiceLayerTester/JavaCardApplets/FileManagementApplet/convert.sh index 2b1bf80..c6d42a5 100644 --- a/samples/ServiceLayerTester/JavaCardApplets/FileManagementApplet/convert.sh +++ b/samples/ServiceLayerTester/JavaCardApplets/FileManagementApplet/convert.sh @@ -1,11 +1,11 @@ -#!/bin/sh - -export JAVA_HOME=$PWD/jdk -export JC_HOME=$PWD/java_card_kit-2_2_1 -export JAVA_SOURCE_ROOT=$PWD/src -export PATH=$PATH:$JC_HOME/bin - -#following to converter must be on one line -$JAVA_HOME/bin/java -classpath $JC_HOME/lib/converter.jar:$JC_HOME/lib/api.jar com.sun.javacard.converter.Converter -noverify -i -classdir ./src -out CAP -exportpath $JC_HOME/api_export_files -applet 0xD2:0x76:0x00:0x01:0x18:0x00:0x02:0xFF:0x34:0x00:0x75:0x89:0xAA:0x00:0x76:0x19 com.gieseckedevrient.javacard.fileviewtest.FileViewApplet com.gieseckedevrient.javacard.fileviewtest 0xD2:0x76:0x00:0x01:0x18:0x00:0x02:0xFF:0x34:0x00:0x75:0x89:0xAA:0x00:0x76:0x10 1.0 - -cp $JAVA_SOURCE_ROOT/com/gieseckedevrient/javacard/fileviewtest/javacard/fileviewtest.cap . +#!/bin/sh + +export JAVA_HOME=$PWD/jdk +export JC_HOME=$PWD/java_card_kit-2_2_1 +export JAVA_SOURCE_ROOT=$PWD/src +export PATH=$PATH:$JC_HOME/bin + +#following to converter must be on one line +$JAVA_HOME/bin/java -classpath $JC_HOME/lib/converter.jar:$JC_HOME/lib/api.jar com.sun.javacard.converter.Converter -noverify -i -classdir ./src -out CAP -exportpath $JC_HOME/api_export_files -applet 0xD2:0x76:0x00:0x01:0x18:0x00:0x02:0xFF:0x34:0x00:0x75:0x89:0xAA:0x00:0x76:0x19 com.gieseckedevrient.javacard.fileviewtest.FileViewApplet com.gieseckedevrient.javacard.fileviewtest 0xD2:0x76:0x00:0x01:0x18:0x00:0x02:0xFF:0x34:0x00:0x75:0x89:0xAA:0x00:0x76:0x10 1.0 + +cp $JAVA_SOURCE_ROOT/com/gieseckedevrient/javacard/fileviewtest/javacard/fileviewtest.cap . diff --git a/samples/ServiceLayerTester/JavaCardApplets/SecureStorageApplet/compile.sh b/samples/ServiceLayerTester/JavaCardApplets/SecureStorageApplet/compile.sh index 619ef51..a8d9c89 100644 --- a/samples/ServiceLayerTester/JavaCardApplets/SecureStorageApplet/compile.sh +++ b/samples/ServiceLayerTester/JavaCardApplets/SecureStorageApplet/compile.sh @@ -1,9 +1,9 @@ -#!/bin/sh - -export JAVA_HOME=$PWD/jdk -export JC_HOME=$PWD/java_card_kit-2_2_1 -export JAVA_SOURCE_ROOT=$PWD/src -export PATH=$PATH:$JC_HOME/bin - -#following call to javac must be on one line -$JAVA_HOME/bin/javac -g -source 1.3 -target 1.1 -classpath $JC_HOME/lib/api.jar $JAVA_SOURCE_ROOT/com/gieseckedevrient/javacard/securestoragetester/*.java +#!/bin/sh + +export JAVA_HOME=$PWD/jdk +export JC_HOME=$PWD/java_card_kit-2_2_1 +export JAVA_SOURCE_ROOT=$PWD/src +export PATH=$PATH:$JC_HOME/bin + +#following call to javac must be on one line +$JAVA_HOME/bin/javac -g -source 1.3 -target 1.1 -classpath $JC_HOME/lib/api.jar $JAVA_SOURCE_ROOT/com/gieseckedevrient/javacard/securestoragetester/*.java diff --git a/samples/ServiceLayerTester/JavaCardApplets/SecureStorageApplet/convert.sh b/samples/ServiceLayerTester/JavaCardApplets/SecureStorageApplet/convert.sh index fa0cba2..15e0321 100644 --- a/samples/ServiceLayerTester/JavaCardApplets/SecureStorageApplet/convert.sh +++ b/samples/ServiceLayerTester/JavaCardApplets/SecureStorageApplet/convert.sh @@ -1,11 +1,11 @@ -#!/bin/sh - -export JAVA_HOME=$PWD/jdk -export JC_HOME=$PWD/java_card_kit-2_2_1 -export JAVA_SOURCE_ROOT=$PWD/src -export PATH=$PATH:$JC_HOME/bin - -#following to converter must be on one line -$JAVA_HOME/bin/java -classpath $JC_HOME/lib/converter.jar:$JC_HOME/lib/api.jar com.sun.javacard.converter.Converter -noverify -i -classdir ./src -out CAP -exportpath $JC_HOME/api_export_files -applet 0xD2:0x76:0x00:0x01:0x18:0x00:0x03:0xFF:0x34:0x00:0x7E:0x89:0xAA:0x00:0x7F:0x09 com.gieseckedevrient.javacard.securestoragetester.SecureStorageApplet com.gieseckedevrient.javacard.securestoragetester 0xD2:0x76:0x00:0x01:0x18:0x00:0x03:0xFF:0x34:0x00:0x7E:0x89:0xAA:0x00:0x7F:0x00 1.0 - -cp $JAVA_SOURCE_ROOT/com/gieseckedevrient/javacard/securestoragetester/javacard/securestoragetester.cap . +#!/bin/sh + +export JAVA_HOME=$PWD/jdk +export JC_HOME=$PWD/java_card_kit-2_2_1 +export JAVA_SOURCE_ROOT=$PWD/src +export PATH=$PATH:$JC_HOME/bin + +#following to converter must be on one line +$JAVA_HOME/bin/java -classpath $JC_HOME/lib/converter.jar:$JC_HOME/lib/api.jar com.sun.javacard.converter.Converter -noverify -i -classdir ./src -out CAP -exportpath $JC_HOME/api_export_files -applet 0xD2:0x76:0x00:0x01:0x18:0x00:0x03:0xFF:0x34:0x00:0x7E:0x89:0xAA:0x00:0x7F:0x09 com.gieseckedevrient.javacard.securestoragetester.SecureStorageApplet com.gieseckedevrient.javacard.securestoragetester 0xD2:0x76:0x00:0x01:0x18:0x00:0x03:0xFF:0x34:0x00:0x7E:0x89:0xAA:0x00:0x7F:0x00 1.0 + +cp $JAVA_SOURCE_ROOT/com/gieseckedevrient/javacard/securestoragetester/javacard/securestoragetester.cap .