Skip to content

Commit

Permalink
jAER: update JARs. commons-lang to 3.4, commons-math to 3.5, jblas to…
Browse files Browse the repository at this point in the history
… 1.2.4, javacv to 0.11. Update libs.txt file.

git-svn-id: https://svn.code.sf.net/p/jaer/code/jAER/trunk@6755 b7f4320f-462c-0410-a916-d9f35bb82d52
  • Loading branch information
llongi committed May 22, 2015
1 parent b8c3db0 commit 70e6359
Show file tree
Hide file tree
Showing 18 changed files with 16 additions and 13 deletions.
5 changes: 3 additions & 2 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="subprojects/JSpikeStack/src"/>
<classpathentry kind="lib" path="jars/javacv/javacpp.jar"/>
<classpathentry kind="lib" path="jars/javacv/javacv.jar"/>
<classpathentry kind="lib" path="jars/swing-layout-1.0.4.jar"/>
<classpathentry kind="lib" path="jars/UsbIoJava.jar"/>
<classpathentry kind="lib" path="jars/commons-net-3.3.jar">
Expand Down Expand Up @@ -38,7 +39,7 @@
<classpathentry kind="lib" path="jars/comm.jar"/>
<classpathentry kind="lib" path="jars/betterbeansbinding-1.3.0-all.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="lib" path="jars/jblas-1.2.3.jar"/>
<classpathentry kind="lib" path="jars/jblas-1.2.4.jar"/>
<classpathentry kind="lib" path="jars/JEvtLearn.jar"/>
<classpathentry kind="lib" path="jars/uncommons-maths-1.2.3.jar"/>
<classpathentry kind="lib" path="jars/USBTransferThread-0.9.6.jar"/>
Expand All @@ -50,7 +51,7 @@
<classpathentry kind="lib" path="jars/usb4java/libusb4java-1.2.0-windows-x86_64.jar"/>
<classpathentry kind="lib" path="jars/usb4java/libusb4java-1.2.0-windows-x86.jar"/>
<classpathentry kind="lib" path="jars/usb4java/usb4java-1.2.0.jar"/>
<classpathentry kind="lib" path="jars/commons-lang3-3.3.2.jar"/>
<classpathentry kind="lib" path="jars/commons-lang3-3.4.jar"/>
<classpathentry kind="lib" path="jars/nrjavaserial-3.9.3.jar"/>
<classpathentry kind="lib" path="jars/javacv/opencv-linux-x86_64.jar"/>
<classpathentry kind="lib" path="jars/javacv/opencv-linux-x86.jar"/>
Expand Down
Binary file removed jars/commons-lang3-3.3.2.jar
Binary file not shown.
Binary file added jars/commons-lang3-3.4.jar
Binary file not shown.
Binary file removed jars/commons-math3-3.4.1-javadoc.jar
Binary file not shown.
Binary file removed jars/commons-math3-3.4.1-src.zip
Binary file not shown.
Binary file not shown.
Binary file modified jars/javacv/javacpp.jar
Binary file not shown.
Binary file added jars/javacv/javacv.jar
Binary file not shown.
Binary file modified jars/javacv/opencv-linux-x86.jar
Binary file not shown.
Binary file modified jars/javacv/opencv-linux-x86_64.jar
Binary file not shown.
Binary file modified jars/javacv/opencv-macosx-x86_64.jar
Binary file not shown.
Binary file modified jars/javacv/opencv-windows-x86.jar
Binary file not shown.
Binary file modified jars/javacv/opencv-windows-x86_64.jar
Binary file not shown.
Binary file modified jars/javacv/opencv.jar
Binary file not shown.
Binary file removed jars/jblas-1.2.3.jar
Binary file not shown.
Binary file added jars/jblas-1.2.4.jar
Binary file not shown.
10 changes: 7 additions & 3 deletions jars/libs.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
ant - ??? - NetBeans IDE
betterbeansbindings - 1.3.0 - https://kenai.com/projects/betterbeansbinding/
commons-lang3 - 3.3.2 - http://commons.apache.org/proper/commons-lang/
commons-lang3 - 3.4 - https://commons.apache.org/proper/commons-lang/
commons-math3 - 3.5 - http://commons.apache.org/proper/commons-math/
commons-net - 3.3 - http://commons.apache.org/proper/commons-net/
JavaCV - 0.7 - https://github.com/bytedeco/
JavaCV - 0.11 - https://github.com/bytedeco/
javax.comm (comm) - ??? - http://www.oracle.com/technetwork/java/index-jsp-141752.html
javax.mail - 1.5.0 - https://java.net/projects/javamail/
jblas - 1.2.4 - http://jblas.org/
JEvtLearn - ??? - ???
jlfgr (Java Look&Feel Graphics Repository) - 1.0 - http://www.oracle.com/technetwork/java/index-138612.html
JOGL - 2.2.4 - https://jogamp.org/jogl/
JOGL - 2.3.1 - https://jogamp.org/jogl/
nrjavaserial - 3.9.3 - https://github.com/NeuronRobotics/nrjavaserial/
phidget21 - 2.1.8.20130618 - http://www.phidgets.com/docs/Language_-_Java
svgSalamander-tiny - downloaded on 2013-07-13 - https://svgsalamander.java.net/
swing-layout - 1.0.4 - NetBeans IDE
uncommons-maths - 1.2.3 - http://maths.uncommons.org/
usb4java - 1.2.0 - https://github.com/usb4java/usb4java/
UsbIoJava - ??? - http://www.thesycon.de/eng/usbio.shtml
USBTransferThread - 0.9.6 - https://github.com/llongi/USBTransferThread/
14 changes: 6 additions & 8 deletions nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ file.reference.=../../../../../..
file.reference.ant.jar=jars/ant.jar
file.reference.betterbeansbinding-1.3.0-all.jar=jars/betterbeansbinding-1.3.0-all.jar
file.reference.comm.jar=jars/comm.jar
file.reference.commons-lang3-3.3.2.jar=jars/commons-lang3-3.3.2.jar
file.reference.commons-math3-3.4.1.jar=jars/commons-math3-3.4.1.jar
file.reference.commons-lang3-3.4.jar=jars/commons-lang3-3.4.jar
file.reference.commons-math3-3.5.jar=jars/commons-math3-3.5.jar
file.reference.commons-net-3.3.jar=jars/commons-net-3.3.jar
file.reference.gluegen-rt.jar=jars/jogl/gluegen-rt.jar
file.reference.javacpp.jar=jars/javacv/javacpp.jar
file.reference.javax.mail-1.5.0.jar=jars/javax.mail-1.5.0.jar
file.reference.jblas-1.2.3.jar=jars/jblas-1.2.3.jar
file.reference.jblas-1.2.4.jar=jars/jblas-1.2.4.jar
file.reference.JEvtLearn.jar=jars/JEvtLearn.jar
file.reference.jlfgr-1.0.jar=jars/jlfgr-1.0.jar
file.reference.jogl-1_0_0-windows-i586.zip=jars/jogl-1_0_0-windows-i586.zip
Expand Down Expand Up @@ -78,13 +78,13 @@ javac.classpath=\
${file.reference.ant.jar}:\
${file.reference.betterbeansbinding-1.3.0-all.jar}:\
${file.reference.comm.jar}:\
${file.reference.commons-lang3-3.3.2.jar}:\
${file.reference.commons-math3-3.4.1.jar}:\
${file.reference.commons-lang3-3.4.jar}:\
${file.reference.commons-math3-3.5.jar}:\
${file.reference.commons-net-3.3.jar}:\
${file.reference.gluegen-rt.jar}:\
${file.reference.javacpp.jar}:\
${file.reference.javax.mail-1.5.0.jar}:\
${file.reference.jblas-1.2.3.jar}:\
${file.reference.jblas-1.2.4.jar}:\
${file.reference.jlfgr-1.0.jar}:\
${file.reference.jogl-all.jar}:\
${file.reference.libusb4java-1.2.0-linux-arm.jar}:\
Expand Down Expand Up @@ -121,7 +121,6 @@ javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
javadoc.reference.jblas-1.2.3.jar=jars/jblas-javadoc-1.2.0.zip!/jblas-javadoc-1.2.0/
javadoc.reference.jogl-all.jar=http://jogamp.org/deployment/jogamp-next/javadoc/jogl/javadoc/
javadoc.splitindex=true
javadoc.use=true
Expand Down Expand Up @@ -163,7 +162,6 @@ run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
source.encoding=UTF-8
source.reference.jblas-1.2.3.jar=jars/mikiobraun-jblas-jblas-1.2.3-37-g4ee5b65.zip!/mikiobraun-jblas-4ee5b65/test/
src.dir=${file.reference.java-src}
test.src.dir=test

Expand Down

0 comments on commit 70e6359

Please sign in to comment.