A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
"new ruby host method"
[simgrid.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
303d760
..
05cc755
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-91,7
+91,9
@@
EXTRA_DIST= \
smpi/smpi_mpi_dt_private.h \
smpi/README \
\
smpi/smpi_mpi_dt_private.h \
smpi/README \
\
- mk_supernovae.sh
+ mk_supernovae.sh \
+ \
+ bindings/ruby_bindings.h
#LIBRARY_VERSION= 0:0:0
# | | |
#LIBRARY_VERSION= 0:0:0
# | | |
@@
-210,7
+212,8
@@
SIMIX_SRC= \
simix/smx_context.c \
simix/smx_action.c \
simix/smx_synchro.c \
simix/smx_context.c \
simix/smx_action.c \
simix/smx_synchro.c \
- simix/smx_network.c
+ simix/smx_network.c \
+ simix/smx_context_base.c
if CONTEXT_THREADS
SURF_SRC += xbt/xbt_os_thread.c simix/smx_context_thread.c
if CONTEXT_THREADS
SURF_SRC += xbt/xbt_os_thread.c simix/smx_context_thread.c
@@
-248,9
+251,13
@@
JMSG_C_SRC = \
JMSG_JAVA_SRC = \
java/simgrid/msg/MsgException.java \
java/simgrid/msg/JniException.java \
JMSG_JAVA_SRC = \
java/simgrid/msg/MsgException.java \
java/simgrid/msg/JniException.java \
+ java/simgrid/msg/TransferFailureException.java \
+ java/simgrid/msg/HostFailureException.java \
+ java/simgrid/msg/TimeoutException.java \
java/simgrid/msg/NativeException.java \
java/simgrid/msg/HostNotFoundException.java \
java/simgrid/msg/ProcessNotFoundException.java \
java/simgrid/msg/NativeException.java \
java/simgrid/msg/HostNotFoundException.java \
java/simgrid/msg/ProcessNotFoundException.java \
+ java/simgrid/msg/TaskCancelledException.java \
\
java/simgrid/msg/Msg.java \
java/simgrid/msg/Process.java \
\
java/simgrid/msg/Msg.java \
java/simgrid/msg/Process.java \
@@
-327,7
+334,7
@@
endif
### Declare the library content
###
### Declare the library content
###
-lib_LTLIBRARIES= libsimgrid.la libgras.la libsmpi.la
+lib_LTLIBRARIES= libsimgrid.la libgras.la libsmpi.la
gras_sources=$(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC)
simgrid_sources=$(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) \
gras_sources=$(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC)
simgrid_sources=$(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) \
@@
-347,6
+354,13
@@
libsmpi_la_LIBADD = libsimgrid.la
libsmpi_la_SOURCES = $(SMPI_SRC)
libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm
libsmpi_la_SOURCES = $(SMPI_SRC)
libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+if HAVE_RUBY
+lib_LTLIBRARIES += simgrid_ruby.la
+simgrid_ruby_la_LIBADD = libsimgrid.la
+simgrid_ruby_la_SOURCES = bindings/ruby/simgrid_ruby.c
+simgrid_ruby_la_LDFLAGS = $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm -module
+endif
+
# Windows users (at least, MSVC ones) need a def file.
if IS_WINDOWS
libgras_la_LDFLAGS += -Wl,--output-def,libgras.def
# Windows users (at least, MSVC ones) need a def file.
if IS_WINDOWS
libgras_la_LDFLAGS += -Wl,--output-def,libgras.def
@@
-377,14
+391,18
@@
else
EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC)
endif
EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC)
endif
-LUA_SRC= simix/smx_context_lua.c bindings/lua/
Msglua.c
+LUA_SRC= simix/smx_context_lua.c bindings/lua/
simgrid_lua.c #bindings/lua/Msglua.c
if HAVE_LUA
simgrid_sources += $(LUA_SRC)
else
EXTRA_DIST += $(LUA_SRC)
endif
if HAVE_LUA
simgrid_sources += $(LUA_SRC)
else
EXTRA_DIST += $(LUA_SRC)
endif
-RUBY_SRC= simix/smx_context_ruby.c bindings/ruby/rb_msg_process.c
+RUBY_SRC= simix/smx_context_ruby.c \
+ bindings/ruby/rb_msg_process.c \
+ bindings/ruby/rb_msg_host.c \
+ bindings/ruby/rb_msg_task.c \
+ bindings/ruby/rb_application_handler.c
if HAVE_RUBY
simgrid_sources += $(RUBY_SRC)
else
if HAVE_RUBY
simgrid_sources += $(RUBY_SRC)
else