diff --git a/pom.xml b/pom.xml index 52816445485687a76a0be46ec4a1a59aeb2a070d..efd99b56d43feb878c8fb8693dd7bb5dbc7b6082 100644 --- a/pom.xml +++ b/pom.xml @@ -87,11 +87,6 @@ <artifactId>jep</artifactId> <version>4.1.0</version> </dependency> - <dependency> - <groupId>org.rauschig</groupId> - <artifactId>jarchivelib</artifactId> - <version>0.5.0</version> - </dependency> </dependencies> <!-- Icy Maven repository (to find parent POM) --> diff --git a/src/main/java/org/bioimageanalysis/icy/jep/install/JepInstaller.java b/src/main/java/org/bioimageanalysis/icy/jep/install/JepInstaller.java index 619762a3c7d4223633d1a138ff1a795383fca1f8..0670eac80ae1f014f22d56defca44006422a2bb1 100644 --- a/src/main/java/org/bioimageanalysis/icy/jep/install/JepInstaller.java +++ b/src/main/java/org/bioimageanalysis/icy/jep/install/JepInstaller.java @@ -17,8 +17,6 @@ import java.util.function.Consumer; import org.bioimageanalysis.icy.jep.install.system.Log; import org.bioimageanalysis.icy.jep.install.system.PlatformDetection; import org.bioimageanalysis.icy.jep.utils.CommonUtils; -import org.rauschig.jarchivelib.Archiver; -import org.rauschig.jarchivelib.ArchiverFactory; import icy.preferences.PluginsPreferences; import icy.preferences.XMLPreferences; @@ -476,6 +474,8 @@ private static String VS_OLDER_DOWNLOADS = "https://visualstudio.microsoft.com/v displayMsg("JEP successfully installed!!"); } + /** + * TODO remove private void downloadAndUnzipJepSource() throws IOException { String jepUrl = CommonUtils.getJepSourceUrl(jepVersion); checkJepVersionExist(jepUrl); @@ -495,17 +495,17 @@ private static String VS_OLDER_DOWNLOADS = "https://visualstudio.microsoft.com/v displayMsg("Unzipping JEP source into: " + tmpJepSourceFolder.getAbsolutePath()); Archiver archiver = ArchiverFactory.createArchiver("tar", "gz"); archiver.extract(tmpJepSourceZip, tmpJepSourceFolder); - /* TODO - * TODO - * TODO - * if (!ZipUtil.extract(tmpJepSourceZip.getAbsolutePath(), - tmpJepSourceFolder.getAbsolutePath()) ) { - scheduleDeletionOfJepSource(); - deleteTmpFile(tmpJepSourceFolder); - throw new IOException("Could not unzip JEP source zip file: " + tmpJepSourceZip.getAbsolutePath()); - }*/ - scheduleDeletionOfJepSource(); - } + //TODO + //TODO + //TODO + //if (!ZipUtil.extract(tmpJepSourceZip.getAbsolutePath(), + // tmpJepSourceFolder.getAbsolutePath()) ) { + // scheduleDeletionOfJepSource(); + // deleteTmpFile(tmpJepSourceFolder); + // throw new IOException("Could not unzip JEP source zip file: " + tmpJepSourceZip.getAbsolutePath()); + //scheduleDeletionOfJepSource(); + } + */ private void checkJepVersionExist(String jepUrl) throws IOException { checkInternetConnection(); diff --git a/src/main/java/org/bioimageanalysis/icy/jep/utils/PythonUtils.java b/src/main/java/org/bioimageanalysis/icy/jep/utils/PythonUtils.java index f3761055694b1534c4bbcd262d5b5f88d585a65e..75ab8fc080abbd0c5537aff6b30cae864cc80f46 100644 --- a/src/main/java/org/bioimageanalysis/icy/jep/utils/PythonUtils.java +++ b/src/main/java/org/bioimageanalysis/icy/jep/utils/PythonUtils.java @@ -127,7 +127,7 @@ public class PythonUtils { if (!arePythonAndJVMArchitecuresCompatible()) throw new IllegalArgumentException("The architecure of the installed Python needs to be the same" + " as the one for the JVM specified at environmnet variable 'JAVA_HOME'." + System.lineSeparator() - + "This might be tricky for Apple M1 and posterior that use arm64 chips." + System.lineSeparator() + + "This might be tricky for Apple M1 and later that use arm64 chips." + System.lineSeparator() + "For more info visit the Wiki: " + CommonUtils.ARCH_HOME_WIKI); }