Skip to content
Snippets Groups Projects
Commit def98fc9 authored by carlosuc3m's avatar carlosuc3m
Browse files

update pom and remove unnecessary dependency

parent a5652ad8
No related branches found
No related tags found
No related merge requests found
......@@ -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) -->
......
......@@ -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();
......
......@@ -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);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment