Commit 5446235f authored by Jean Meurice's avatar Jean Meurice

HardwareEmulator update

parent 3590caa3
Pipeline #157438 failed with stage
in 1 minute and 1 second
......@@ -3,4 +3,5 @@
.project
*.iml
.classpath
/.settings
\ No newline at end of file
/.settings
.vscode/
\ No newline at end of file
......@@ -26,12 +26,15 @@
<groupId>montisim</groupId>
<artifactId>rmi-model-server</artifactId>
<version>1.1.2</version>
<version>1.1.3</version>
<packaging>jar</packaging>
<name>rmi-model-server</name>
<properties>
<!-- USE THESE TO SET THE VERSIONS OF THE DEPENDENCIES FOR ALL THE SUB-PROJECTS -->
<commons.version>1.0.8</commons.version>
<!-- .. SE-Libraries .................................................. -->
<monticore.version>4.5.4.08.11.2017</monticore.version>
<se-commons.version>1.7.7</se-commons.version>
......@@ -74,7 +77,7 @@
<dependency>
<groupId>montisim</groupId>
<artifactId>commons</artifactId>
<version>1.0.7</version>
<version>${commons.version}</version>
</dependency>
</dependencies>
......
......@@ -40,11 +40,10 @@ public class HardwareEmulatorInterface implements RMIManager {
public void load_library() throws LibraryService.LibraryException {
//Use LibraryService to get the library from resources to the working directory (if not already there)
String working_dir = System.getProperty("user.dir") + "/";
String system_library_name = LibraryService.getSystemLibraryName("HardwareEmulator");
LibraryService.prepareLibrary(working_dir, system_library_name);
lib_path = working_dir + system_library_name;
LibraryService.prepareLibrary(system_library_name);
//Load the library
lib_path = LibraryService.getWorkingDirectory() + system_library_name;
System.load(lib_path);
//System.out.println("LibPath: " + lib_path);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment