1.1 --- a/isac-java/src/java-tests/isac/bridge/Isabelle_Isac.java Tue Sep 22 14:33:32 2020 +0200
1.2 +++ b/isac-java/src/java-tests/isac/bridge/Isabelle_Isac.java Fri Mar 26 10:45:05 2021 +0100
1.3 @@ -12,14 +12,13 @@
1.4 import java.nio.file.Paths;
1.5 import java.util.Properties;
1.6
1.7 -import info.hupel.isabelle.api.Configuration;
1.8 -import info.hupel.isabelle.api.Environment;
1.9 -import info.hupel.isabelle.api.Version;
1.10 -import info.hupel.isabelle.japi.JPlatform;
1.11 -import info.hupel.isabelle.japi.JResources;
1.12 -import info.hupel.isabelle.japi.JSetup;
1.13 -import info.hupel.isabelle.japi.JSystem;
1.14 -import info.hupel.isabelle.setup.Setup;
1.15 +import edu.tum.cs.isabelle.api.Configuration;
1.16 +import edu.tum.cs.isabelle.api.Environment;
1.17 +import edu.tum.cs.isabelle.api.Version;
1.18 +import edu.tum.cs.isabelle.japi.JPlatform;
1.19 +import edu.tum.cs.isabelle.japi.JSetup;
1.20 +import edu.tum.cs.isabelle.japi.JSystem;
1.21 +import edu.tum.cs.isabelle.setup.Setup;
1.22
1.23 /*
1.24 * Connect tests with Isac's mathematics engine.
1.25 @@ -46,10 +45,11 @@
1.26 try { inputStream.close();
1.27 } catch (IOException e) { e.printStackTrace(); }
1.28 }
1.29 - JResources res = JResources.dumpIsabelleResources();
1.30 + Setup setup = new Setup(Paths.get(isabelle_home_), JPlatform.guess(),
1.31 + new Version("2015"), Setup.defaultPackageName());
1.32 + Environment env = JSetup.makeEnvironment(setup); // without Duration
1.33 Configuration config = Configuration.fromBuiltin("libisabelle_Isac");
1.34 - Environment env = JSetup.makeEnvironment(JSetup.defaultSetup(new Version.Stable("2018")), res);
1.35 - return JSystem.create(env, config);
1.36 + return JSystem.create(env, config);
1.37 }
1.38
1.39 }