Merge branch 'devel'

6 files changed, 19 insertions, 14 deletions

diff --git a/nbproject/dist-build.xml b/nbproject/dist-build.xml
index b980e2d..b1bfadf 100644
--- a/nbproject/dist-build.xml
+++ b/nbproject/dist-build.xml
@@ -10,22 +10,27 @@
         <tempfile property="temp.file" destDir="${java.io.tmpdir}" suffix=".jar"/>
         <tempfile property="temp.previous_jar" destdir="${java.io.tmpdir}" suffix=".jar"/>
 
+        <exec executable="git" outputproperty="git.commit" failifexecutionfails="false">
+            <arg line="rev-parse --short HEAD"/>
+        </exec>
+
         <copy file="${store.jar}" tofile="${temp.previous_jar}" failonerror="false"/>
         <echo message="Backed up ${store.jar} into ${temp.previous_jar}"/>
 
         <delete file="${store.jar}" failonerror="false"/>
-        <jar destfile="${temp.file}" filesetmanifest="skip">
+        <jar destfile="${temp.file}" filesetmanifest="skip" compress="true" level="8">
             <zipgroupfileset dir="dist" includes="*.jar"/>
             <zipgroupfileset dir="dist/lib" includes="*.jar"/>
 
             <manifest>
                 <attribute name="Main-Class" value="${main.class}"/>
+                <attribute name="Git-Commit" value="${git.commit}"/>
             </manifest>
         </jar>
 
-        <zip destfile="${store.jar}">
+        <zip destfile="${store.jar}" compress="true" level="8">
             <zipfileset src="${temp.file}"
-                        excludes="META-INF/*.SF, META-INF/*.DSA, META-INF/*.RSA"/>
+                        excludes="META-INF/*.SF, META-INF/*.DSA, META-INF/*.RSA, ${dist.archive.excludes}"/>
         </zip>
 
         <delete file="${temp.file}"/>
diff --git a/nbproject/keystore b/nbproject/keystore
new file mode 100755
index 0000000..7c9c8e4
--- /dev/null
+++ b/nbproject/keystore
diff --git a/nbproject/reader/manifest.mf b/nbproject/reader/manifest.mf
index cbfea93..c2a00ee 100644
--- a/nbproject/reader/manifest.mf
+++ b/nbproject/reader/manifest.mf
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
-Class-Path: lib/jcardsim-3.0.4-SNAPSHOT.jar lib/commons-cli-1.3.1.jar lib/snakeyaml-1.19.jar
+Class-Path: lib/jcardsim-3.0.4-SNAPSHOT.jar lib/commons-cli-1.4.jar lib/snakeyaml-1.19.jar
 Main-Class: cz.crcs.ectester.reader.ECTesterReader
 
diff --git a/nbproject/reader/project.properties b/nbproject/reader/project.properties
index 69db523..8e11520 100644
--- a/nbproject/reader/project.properties
+++ b/nbproject/reader/project.properties
@@ -6,7 +6,7 @@ annotation.processing.source.output=${build.generated.sources.dir}/ap-source-out
 application.title=ECTesterReader
 application.vendor=xsvenda
 build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form,**/*.c,**/*.h,**/*.a,**/*.o,**/Makefile
+build.classes.excludes=**/*.java,**/*.form,**/*.c,**/*.cpp,**/*.hpp,**/*.h,**/*.a,**/*.o,**/Makefile
 # This directory is removed when the project is cleaned:
 build.dir=build
 build.generated.dir=${build.dir}/generated
@@ -31,14 +31,14 @@ libs.CopyLibs.classpath=nbproject/copylibstask.jar
 endorsed.classpath=
 excludes=
 includes=**/applet/**,**/common/**,**/data/**,**/reader/**
-jar.compress=false
+jar.compress=true
 javac.classpath=\
     lib/bcprov-jdk15on-1.58.jar:\
     lib/jcardsim-3.0.4-SNAPSHOT.jar:\
-    lib/commons-cli-1.3.1.jar:\
+    lib/commons-cli-1.4.jar:\
     lib/snakeyaml-1.19.jar
 # Space-separated list of extra javac options
-javac.compilerargs=
+javac.compilerargs=-Xlint:all
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
diff --git a/nbproject/standalone/manifest.mf b/nbproject/standalone/manifest.mf
index 02f1e3e..5e8f5d9 100644
--- a/nbproject/standalone/manifest.mf
+++ b/nbproject/standalone/manifest.mf
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
-Class-Path: lib/bcprov-jdk15on-1.58.jar lib/jcardsim-3.0.4-SNAPSHOT.jar lib/commons-cli-1.3.1.jar lib/snakeyaml-1.19.jar
+Class-Path: lib/bcprov-jdk15on-1.58.jar lib/jcardsim-3.0.4-SNAPSHOT.jar lib/commons-cli-1.4.jar lib/snakeyaml-1.19.jar
 Main-Class: cz.crcs.ectester.standalone.ECTesterStandalone
 
diff --git a/nbproject/standalone/project.properties b/nbproject/standalone/project.properties
index 9fed4c2..7ad08a1 100644
--- a/nbproject/standalone/project.properties
+++ b/nbproject/standalone/project.properties
@@ -6,7 +6,7 @@ annotation.processing.source.output=${build.generated.sources.dir}/ap-source-out
 application.title=ECTesterStandalone
 application.vendor=xsvenda
 build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form,**/*.c,**/*.h,**/*.a,**/*.o,**/Makefile
+build.classes.excludes=**/*.java,**/*.form,**/*.c,**/*.cpp,**/*.hpp,**/*.h,**/*.a,**/*.o,**/Makefile
 # This directory is removed when the project is cleaned:
 build.dir=build
 build.generated.dir=${build.dir}/generated
@@ -22,7 +22,7 @@ debug.classpath=\
 debug.test.classpath=\
     ${run.test.classpath}
 # Files in build.classes.dir which should be excluded from distribution jar
-dist.archive.excludes=
+dist.archive.excludes=**/*.java,**/*.form,**/*.c,**/*.cpp,**/*.hpp,**/*.h,**/*.a,**/*.o,**/Makefile
 # This directory is removed when the project is cleaned:
 dist.dir=dist
 dist.jar=${dist.dir}/ECTesterStandalone.jar
@@ -31,14 +31,14 @@ libs.CopyLibs.classpath=nbproject/copylibstask.jar
 endorsed.classpath=
 excludes=
 includes=**/common/**,**/standalone/**,**/data/**,**/applet/*
-jar.compress=false
+jar.compress=true
 javac.classpath=\
     lib/bcprov-jdk15on-1.58.jar:\
     lib/jcardsim-3.0.4-SNAPSHOT.jar:\
-    lib/commons-cli-1.3.1.jar:\
+    lib/commons-cli-1.4.jar:\
     lib/snakeyaml-1.19.jar
 # Space-separated list of extra javac options
-javac.compilerargs=
+javac.compilerargs=-Xlint:all
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}