Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
monticore
EmbeddedMontiArc
simulators
RMIModelServer
Commits
5446235f
Commit
5446235f
authored
Jul 06, 2019
by
Jean Meurice
Browse files
HardwareEmulator update
parent
3590caa3
Pipeline
#157438
failed with stage
in 1 minute and 1 second
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
5446235f
...
...
@@ -3,4 +3,5 @@
.project
*.iml
.classpath
/.settings
\ No newline at end of file
/.settings
.vscode/
\ No newline at end of file
pom.xml
View file @
5446235f
...
...
@@ -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>
...
...
src/main/java/simulator/integration/HardwareEmulatorInterface.java
View file @
5446235f
...
...
@@ -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);
}
...
...
src/main/resources/HardwareEmulator.so
deleted
100644 → 0
View file @
3590caa3
File deleted
install
/HardwareEmulator.so
→
src/main/resources/linux
/HardwareEmulator.so
100644 → 100755
View file @
5446235f
No preview for this file type
src/main/resources/HardwareEmulator.dll
→
src/main/resources/
windows/
HardwareEmulator.dll
View file @
5446235f
File moved
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment