Commit e52bc3c4 authored by Evgeny Kusmenko's avatar Evgeny Kusmenko

Merge branch 'patch-1' into 'master'

Update HardwareEmulatorInterface.java

See merge request !8
parents 10f0f70d f6dba33e
Pipeline #156125 failed with stage
in 1 minute and 23 seconds
......@@ -20,11 +20,10 @@
#
stages:
- windows
- linux
- build
masterJobLinux:
stage: linux
stage: build
image: maven:3-jdk-8
script:
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean deploy --settings settings.xml
......@@ -33,15 +32,18 @@ masterJobLinux:
- master
masterJobWindows:
stage: windows
stage: build
script:
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml
tags:
- Windows10
BranchJobLinux:
stage: linux
stage: build
image: maven:3-jdk-8
before_script:
- apt-get update
- apt-get install libxext6
script:
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml
except:
......
......@@ -40,7 +40,7 @@ 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 = LibraryService.getWorkingDirectory();
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;
......
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