andreacavalli
/
WarpPI
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated pom.xml

This commit is contained in:
Andrea Cavalli 2018-07-23 02:16:35 +02:00
parent e0cff2f468
commit e951b5e352
3 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
pom.xml
View File

@ -41,48 +41,6 @@
</pluginRepository>
</pluginRepositories>
<profiles>
<profile>
<id>aarch64</id>
<properties>
<src.useAarch64Libraries>true</src.useAarch64Libraries>
</properties>
<activation>
<os>
<family>Linux</family>
<arch>aarch64</arch>
</os>
</activation>
<dependencies>
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all-main</artifactId>
<version>2.4</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/jogl 2.4/jogl-all.jar</systemPath>
</dependency>
<dependency>
<groupId>org.jogamp.jogl</groupId>
<artifactId>jogl-all-natives-linux-aarch64-main</artifactId>
<version>2.4</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/jogl 2.4/jogl-all-natives-linux-aarch64.jar</systemPath>
</dependency>
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt-main</artifactId>
<version>2.4</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/jogl 2.4/gluegen-rt.jar</systemPath>
</dependency>
<dependency>
<groupId>org.jogamp.gluegen</groupId>
<artifactId>gluegen-rt-natives-linux-aarch64-main</artifactId>
<version>2.4</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/jogl 2.4/gluegen-rt-natives-linux-aarch64.jar</systemPath>
</dependency>
</dependencies>
</profile>
<profile>
<id>jarprofile</id>
<properties>
@ -114,6 +72,19 @@
<version>4.6.1</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>jarprofile-aarch64</id>
<properties>
<src.useAarch64Libraries>true</src.useAarch64Libraries>
</properties>
<activation>
<!--<os>
<family>Linux</family>
<arch>aarch64</arch>
</os>-->
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<!-- Set a compiler level -->
@ -123,7 +94,7 @@
<version>2.3.2</version>
<configuration>
<excludes>
<exclude>org/warp/picalculator/gui/graphicengine/html/*</exclude>
<exclude>org/warp/picalculator/gui/graphicengine/gpu/*</exclude>
</excludes>
<source>1.8</source>
<target>1.8</target>
@ -152,6 +123,21 @@
<version>2.3.2</version>
</dependency>
</dependencies>
<build>
<plugins>
<!-- Set a compiler level -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>jsprofile</id>

7
src/jar-specific/java/org/warp/picalculator/deps/DEngine.java
View File

@ -1,13 +1,18 @@
package org.warp.picalculator.deps;
import org.warp.picalculator.ClassUtils;
import org.warp.picalculator.StaticVars;
import org.warp.picalculator.gui.graphicengine.GraphicEngine;
import org.warp.picalculator.gui.graphicengine.cpu.CPUEngine;
import org.warp.picalculator.gui.graphicengine.framebuffer.FBEngine;
public class DEngine {
public static GraphicEngine newGPUEngine() {
return new org.warp.picalculator.gui.graphicengine.gpu.GPUEngine();
try {
return (GraphicEngine) ClassUtils.newClassInstance("org.warp.picalculator.gui.graphicengine.gpu.GPUEngine");
} catch (NullPointerException ex) {
return null;
}
}
public static GraphicEngine newHeadless24bitEngine() {
return new org.warp.picalculator.gui.graphicengine.headless24bit.Headless24bitEngine();

5
src/jar-specific/java/org/warp/picalculator/deps/StorageUtils.java
View File

@ -25,11 +25,10 @@ import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.io.IOUtils;
import org.warp.picalculator.ClassUtils;
import org.warp.picalculator.Main;
import com.jogamp.common.util.IOUtil;
public class StorageUtils {
public static final boolean exists(Path f) {
return Files.exists(f);
@ -77,7 +76,7 @@ public class StorageUtils {
tempFile.deleteOnExit();
try (FileOutputStream out = new FileOutputStream(tempFile))
{
IOUtil.copyStream2Stream(is, out, (int) tempFile.length());
IOUtils.copy(is, out, (int) tempFile.length());
}
resourcesCache.put(string, tempFile);