Cleanup dist directory, make ant work on non-NetBeans platforms.

- Everything can be packaged with `ant package`.
crocs-muni · Nov 10, 2017 · 6c46a27 · 6c46a27
1 parent d2558f0
commit 6c46a27
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 83 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,14 @@
 
 Tests support and behavior of smartcards with JavaCard platform with focus on Eliptic curves (`TYPE_EC_FP` and `TYPE_EC_F2M`).
 
+## Build
+
+ECTester uses ant.
+```bash
+ant package               # To build the reader tool (jar).
+ant -f jcbuild.xml build  # To build the applet (cap).
+```
+
 ## Usage
 
 1. Upload `!uploader/ectester.cap` using your favorite tool (e.g., [GlobalPlatformPro tool](https://github.com/martinpaljak/GlobalPlatform))

diff --git a/dist/ECTester.jar b/dist/ECTester.jar
diff --git a/dist/ectester.bat b/dist/ectester.bat
diff --git a/dist/ectester.sh b/dist/ectester.sh
diff --git a/dist/lib/commons-cli-1.3.1.jar b/dist/lib/commons-cli-1.3.1.jar
diff --git a/dist/lib/jcardsim-2.2.2-all.jar b/dist/lib/jcardsim-2.2.2-all.jar
diff --git a/dist/lib/jcardsim-3.0.4-SNAPSHOT.jar b/dist/lib/jcardsim-3.0.4-SNAPSHOT.jar
diff --git a/dist/lib/snakeyaml-1.19.jar b/dist/lib/snakeyaml-1.19.jar
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
@@ -834,7 +834,7 @@ is divided into following sections:
                     </chainedmapper>
                 </pathconvert>
                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
                     <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
                     <manifest>
                         <attribute name="Class-Path" value="${jar.classpath}"/>

diff --git a/nbproject/copylibstask.jar b/nbproject/copylibstask.jar
diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -27,6 +27,7 @@ dist.archive.excludes=
 dist.dir=dist
 dist.jar=${dist.dir}/ECTester.jar
 dist.javadoc.dir=${dist.dir}/javadoc
+libs.CopyLibs.classpath=nbproject/copylibstask.jar
 endorsed.classpath=
 excludes=
 includes=**