1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
---
src/bindings/java/MANIFEST.in | 3 +++
src/bindings/java/org/simgrid/s4u/Actor.java | 3 +--
tools/cmake/Distrib.cmake | 3 +++
tools/cmake/Java.cmake | 2 +-
4 files changed, 8 insertions(+), 3 deletions(-)
--- /dev/null
+++ b/src/bindings/java/MANIFEST.in
@@ -0,0 +1,3 @@
+Built-By: Da SimGrid team
+Main-Class: org.simgrid.s4u.Engine
+Class-Path: .
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -100,7 +100,7 @@
COMMAND ${CMAKE_COMMAND} -E echo "Specification-Version: \\\"${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}.${SIMGRID_VERSION_PATCH}\\\"" >> ${MANIFEST_FILE}
COMMAND ${CMAKE_COMMAND} -E echo "Implementation-Version: \\\"${GIT_VERSION}\\\"" >> ${MANIFEST_FILE}
- COMMAND ${Java_JAVADOC_EXECUTABLE} -quiet -d doc/javadoc -sourcepath ${CMAKE_HOME_DIRECTORY}/src/bindings/java/ org.simgrid.msg org.simgrid.trace
+ COMMAND ${Java_JAVADOC_EXECUTABLE} -quiet -d doc/javadoc -sourcepath ${CMAKE_HOME_DIRECTORY}/src/bindings/java/ org.simgrid.s4u
COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} doc/javadoc
COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR} -C ${CMAKE_HOME_DIRECTORY} COPYING -C ${CMAKE_HOME_DIRECTORY} ChangeLog -C ${CMAKE_HOME_DIRECTORY} LICENSE-LGPL-2.1 -C ${CMAKE_HOME_DIRECTORY} NEWS
--- a/src/bindings/java/org/simgrid/s4u/Actor.java
+++ b/src/bindings/java/org/simgrid/s4u/Actor.java
@@ -10,8 +10,7 @@
public abstract class Actor {
protected Actor() {}
/**
- * this is the method you should implement in your actor (it's the main of your actor).
- * @todo: make this abstract
+ * This is the method you should implement in your actor (it's the main of your actor).
*/
public abstract void run() throws SimgridException; /* your code here */
--- a/tools/cmake/Distrib.cmake
+++ b/tools/cmake/Distrib.cmake
@@ -46,6 +46,9 @@
if(${enable_sthread})
install(TARGETS sthread DESTINATION ${CMAKE_INSTALL_LIBDIR}/)
endif()
+if(SIMGRID_HAVE_JAVA AND (NOT merge_java_in_libsimgrid))
+ install(TARGETS simgrid-java DESTINATION ${CMAKE_INSTALL_LIBDIR}/)
+endif()
# pkg-config files
configure_file("${CMAKE_HOME_DIRECTORY}/tools/pkg-config/simgrid.pc.in"
|
