Refactor script files for multi-applet projects

.vscode/tasks.json

@@ -4,27 +4,40 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "Flash hwb1",
+            "label": "Flash MyApplet",
             "type": "shell",
-            "command": "${workspaceFolder}/hwb1/scripts/flash.cmd",
+            "command": "${workspaceFolder}/scripts/flash.cmd",
+            "options": {
+                "env": {
+                    "PACKAGE": "hwb1",
+                    "APPLET": "MyApplet",
+                    "PARAMS": "31323334"
+                }
+            },
             "problemMatcher": []
         },
         {
             "label": "List Applets",
             "type": "shell",
-            "command": "${workspaceFolder}/hwb1/scripts/list.cmd",
+            "command": "${workspaceFolder}/scripts/list.cmd",
             "problemMatcher": []
         },
         {
-            "label": "Test hwb1 Applet",
+            "label": "Test MyApplet",
             "type": "shell",
-            "command": "${workspaceFolder}/hwb1/scripts/test.cmd",
+            "command": "${workspaceFolder}/scripts/test.cmd",
+            "options": {
+                "env": {
+                    "PACKAGE": "hwb1",
+                    "APPLET": "MyApplet"
+                }
+            },
             "problemMatcher": []
         },
         {
-            "label": "Delete hwb1 Applet",
+            "label": "Delete MyApplet",
             "type": "shell",
-            "command": "${workspaceFolder}/hwb1/scripts/delete.cmd",
+            "command": "${workspaceFolder}/scripts/delete.cmd",
             "problemMatcher": []
         }
     ]

hwb1/card/delete.cmd

@@ -1 +0,0 @@
-gp --delete 01020304050608

hwb1/card/e222.cmd

@@ -1,5 +0,0 @@
-@echo off
-set PACKAGE=hwb1
-set APPLET=MyApplet
-set "JAVA_HOME=%JAVA8_HOME%"
-set "path=%JAVA_HOME%\bin;%JC_HOME%\bin;%JC_HOME%\..;%JC_HOME%\..\GPShell-1.4.4;%path%"

hwb1/card/install.cmd

@@ -1,4 +0,0 @@
-SET PIN=31323334
-
-@rem -f to force install over old version
-gp --install %~dp0..\javacard\%PACKAGE%.cap --params %PIN% -f

hwb1/card/list.cmd

@@ -1 +0,0 @@
-gp --list

hwb1/card/test.cmd

@@ -1 +0,0 @@
-gpshell %~dp0test.txt

hwb1/scripts/delete.cmd

@@ -1,3 +0,0 @@
-SET CARD_ROOT=%~dp0..\card
-call %CARD_ROOT%\e222.cmd
-call %CARD_ROOT%\delete.cmd

hwb1/scripts/flash.cmd

@@ -1,5 +0,0 @@
-@echo off
-SET CARD_ROOT=%~dp0..\card
-call %CARD_ROOT%\e222.cmd
-call %CARD_ROOT%\c222.cmd
-call %CARD_ROOT%\install.cmd

hwb1/scripts/list.cmd

@@ -1,4 +0,0 @@
-@echo off
-SET CARD_ROOT=%~dp0..\card
-call %CARD_ROOT%\e222.cmd
-call %CARD_ROOT%\list.cmd

hwb1/scripts/test.cmd

@@ -1,4 +0,0 @@
-@echo off
-SET CARD_ROOT=%~dp0..\card
-call %CARD_ROOT%\e222.cmd
-call %CARD_ROOT%\test.cmd

scripts/compile.cmd

@@ -1,3 +1,4 @@
-@rem compile applet with JcDK 2.2.2
+:: compile applet with JcDK 2.2.2
-javac -g -target 1.1 -source 1.2 -cp %JC_HOME%\lib\api.jar -d . %~dp0../src/%PACKAGE%/*.java
+CALL %~dp0setup.cmd
+javac -g -target 1.1 -source 1.2 -cp %JC_HOME%\lib\api.jar -d . %~dp0../%PACKAGE%/src/%PACKAGE%/*.java
 converter -exportpath "%JC_HOME%\api_export_files" -applet 0x01:0x02:0x03:0x04:0x5:0x6:0x8:0x9 %PACKAGE%.%APPLET% %PACKAGE% 0x01:0x02:0x03:0x04:0x5:0x6:0x8 1.0

scripts/delete.cmd

@@ -0,0 +1,2 @@
+CALL %~dp0setup.cmd
+gp --delete %ID%

scripts/flash.cmd

@@ -0,0 +1,5 @@
+CALL %~dp0setup.cmd
+CALL %~dp0compile.cmd
+
+:: "-f" forces overwriting old versions of the package
+gp --install %~dp0..\%PACKAGE%\javacard\%PACKAGE%.cap --params %PARAMS% -f

scripts/list.cmd

@@ -0,0 +1,2 @@
+CALL %~dp0setup.cmd
+gp --list

scripts/setup.cmd

@@ -0,0 +1,16 @@
+:: Common Environment Variables
+@echo off
+:: To be defined externally
+SET "PACKAGE=%PACKAGE%"
+SET "APPLET=%APPLET%"
+SET "PARAMS=%PARAMS%"
+SET "JAVA8_HOME=%JAVA8_HOME%"
+SET "JC_HOME=%JC_HOME%"
+
+SET HEXID=0x01:0x02:0x03:0x04:0x5:0x6:0x8:0x9
+SET ID=%HEXID:0x0=0%
+SET ID=%ID:0x=0%
+SET ID=%ID::=%
+
+SET "JAVA_HOME=%JAVA8_HOME%"
+SET "PATH=%JAVA_HOME%\bin;%JC_HOME%\bin;%JC_HOME%\..;%JC_HOME%\..\GPShell-1.4.4;%PATH%"

scripts/test.cmd

@@ -0,0 +1,2 @@
+CALL %~dp0setup.cmd
+gpshell %~dp0..\%PACKAGE%\tests\%APPLET%.txt