Skip to content

Commit

Permalink
ivy.xml uses https: secure connection to maven central, as required now.
Browse files Browse the repository at this point in the history
jAERViewer_linux.sh properly sets the PATH and env variables for starting from different directories.
  • Loading branch information
Tobi Delbruck authored and Tobi Delbruck committed May 8, 2020
1 parent bdfa1f3 commit ae803ab
Show file tree
Hide file tree
Showing 8 changed files with 1,114 additions and 134 deletions.
8 changes: 4 additions & 4 deletions ivy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301 USA
-->
<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
<ivy-module version="2.0" xmlns:m="https://ant.apache.org/ivy/maven">
<info organisation="org.jaerproject" module="jaer" />

<dependencies>
Expand Down Expand Up @@ -64,7 +64,7 @@ MA 02110-1301 USA
<artifact name="jogl-all" type="jar" ext="jar" m:classifier="natives-windows-amd64"/>
</dependency>


<!-- <dependency org="javax.xml.bind" name="jaxb-api" rev="2.3.1" /> need for java 14.0-->
<dependency org="org.swinglabs" name="swing-layout" rev="1.0.3" />
<dependency org="org.jdesktop" name="beansbinding" rev="1.2.1" />

Expand Down Expand Up @@ -133,11 +133,11 @@ MA 02110-1301 USA
<!--tensorflow has native libraries, but handled fine with this dependeny - see https://www.tensorflow.org/install/lang_java -->
<!--if having trouble loading the DLL, you might have to downgrade locally to version 1.5.0-->
<!--make sure to delete newer versions of libtensorflow* and tensorflow* from lib/-->
<dependency org="org.tensorflow" name="tensorflow" rev="1.12.0" />
<dependency org="org.tensorflow" name="tensorflow" rev="1.14.0" />

<!--to use GPU if you have an Nvida GPU installed, comment line above and use lines below with appropriate version of tensor flow.
You have to separately install Cuda toolkit for this to work - see https://developer.nvidia.com/cuda-toolkit -->
<!-- <dependency org="org.tensorflow" name="libtensorflow_jni_gpu" rev="1.12.0" />-->
<dependency org="org.tensorflow" name="libtensorflow_jni_gpu" rev="1.14.0" />
<!--<dependency org="org.tensorflow" name="libtensorflow" rev="1.12.0" />-->


Expand Down
2 changes: 1 addition & 1 deletion jAERViewer_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
java \
-classpath "$DIR/dist/jAER.jar:$DIR/jars/*:$DIR/lib/*" \
-splash:images/SplashScreen.gif \
-Dsun.java2d.uiScale=2.5 \
-Dsun.java2d.uiScale=2.0 \
-Djava.util.logging.config.file="$DIR/conf/Logging.properties" -Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false \
net.sf.jaer.JAERViewer "$@"
7 changes: 7 additions & 0 deletions jAERViewer_linux.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/jAERViewer_linux.sh">
<comment>jAER data file</comment>
<glob pattern="*.aedat"/>
</mime-type>
</mime-info>
1 change: 1 addition & 0 deletions nbproject/build-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ is divided into following sections:
-->
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="jAER_1.6-impl">
<import file="jnlp-impl.xml"/>
<import file="build-native.xml"/>
<fail message="Please build using Ant 1.8.0 or higher.">
<condition>
<not>
Expand Down
970 changes: 970 additions & 0 deletions nbproject/build-native.xml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions nbproject/genfiles.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=e3657c9d
nbproject/build-impl.xml.script.CRC32=5c04f767
nbproject/build-impl.xml.data.CRC32=76fdb190
nbproject/build-impl.xml.script.CRC32=7cac21e4
nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
255 changes: 128 additions & 127 deletions nbproject/project.properties

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<extension file="jnlp-impl.xml" id="jws">
<dependency dependsOn="jnlp" target="jar"/>
</extension>
<extension file="build-native.xml" id="j2sedeploy"/>
</buildExtensions>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>jAER_1.6</name>
Expand Down

0 comments on commit ae803ab

Please sign in to comment.