notify added. 95/3995/3
cedric Delamarre [Tue, 10 May 2011 13:37:55 +0000 (15:37 +0200)]
Change-Id: I56a65c9989c2fee6ac2b451a64767a102f0c5873

21 files changed:
scilab/Scilab.sln
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/action_binding/includes/action_binding_GiwsExports.hxx [new file with mode: 0644]
scilab/modules/action_binding/includes/action_binding_gw.hxx [new file with mode: 0644]
scilab/modules/action_binding/includes/dynlib_action_binding_gw.h [new file with mode: 0644]
scilab/modules/action_binding/includes/gw_action_binding.h [deleted file]
scilab/modules/action_binding/sci_gateway/c/gw_action_binding.c [deleted file]
scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.cpp [new file with mode: 0644]
scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj [new file with mode: 0644]
scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj.filters [new file with mode: 0644]
scilab/modules/action_binding/sci_gateway/cpp/sci_notify.cpp
scilab/modules/action_binding/src/c/action_binding.vcxproj
scilab/modules/action_binding/src/c/action_binding.vcxproj.filters
scilab/modules/action_binding/src/cpp/action_binding_GiwsExports.cpp [new file with mode: 0644]
scilab/modules/action_binding/src/noaction_binding/noaction_binding.cpp [moved from scilab/modules/action_binding/src/noaction_binding/noaction_binding.c with 72% similarity]
scilab/modules/functions_manager/functions_manager.vcxproj
scilab/modules/functions_manager/includes/module_declaration.hxx
scilab/modules/functions_manager/src/cpp/funcmanager.cpp

index 48be48a..9f1b12d 100644 (file)
@@ -632,6 +632,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_link_gw", "modules\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "typesmacro", "modules\types\typesmacro\typesmacro.vcxproj", "{9252A034-7F22-4CB1-A634-4577DA69F2D0}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "action_binding_gw", "modules\action_binding\sci_gateway\cpp\action_binding_gw.vcxproj", "{3419B733-85A2-4F66-BC04-A5A8DC8FA057}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2024,6 +2026,14 @@ Global
                {9252A034-7F22-4CB1-A634-4577DA69F2D0}.Release|Win32.Build.0 = Release|Win32
                {9252A034-7F22-4CB1-A634-4577DA69F2D0}.Release|x64.ActiveCfg = Release|x64
                {9252A034-7F22-4CB1-A634-4577DA69F2D0}.Release|x64.Build.0 = Release|x64
+               {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Debug|Win32.ActiveCfg = Debug|Win32
+               {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Debug|Win32.Build.0 = Debug|Win32
+               {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Debug|x64.ActiveCfg = Debug|x64
+               {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Debug|x64.Build.0 = Debug|x64
+               {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Release|Win32.ActiveCfg = Release|Win32
+               {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Release|Win32.Build.0 = Release|Win32
+               {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Release|x64.ActiveCfg = Release|x64
+               {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 8c76a6a..902bb80 100644 (file)
@@ -37,7 +37,8 @@
     <module name="hdf5" activate="yes"/>
     <module name="xcos" activate="@GUI_ENABLE@"/>
     <!-- comments -->
-<!--    <module name="scicos" activate="@XCOS_ENABLE@"/> -->
+    <!-- <module name="scicos" activate="@XCOS_ENABLE@"/> -->
     <module name="dynamic_link" activate="yes"/>
+    <module name="action_binding" activate="yes"/>
 </modules>
 
index 3d3f1b9..d3309e4 100644 (file)
@@ -36,5 +36,6 @@
     <module name="helptools" activate="yes"/>
     <module name="hdf5" activate="yes"/>
     <module name="dynamic_link" activate="yes"/>
+    <module name="action_binding" activate="yes"/>
 </modules>
 
index 2ab1c8a..14b7e43 100644 (file)
@@ -13,26 +13,34 @@ if GUI
 USEANT=1
 
 # List of the c files
-ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c
+ACTION_BINDING_C_SOURCES = \
+    src/c/InterpreterManagement.c
 
 # List of the c++ file
-ACTION_BINDING_CPP_SOURCES = src/jni/Signal.cpp \
-src/jni/Signal.hxx \
-src/jni/GiwsException.cpp
+ACTION_BINDING_CPP_SOURCES = \
+    src/jni/Signal.cpp \
+    src/jni/Signal.hxx \
+    src/jni/GiwsException.cpp \
+    src/cpp/action_binding_GiwsExports.cpp
 
-# List of the gateway c files
-CONSOLE_C_JNI_SOURCES = src/jni/InterpreterManagement_wrap.c
 
-GATEWAY_C_SOURCES = sci_gateway/c/gw_action_binding.c
+# List of the gateway c files
+CONSOLE_C_JNI_SOURCES = \
+    src/jni/InterpreterManagement_wrap.c
 
-GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_notify.cpp
+GATEWAY_CPP_SOURCES = \
+    sci_gateway/cpp/action_binding_gw.cpp \
+    sci_gateway/cpp/sci_notify.cpp
 
 #### SWIG Declaration ####
-SWIG_WRAPPERS = src/jni/InterpreterManagement.i
+SWIG_WRAPPERS = \
+    src/jni/InterpreterManagement.i
 
 else
-# List of the c files
-ACTION_BINDING_C_SOURCES = src/noaction_binding/noaction_binding.c
+# List of the cpp files
+ACTION_BINDING_CPP_SOURCES = \
+    src/noaction_binding/noaction_binding.cpp
+
 endif
 
 if SWIG
@@ -45,31 +53,45 @@ if GIWS
 BUILT_SOURCES=giws
 endif
 
-libsciaction_binding_disable_la_SOURCES = src/noaction_binding/noaction_binding.c
-libsciaction_binding_disable_la_CFLAGS =       -I$(srcdir)/includes/ \
-                                                                                       -I$(top_srcdir)/modules/output_stream/includes
+libsciaction_binding_disable_la_SOURCES = \
+    src/noaction_binding/noaction_binding.cpp
+
+libsciaction_binding_disable_la_CPPFLAGS = \
+    -I$(srcdir)/includes/ \
+    -I$(top_srcdir)/modules/output_stream/includes \
+    -I$(top_srcdir)/modules/abstractSyntaxTree/includes \
+    -I$(top_srcdir)/modules/symbol/includes \
+    -I$(top_srcdir)/modules/system_env/includes \
+    -I$(top_srcdir)/modules/types/includes
 
 # Includes need for the compilation
-libsciaction_binding_la_CFLAGS=        $(JAVA_JNI_INCLUDE) \
--I$(srcdir)/includes/ \
--I$(srcdir)/src/c/ \
--I$(srcdir)/src/jni/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
--I$(top_srcdir)/modules/jvm/includes/ \
--I$(top_srcdir)/modules/api_scilab/includes \
--I$(top_srcdir)/modules/output_stream/includes \
--I$(top_srcdir)/modules/types/includes
+libsciaction_binding_la_CFLAGS= \
+    $(JAVA_JNI_INCLUDE) \
+    -I$(srcdir)/includes/ \
+    -I$(srcdir)/src/c/ \
+    -I$(srcdir)/src/jni/ \
+    -I$(top_srcdir)/libs/MALLOC/includes/ \
+    -I$(top_srcdir)/modules/jvm/includes/ \
+    -I$(top_srcdir)/modules/api_scilab/includes \
+    -I$(top_srcdir)/modules/output_stream/includes \
+    -I$(top_srcdir)/modules/types/includes \
+    -I$(top_srcdir)/modules/jvm/includes/
 
 # Includes need for the compilation
-libsciaction_binding_la_CPPFLAGS=      $(JAVA_JNI_INCLUDE) \
--I$(srcdir)/includes/ \
--I$(srcdir)/src/c/ \
--I$(srcdir)/src/jni/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
--I$(top_srcdir)/modules/jvm/includes/ \
--I$(top_srcdir)/modules/api_scilab/includes \
--I$(top_srcdir)/modules/output_stream/includes \
--I$(top_srcdir)/modules/types/includes
+libsciaction_binding_la_CPPFLAGS= \
+    $(JAVA_JNI_INCLUDE) \
+    -I$(srcdir)/includes/ \
+    -I$(srcdir)/src/c/ \
+    -I$(srcdir)/src/jni/ \
+    -I$(top_srcdir)/libs/MALLOC/includes/ \
+    -I$(top_srcdir)/modules/jvm/includes/ \
+    -I$(top_srcdir)/modules/api_scilab/includes \
+    -I$(top_srcdir)/modules/output_stream/includes \
+    -I$(top_srcdir)/modules/symbol/includes \
+    -I$(top_srcdir)/modules/functions_manager/includes \
+    -I$(top_srcdir)/modules/abstractSyntaxTree/includes \
+    -I$(top_srcdir)/modules/system_env/includes \
+    -I$(top_srcdir)/modules/types/includes
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
@@ -84,13 +106,13 @@ libsciaction_binding_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD
 
 # All the sources needed by libsciaction_binding.la
 libsciaction_binding_algo_la_SOURCES = $(ACTION_BINDING_C_SOURCES) $(ACTION_BINDING_CPP_SOURCES) $(CONSOLE_C_JNI_SOURCES)
-libsciaction_binding_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+libsciaction_binding_la_SOURCES = $(GATEWAY_CPP_SOURCES)
 libsciaction_binding_algo_la_CFLAGS = $(libsciaction_binding_la_CFLAGS)
 libsciaction_binding_algo_la_CPPFLAGS = $(libsciaction_binding_la_CPPFLAGS)
 
 
 # For the code check (splint)
-CHECK_SRC= $(ACTION_BINDING_C_SOURCES) $(GATEWAY_C_SOURCES)
+CHECK_SRC= $(ACTION_BINDING_CPP_SOURCES)
 INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS)
 
 ## Libraries necessary
index 16ac91c..bf16793 100644 (file)
@@ -116,15 +116,17 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 libsciaction_binding_algo_la_LIBADD =
 am__libsciaction_binding_algo_la_SOURCES_DIST =  \
-       src/noaction_binding/noaction_binding.c \
-       src/c/InterpreterManagement.c src/jni/Signal.cpp \
+       src/c/InterpreterManagement.c \
+       src/noaction_binding/noaction_binding.cpp src/jni/Signal.cpp \
        src/jni/Signal.hxx src/jni/GiwsException.cpp \
+       src/cpp/action_binding_GiwsExports.cpp \
        src/jni/InterpreterManagement_wrap.c
-@GUI_FALSE@am__objects_1 =  \
-@GUI_FALSE@    libsciaction_binding_algo_la-noaction_binding.lo
 @GUI_TRUE@am__objects_1 = libsciaction_binding_algo_la-InterpreterManagement.lo
+@GUI_FALSE@am__objects_2 =  \
+@GUI_FALSE@    libsciaction_binding_algo_la-noaction_binding.lo
 @GUI_TRUE@am__objects_2 = libsciaction_binding_algo_la-Signal.lo \
-@GUI_TRUE@     libsciaction_binding_algo_la-GiwsException.lo
+@GUI_TRUE@     libsciaction_binding_algo_la-GiwsException.lo \
+@GUI_TRUE@     libsciaction_binding_algo_la-action_binding_GiwsExports.lo
 @GUI_TRUE@am__objects_3 = libsciaction_binding_algo_la-InterpreterManagement_wrap.lo
 am_libsciaction_binding_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_2) $(am__objects_3)
@@ -136,20 +138,16 @@ am_libsciaction_binding_disable_la_OBJECTS =  \
        libsciaction_binding_disable_la-noaction_binding.lo
 libsciaction_binding_disable_la_OBJECTS =  \
        $(am_libsciaction_binding_disable_la_OBJECTS)
-libsciaction_binding_disable_la_LINK = $(LIBTOOL) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(libsciaction_binding_disable_la_CFLAGS) $(CFLAGS) \
-       $(AM_LDFLAGS) $(LDFLAGS) -o $@
 libsciaction_binding_la_DEPENDENCIES = libsciaction_binding-algo.la \
        $(top_builddir)/libs/MALLOC/libscimalloc.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la
 am__libsciaction_binding_la_SOURCES_DIST =  \
-       sci_gateway/c/gw_action_binding.c \
+       sci_gateway/cpp/action_binding_gw.cpp \
        sci_gateway/cpp/sci_notify.cpp
 @GUI_TRUE@am__objects_4 =  \
-@GUI_TRUE@     libsciaction_binding_la-gw_action_binding.lo
-@GUI_TRUE@am__objects_5 = libsciaction_binding_la-sci_notify.lo
-am_libsciaction_binding_la_OBJECTS = $(am__objects_4) $(am__objects_5)
+@GUI_TRUE@     libsciaction_binding_la-action_binding_gw.lo \
+@GUI_TRUE@     libsciaction_binding_la-sci_notify.lo
+am_libsciaction_binding_la_OBJECTS = $(am__objects_4)
 libsciaction_binding_la_OBJECTS =  \
        $(am_libsciaction_binding_la_OBJECTS)
 libsciaction_binding_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -451,54 +449,80 @@ yacc_present = @yacc_present@
 @GUI_TRUE@USEANT = 1
 
 # List of the c files
-@GUI_FALSE@ACTION_BINDING_C_SOURCES = src/noaction_binding/noaction_binding.c
+@GUI_TRUE@ACTION_BINDING_C_SOURCES = \
+@GUI_TRUE@    src/c/InterpreterManagement.c
+
+
+# List of the cpp files
+@GUI_FALSE@ACTION_BINDING_CPP_SOURCES = \
+@GUI_FALSE@    src/noaction_binding/noaction_binding.cpp
 
-# List of the c files
-@GUI_TRUE@ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c
 
 # List of the c++ file
-@GUI_TRUE@ACTION_BINDING_CPP_SOURCES = src/jni/Signal.cpp \
-@GUI_TRUE@src/jni/Signal.hxx \
-@GUI_TRUE@src/jni/GiwsException.cpp
+@GUI_TRUE@ACTION_BINDING_CPP_SOURCES = \
+@GUI_TRUE@    src/jni/Signal.cpp \
+@GUI_TRUE@    src/jni/Signal.hxx \
+@GUI_TRUE@    src/jni/GiwsException.cpp \
+@GUI_TRUE@    src/cpp/action_binding_GiwsExports.cpp
 
 
 # List of the gateway c files
-@GUI_TRUE@CONSOLE_C_JNI_SOURCES = src/jni/InterpreterManagement_wrap.c
-@GUI_TRUE@GATEWAY_C_SOURCES = sci_gateway/c/gw_action_binding.c
-@GUI_TRUE@GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_notify.cpp
+@GUI_TRUE@CONSOLE_C_JNI_SOURCES = \
+@GUI_TRUE@    src/jni/InterpreterManagement_wrap.c
+
+@GUI_TRUE@GATEWAY_CPP_SOURCES = \
+@GUI_TRUE@    sci_gateway/cpp/action_binding_gw.cpp \
+@GUI_TRUE@    sci_gateway/cpp/sci_notify.cpp
+
 
 #### SWIG Declaration ####
-@GUI_TRUE@SWIG_WRAPPERS = src/jni/InterpreterManagement.i
+@GUI_TRUE@SWIG_WRAPPERS = \
+@GUI_TRUE@    src/jni/InterpreterManagement.i
+
 @GIWS_TRUE@BUILT_SOURCES = giws
 @SWIG_TRUE@BUILT_SOURCES = swig
 GIWS_WRAPPERS = src/jni/Signal.giws.xml
-libsciaction_binding_disable_la_SOURCES = src/noaction_binding/noaction_binding.c
-libsciaction_binding_disable_la_CFLAGS = -I$(srcdir)/includes/ \
-                                                                                       -I$(top_srcdir)/modules/output_stream/includes
+libsciaction_binding_disable_la_SOURCES = \
+    src/noaction_binding/noaction_binding.cpp
+
+libsciaction_binding_disable_la_CPPFLAGS = \
+    -I$(srcdir)/includes/ \
+    -I$(top_srcdir)/modules/output_stream/includes \
+    -I$(top_srcdir)/modules/abstractSyntaxTree/includes \
+    -I$(top_srcdir)/modules/symbol/includes \
+    -I$(top_srcdir)/modules/system_env/includes \
+    -I$(top_srcdir)/modules/types/includes
 
 
 # Includes need for the compilation
-libsciaction_binding_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
--I$(srcdir)/includes/ \
--I$(srcdir)/src/c/ \
--I$(srcdir)/src/jni/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
--I$(top_srcdir)/modules/jvm/includes/ \
--I$(top_srcdir)/modules/api_scilab/includes \
--I$(top_srcdir)/modules/output_stream/includes \
--I$(top_srcdir)/modules/types/includes
+libsciaction_binding_la_CFLAGS = \
+    $(JAVA_JNI_INCLUDE) \
+    -I$(srcdir)/includes/ \
+    -I$(srcdir)/src/c/ \
+    -I$(srcdir)/src/jni/ \
+    -I$(top_srcdir)/libs/MALLOC/includes/ \
+    -I$(top_srcdir)/modules/jvm/includes/ \
+    -I$(top_srcdir)/modules/api_scilab/includes \
+    -I$(top_srcdir)/modules/output_stream/includes \
+    -I$(top_srcdir)/modules/types/includes \
+    -I$(top_srcdir)/modules/jvm/includes/
 
 
 # Includes need for the compilation
-libsciaction_binding_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
--I$(srcdir)/includes/ \
--I$(srcdir)/src/c/ \
--I$(srcdir)/src/jni/ \
--I$(top_srcdir)/libs/MALLOC/includes/ \
--I$(top_srcdir)/modules/jvm/includes/ \
--I$(top_srcdir)/modules/api_scilab/includes \
--I$(top_srcdir)/modules/output_stream/includes \
--I$(top_srcdir)/modules/types/includes
+libsciaction_binding_la_CPPFLAGS = \
+    $(JAVA_JNI_INCLUDE) \
+    -I$(srcdir)/includes/ \
+    -I$(srcdir)/src/c/ \
+    -I$(srcdir)/src/jni/ \
+    -I$(top_srcdir)/libs/MALLOC/includes/ \
+    -I$(top_srcdir)/modules/jvm/includes/ \
+    -I$(top_srcdir)/modules/api_scilab/includes \
+    -I$(top_srcdir)/modules/output_stream/includes \
+    -I$(top_srcdir)/modules/symbol/includes \
+    -I$(top_srcdir)/modules/functions_manager/includes \
+    -I$(top_srcdir)/modules/abstractSyntaxTree/includes \
+    -I$(top_srcdir)/modules/system_env/includes \
+    -I$(top_srcdir)/modules/types/includes
 
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
@@ -509,12 +533,12 @@ libsciaction_binding_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD
 
 # All the sources needed by libsciaction_binding.la
 libsciaction_binding_algo_la_SOURCES = $(ACTION_BINDING_C_SOURCES) $(ACTION_BINDING_CPP_SOURCES) $(CONSOLE_C_JNI_SOURCES)
-libsciaction_binding_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
+libsciaction_binding_la_SOURCES = $(GATEWAY_CPP_SOURCES)
 libsciaction_binding_algo_la_CFLAGS = $(libsciaction_binding_la_CFLAGS)
 libsciaction_binding_algo_la_CPPFLAGS = $(libsciaction_binding_la_CPPFLAGS)
 
 # For the code check (splint)
-CHECK_SRC = $(ACTION_BINDING_C_SOURCES) $(GATEWAY_C_SOURCES)
+CHECK_SRC = $(ACTION_BINDING_CPP_SOURCES)
 INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS)
 libsciaction_binding_la_LIBADD = libsciaction_binding-algo.la  $(top_builddir)/libs/MALLOC/libscimalloc.la \
                                                                        $(top_builddir)/modules/output_stream/libscioutput_stream.la
@@ -678,7 +702,7 @@ clean-pkglibLTLIBRARIES:
 libsciaction_binding-algo.la: $(libsciaction_binding_algo_la_OBJECTS) $(libsciaction_binding_algo_la_DEPENDENCIES) 
        $(CXXLINK) $(am_libsciaction_binding_algo_la_rpath) $(libsciaction_binding_algo_la_OBJECTS) $(libsciaction_binding_algo_la_LIBADD) $(LIBS)
 libsciaction_binding-disable.la: $(libsciaction_binding_disable_la_OBJECTS) $(libsciaction_binding_disable_la_DEPENDENCIES) 
-       $(libsciaction_binding_disable_la_LINK) -rpath $(pkglibdir) $(libsciaction_binding_disable_la_OBJECTS) $(libsciaction_binding_disable_la_LIBADD) $(LIBS)
+       $(CXXLINK) -rpath $(pkglibdir) $(libsciaction_binding_disable_la_OBJECTS) $(libsciaction_binding_disable_la_LIBADD) $(LIBS)
 libsciaction_binding.la: $(libsciaction_binding_la_OBJECTS) $(libsciaction_binding_la_DEPENDENCIES) 
        $(libsciaction_binding_la_LINK) $(am_libsciaction_binding_la_rpath) $(libsciaction_binding_la_OBJECTS) $(libsciaction_binding_la_LIBADD) $(LIBS)
 
@@ -692,9 +716,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_algo_la-InterpreterManagement.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_algo_la-InterpreterManagement_wrap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_algo_la-Signal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_algo_la-action_binding_GiwsExports.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_algo_la-noaction_binding.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-gw_action_binding.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-action_binding_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-sci_notify.Plo@am__quote@
 
 .c.o:
@@ -718,13 +743,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
-libsciaction_binding_algo_la-noaction_binding.lo: src/noaction_binding/noaction_binding.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_algo_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_algo_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_algo_la-noaction_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_algo_la-noaction_binding.Tpo -c -o libsciaction_binding_algo_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciaction_binding_algo_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_algo_la-noaction_binding.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/noaction_binding/noaction_binding.c' object='libsciaction_binding_algo_la-noaction_binding.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_algo_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_algo_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_algo_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
-
 libsciaction_binding_algo_la-InterpreterManagement.lo: src/c/InterpreterManagement.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_algo_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_algo_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_algo_la-InterpreterManagement.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_algo_la-InterpreterManagement.Tpo -c -o libsciaction_binding_algo_la-InterpreterManagement.lo `test -f 'src/c/InterpreterManagement.c' || echo '$(srcdir)/'`src/c/InterpreterManagement.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciaction_binding_algo_la-InterpreterManagement.Tpo $(DEPDIR)/libsciaction_binding_algo_la-InterpreterManagement.Plo
@@ -739,20 +757,6 @@ libsciaction_binding_algo_la-InterpreterManagement_wrap.lo: src/jni/InterpreterM
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_algo_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_algo_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_algo_la-InterpreterManagement_wrap.lo `test -f 'src/jni/InterpreterManagement_wrap.c' || echo '$(srcdir)/'`src/jni/InterpreterManagement_wrap.c
 
-libsciaction_binding_disable_la-noaction_binding.lo: src/noaction_binding/noaction_binding.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_disable_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_disable_la-noaction_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Tpo -c -o libsciaction_binding_disable_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/noaction_binding/noaction_binding.c' object='libsciaction_binding_disable_la-noaction_binding.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_disable_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_disable_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
-
-libsciaction_binding_la-gw_action_binding.lo: sci_gateway/c/gw_action_binding.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-gw_action_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-gw_action_binding.Tpo -c -o libsciaction_binding_la-gw_action_binding.lo `test -f 'sci_gateway/c/gw_action_binding.c' || echo '$(srcdir)/'`sci_gateway/c/gw_action_binding.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciaction_binding_la-gw_action_binding.Tpo $(DEPDIR)/libsciaction_binding_la-gw_action_binding.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/gw_action_binding.c' object='libsciaction_binding_la-gw_action_binding.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-gw_action_binding.lo `test -f 'sci_gateway/c/gw_action_binding.c' || echo '$(srcdir)/'`sci_gateway/c/gw_action_binding.c
-
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@@ -774,6 +778,13 @@ libsciaction_binding_la-gw_action_binding.lo: sci_gateway/c/gw_action_binding.c
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
 
+libsciaction_binding_algo_la-noaction_binding.lo: src/noaction_binding/noaction_binding.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciaction_binding_algo_la-noaction_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_algo_la-noaction_binding.Tpo -c -o libsciaction_binding_algo_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.cpp' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciaction_binding_algo_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_algo_la-noaction_binding.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/noaction_binding/noaction_binding.cpp' object='libsciaction_binding_algo_la-noaction_binding.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciaction_binding_algo_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.cpp' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.cpp
+
 libsciaction_binding_algo_la-Signal.lo: src/jni/Signal.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciaction_binding_algo_la-Signal.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_algo_la-Signal.Tpo -c -o libsciaction_binding_algo_la-Signal.lo `test -f 'src/jni/Signal.cpp' || echo '$(srcdir)/'`src/jni/Signal.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciaction_binding_algo_la-Signal.Tpo $(DEPDIR)/libsciaction_binding_algo_la-Signal.Plo
@@ -788,6 +799,27 @@ libsciaction_binding_algo_la-GiwsException.lo: src/jni/GiwsException.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciaction_binding_algo_la-GiwsException.lo `test -f 'src/jni/GiwsException.cpp' || echo '$(srcdir)/'`src/jni/GiwsException.cpp
 
+libsciaction_binding_algo_la-action_binding_GiwsExports.lo: src/cpp/action_binding_GiwsExports.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciaction_binding_algo_la-action_binding_GiwsExports.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_algo_la-action_binding_GiwsExports.Tpo -c -o libsciaction_binding_algo_la-action_binding_GiwsExports.lo `test -f 'src/cpp/action_binding_GiwsExports.cpp' || echo '$(srcdir)/'`src/cpp/action_binding_GiwsExports.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciaction_binding_algo_la-action_binding_GiwsExports.Tpo $(DEPDIR)/libsciaction_binding_algo_la-action_binding_GiwsExports.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/action_binding_GiwsExports.cpp' object='libsciaction_binding_algo_la-action_binding_GiwsExports.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciaction_binding_algo_la-action_binding_GiwsExports.lo `test -f 'src/cpp/action_binding_GiwsExports.cpp' || echo '$(srcdir)/'`src/cpp/action_binding_GiwsExports.cpp
+
+libsciaction_binding_disable_la-noaction_binding.lo: src/noaction_binding/noaction_binding.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciaction_binding_disable_la-noaction_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Tpo -c -o libsciaction_binding_disable_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.cpp' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/noaction_binding/noaction_binding.cpp' object='libsciaction_binding_disable_la-noaction_binding.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciaction_binding_disable_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.cpp' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.cpp
+
+libsciaction_binding_la-action_binding_gw.lo: sci_gateway/cpp/action_binding_gw.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciaction_binding_la-action_binding_gw.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-action_binding_gw.Tpo -c -o libsciaction_binding_la-action_binding_gw.lo `test -f 'sci_gateway/cpp/action_binding_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/action_binding_gw.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciaction_binding_la-action_binding_gw.Tpo $(DEPDIR)/libsciaction_binding_la-action_binding_gw.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/action_binding_gw.cpp' object='libsciaction_binding_la-action_binding_gw.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciaction_binding_la-action_binding_gw.lo `test -f 'sci_gateway/cpp/action_binding_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/action_binding_gw.cpp
+
 libsciaction_binding_la-sci_notify.lo: sci_gateway/cpp/sci_notify.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciaction_binding_la-sci_notify.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-sci_notify.Tpo -c -o libsciaction_binding_la-sci_notify.lo `test -f 'sci_gateway/cpp/sci_notify.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_notify.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciaction_binding_la-sci_notify.Tpo $(DEPDIR)/libsciaction_binding_la-sci_notify.Plo
diff --git a/scilab/modules/action_binding/includes/action_binding_GiwsExports.hxx b/scilab/modules/action_binding/includes/action_binding_GiwsExports.hxx
new file mode 100644 (file)
index 0000000..08b1026
--- /dev/null
@@ -0,0 +1,24 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) DIGITEO - 2011 - Antoine ELIAS
+* 
+* This file must be used under the terms of the CeCILL.
+* This source file is licensed as described in the file COPYING, which
+* you should have received as part of this distribution.  The terms
+* are also available at    
+* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+*
+*/
+
+#ifndef __ACTION_BINDING_GIWSEXPORTS_HXX__
+#define __ACTION_BINDING_GIWSEXPORTS_HXX__
+#include "Signal.hxx"
+
+extern "C"
+{
+#include "dynlib_action_binding.h"
+}
+
+ACTION_BINDING_IMPEXP void Signal_notify(JavaVM * jvm_, char * ID);
+
+#endif /* !__ACTION_BINDING_GIWSEXPORTS_HXX__ */
\ No newline at end of file
diff --git a/scilab/modules/action_binding/includes/action_binding_gw.hxx b/scilab/modules/action_binding/includes/action_binding_gw.hxx
new file mode 100644 (file)
index 0000000..7434df6
--- /dev/null
@@ -0,0 +1,33 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2010-2011 - DIGITEO - Bruno JOFRET
+ *  Copyright (C) 2011 - DIGITEO - Cedric DELAMARRE
+ *
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#ifndef __ACTION_BINDING_GW_HXX__
+#define __ACTION_BINDING_GW_HXX__
+
+#include "dynlib_action_binding_gw.h"
+
+#include "cpp_gateway_prototype.hxx"
+
+class ActionBindingModule
+{
+private :
+    ActionBindingModule() {};
+    ~ActionBindingModule() {};
+
+public :
+       ACTION_BINDING_GW_IMPEXP static bool Load();
+};
+
+CPP_GATEWAY_PROTOTYPE(sci_notify);
+
+#endif /* !__ACTION_BINDING_GW_HXX__ */
diff --git a/scilab/modules/action_binding/includes/dynlib_action_binding_gw.h b/scilab/modules/action_binding/includes/dynlib_action_binding_gw.h
new file mode 100644 (file)
index 0000000..00d44ce
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) DIGITEO - 2011 - Antoine ELIAS
+* 
+* This file must be used under the terms of the CeCILL.
+* This source file is licensed as described in the file COPYING, which
+* you should have received as part of this distribution.  The terms
+* are also available at    
+* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+*
+*/
+
+/*--------------------------------------------------------------------------*/ 
+#ifndef __DYNLIB_ACTION_BINDING_GW_H__
+#define __DYNLIB_ACTION_BINDING_GW_H__
+
+#ifdef _MSC_VER
+       #ifdef ACTION_BINDING_GW_EXPORTS
+               #define ACTION_BINDING_GW_IMPEXP __declspec(dllexport)
+       #else
+               #define ACTION_BINDING_GW_IMPEXP __declspec(dllimport)
+       #endif
+#else
+       #define ACTION_BINDING_GW_IMPEXP 
+#endif
+
+#endif /* __DYNLIB_ACTION_BINDING_GW_H__ */
+/*--------------------------------------------------------------------------*/ 
diff --git a/scilab/modules/action_binding/includes/gw_action_binding.h b/scilab/modules/action_binding/includes/gw_action_binding.h
deleted file mode 100644 (file)
index 9ef7a11..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) 2010 - DIGITEO - Allan SIMON
-* Copyright (C) 2011 - DIGITEO - Bruno JOFRET
-*
-* This file must be used under the terms of the CeCILL.
-* This source file is licensed as described in the file COPYING, which
-* you should have received as part of this distribution.  The terms
-* are also available at
-* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-
-#ifndef __GW_ACTION_BINDING__
-#define __GW_ACTION_BINDING__
-/*--------------------------------------------------------------------------*/
-#include "dynlib_action_binding.h"
-#include "c_gateway_prototype.h"
-/*--------------------------------------------------------------------------*/
-ACTION_BINDING_IMPEXP int gw_action_binding(void);
-ACTION_BINDING_IMPEXP C_GATEWAY_PROTOTYPE(sci_notify);
-/*--------------------------------------------------------------------------*/
-#endif /* __GW_ACTION_BINDING__ */
-/*--------------------------------------------------------------------------*/
-
diff --git a/scilab/modules/action_binding/sci_gateway/c/gw_action_binding.c b/scilab/modules/action_binding/sci_gateway/c/gw_action_binding.c
deleted file mode 100644 (file)
index 4f93325..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2009 - DIGITEO - Allan SIMON
- *
- *  This file must be used under the terms of the CeCILL.
- *  This source file is licensed as described in the file COPYING, which
- *  you should have received as part of this distribution.  The terms
- *  are also available at
- *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/
-#include "gw_action_binding.h"
-#include "stack-c.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-static gw_generic_table Tab[] = {
-    {sci_notify, "notify"},
-};
-/*--------------------------------------------------------------------------*/
-int gw_action_binding(void)
-{
-       Rhs = Max(0, Rhs);
-
-       callFunctionFromGateway(Tab,  SIZE_CURRENT_GENERIC_TABLE(Tab));
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.cpp b/scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.cpp
new file mode 100644 (file)
index 0000000..93d9d18
--- /dev/null
@@ -0,0 +1,29 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2010-2011 - DIGITEO - Bruno JOFRET
+ *  Copyright (C) 2011 - DIGITEO - Cedric DELAMARRE
+ *
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#include "action_binding_gw.hxx"
+#include "context.hxx"
+#include "types.hxx"
+
+extern "C"
+{
+#include "dynlib_action_binding.h"
+}
+
+#define MODULE_NAME L"action_binding"
+
+bool ActionBindingModule::Load()
+{
+    symbol::Context::getInstance()->AddFunction(types::Function::createFunction(L"notify", &sci_notify, MODULE_NAME));
+    return true;
+}
diff --git a/scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj b/scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj
new file mode 100644 (file)
index 0000000..6ec6ae6
--- /dev/null
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{3419B733-85A2-4F66-BC04-A5A8DC8FA057}</ProjectGuid>
+    <RootNamespace>action_binding_gw</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sci$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">sci$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">sci$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">sci$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../abstractSyntaxTree/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <PreLinkEvent>
+      <Message>Make dependencies</Message>
+      <Command>
+      </Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalDependencies>LibScilab.lib;libjvm.lib;scilab_windows.lib;scilocalization.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(SolutionDir)bin\sci$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../abstractSyntaxTree/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <PreLinkEvent>
+      <Message>Make dependencies</Message>
+      <Command>
+      </Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+      <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(SolutionDir)bin\sci$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../abstractSyntaxTree/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <PreLinkEvent>
+      <Message>Make dependencies</Message>
+      <Command>
+      </Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalDependencies>LibScilab.lib;libjvm.lib;scilab_windows.lib;scilocalization.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>
+      </LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(SolutionDir)bin\sci$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../abstractSyntaxTree/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <PreLinkEvent>
+      <Message>Make dependencies</Message>
+      <Command>
+      </Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalDependencies>LibScilab.lib;libjvm.lib;scilab_windows.lib;scilocalization.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>
+      </LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(SolutionDir)bin\sci$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+    </Link>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="action_binding_gw.cpp" />
+    <ClCompile Include="sci_notify.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\includes\action_binding_gw.hxx" />
+    <ClInclude Include="..\..\includes\dynlib_action_binding_gw.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\jvm\libjvm.vcxproj">
+      <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
+      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
+      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\symbol\symbol.vcxproj">
+      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\types\types.vcxproj">
+      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\c\action_binding.vcxproj">
+      <Project>{8a654cc5-22c1-4972-a8cf-1b89f78b5383}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Library Include="..\..\..\..\bin\libintl.lib" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj.filters b/scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj.filters
new file mode 100644 (file)
index 0000000..3d4dabe
--- /dev/null
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{6a16af6d-e387-4bcc-9a69-10bdcea3d112}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{ba6df28b-5f3f-4023-822a-765bc5cb2a8d}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{54ff4103-4b71-438b-b634-6a04209db556}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="action_binding_gw.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_notify.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\includes\action_binding_gw.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\dynlib_action_binding_gw.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Library Include="..\..\..\..\bin\libintl.lib" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
index 25f494e..2d8c036 100644 (file)
@@ -1,6 +1,7 @@
 /*
 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 * Copyright (C) 2009 - DIGITEO - Vincent COUVERT
+* Copyright (C) 2011 - DIGITEO - Cedric DELAMARRE
 *
 * This file must be used under the terms of the CeCILL.
 * This source file is licensed as described in the file COPYING, which
 *
 */
 /*--------------------------------------------------------------------------*/
-#include "Signal.hxx"
+#include "function.hxx"
+#include "action_binding_GiwsExports.hxx"
+#include "action_binding_gw.hxx"
+#include "string.hxx"
 
 extern "C"
 {
-#include "gw_action_binding.h"
-#include "stack-c.h"
-#include "api_common.h"
-#include "api_string.h"
 #include "localization.h"
 #include "Scierror.h"
 #include "MALLOC.h"
-#include "freeArrayOfString.h"
 #include "getScilabJavaVM.h"
-#include "api_oldstack.h"
 }
+
 /*--------------------------------------------------------------------------*/
-using namespace org_scilab_modules_action_binding_utils;
-/*--------------------------------------------------------------------------*/
-int sci_notify(char *fname, int*_piKey)
+types::Function::ReturnValue sci_notify(types::typed_list &in, int _iRetCount, types::typed_list &out)
 {
-       CheckRhs(1,1);
-       CheckLhs(0,1);
-
-       int m1 = 0, n1 = 0;
-       int *piAddressVarOne = NULL;
-       char **pStVarOne = NULL;
-       int *lenStVarOne = NULL;
-       int iType = 0;
-       SciErr sciErr;
-
-       sciErr = getVarAddressFromPosition(_piKey, 1, &piAddressVarOne);
-       if(sciErr.iErr)
-       {
-               printError(&sciErr, 0);
-               return 0;
-       }
-
-       sciErr = getVarType(_piKey, piAddressVarOne, &iType);
-       if(sciErr.iErr)
-       {
-               printError(&sciErr, 0);
-               return 0;
-       }
-
-       if ( iType != sci_strings )
-       {
-               Scierror(999,_("%s: Wrong type for input argument #%d: A string expected.\n"),fname,1);
-               return 0;
-       }
-
-       /* get dimensions */
-       sciErr = getMatrixOfString(_piKey, piAddressVarOne, &m1, &n1, lenStVarOne, pStVarOne);
-       if(sciErr.iErr)
-       {
-               printError(&sciErr, 0);
-               return 0;
-       }
-
-       if ( m1 * n1 != 1 )
-       {
-               Scierror(999,_("%s: Wrong type for input argument #%d: A string expected.\n"),fname,1);
-               return 0;
-       }
-
-       lenStVarOne = (int*)MALLOC(sizeof(int));
-       if (lenStVarOne == NULL)
-       {
-               Scierror(999,_("%s: No more memory.\n"), fname);
-               return 0;
-       }
-
-       /* get lengths */
-       sciErr = getMatrixOfString(_piKey, piAddressVarOne, &m1, &n1, lenStVarOne, pStVarOne);
-       if(sciErr.iErr)
-       {
-               printError(&sciErr, 0);
-               return 0;
-       }
-
-       pStVarOne = (char **)MALLOC(sizeof(char*));
-       if (pStVarOne == NULL)
-       {
-               Scierror(999,_("%s: No more memory.\n"), fname);
-               return 0;
-       }
-
-       pStVarOne[0] = (char*)MALLOC(sizeof(char*) * (lenStVarOne[0] + 1));
-
-       /* get strings */
-       sciErr = getMatrixOfString(_piKey, piAddressVarOne, &m1, &n1, lenStVarOne, pStVarOne);
-       if(sciErr.iErr)
-       {
-               printError(&sciErr, 0);
-               return 0;
-       }
-
-       Signal::notify(getScilabJavaVM(), pStVarOne[0]);
-       freeArrayOfString(pStVarOne, 1);
-
-       LhsVar(1) = 0;
-       PutLhsVar();
-       return 0;
+    types::String* pString  = NULL;
+    wchar_t* wcsInput       = NULL;
+
+    if(in.size() != 1)
+    {
+        ScierrorW(999, _W("%ls: Wrong number of input arguments: %d expected.\n"), L"notify" , 1);
+        return types::Function::Error;
+    }
+    if(in[0]->isString() == false)
+    {
+        ScierrorW(999, _W("%ls: Wrong type for input argument #%d: A string expected.\n"), L"notify", 1);
+        return types::Function::Error;
+    }
+    pString = in[0]->getAs<types::String>();
+
+    if(pString->isScalar() == FALSE)
+    {
+        ScierrorW(999, _W("%ls: Wrong size for input argument #%d: A string expected.\n"), L"notify" , 1);
+        return types::Function::Error;
+    }
+    wcsInput = pString->get(0);
+
+    char* strInput = wide_string_to_UTF8(wcsInput);
+    Signal_notify(getScilabJavaVM(), strInput);
+    FREE(strInput);
+
+    return types::Function::OK;
 }
 /*--------------------------------------------------------------------------*/
index cae95e1..c44059e 100644 (file)
@@ -262,16 +262,17 @@ lib /DEF:"$(ProjectDir)localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pl
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\cpp\action_binding_GiwsExports.cpp" />
     <ClCompile Include="DllmainAction_Binding.c" />
     <ClCompile Include="..\jni\GiwsException.cpp" />
     <ClCompile Include="..\..\sci_gateway\c\gw_action_binding.c" />
     <ClCompile Include="InterpreterManagement.c" />
     <ClCompile Include="..\jni\InterpreterManagement_wrap.c" />
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_notify.cpp" />
     <ClCompile Include="..\jni\Signal.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\dynlib_action_binding.h" />
+    <ClInclude Include="..\..\includes\action_binding_GiwsExports.hxx" />
     <ClInclude Include="..\jni\GiwsException.hxx" />
     <ClInclude Include="InterpreterManagement.h" />
     <ClInclude Include="..\jni\Signal.hxx" />
index 09a0fb9..91562e8 100644 (file)
     <ClCompile Include="..\jni\InterpreterManagement_wrap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\cpp\sci_notify.cpp">
+    <ClCompile Include="..\jni\Signal.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\jni\Signal.cpp">
+    <ClCompile Include="..\cpp\action_binding_GiwsExports.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -61,6 +61,9 @@
     <ClInclude Include="..\jni\Signal.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\includes\action_binding_GiwsExports.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\jni\InterpreterManagement.i">
diff --git a/scilab/modules/action_binding/src/cpp/action_binding_GiwsExports.cpp b/scilab/modules/action_binding/src/cpp/action_binding_GiwsExports.cpp
new file mode 100644 (file)
index 0000000..3f7d659
--- /dev/null
@@ -0,0 +1,19 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) DIGITEO - 2011 - Antoine ELIAS
+* 
+* This file must be used under the terms of the CeCILL.
+* This source file is licensed as described in the file COPYING, which
+* you should have received as part of this distribution.  The terms
+* are also available at    
+* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+*
+*/
+
+#include "action_binding_GiwsExports.hxx"
+
+using namespace org_scilab_modules_action_binding_utils;
+void Signal_notify(JavaVM * jvm_, char * ID)
+{
+    Signal::notify(jvm_, ID);
+}
  *
  */
 
-#include "Scierror.h"
-#include "localization.h"
+#include "action_binding_gw.hxx"
 
-int gw_action_binding()
+bool ActionBindingModule::Load()
 {
-       Scierror(999,_("Scilab '%s' module not installed.\n"), "action_binding");
-       return 0;
+       return true;
 }
index 1f5b4c1..4fa06b1 100644 (file)
       <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="..\action_binding\sci_gateway\cpp\action_binding_gw.vcxproj">
+      <Project>{3419b733-85a2-4f66-bc04-a5a8dc8fa057}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\api_scilab\api_scilab.vcxproj">
       <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
index 962aad0..56b0639 100644 (file)
@@ -33,5 +33,6 @@
 #include "../../helptools/includes/helptools_gw.hxx"
 #include "../../hdf5/includes/hdf5_gw.hxx"
 #include "../../dynamic_link/includes/dynamic_link_gw.hxx"
+#include "../../action_binding/includes/action_binding_gw.hxx"
 
 #endif /* !__MODULE_DECLARATION_HXX__ */
index e32329d..103c6c5 100644 (file)
@@ -301,6 +301,7 @@ bool FuncManager::CreateModuleList(void)
     m_ModuleMap.insert(pair<wstring, GW_MOD>(L"helptools", &HelptoolsModule::Load));
     m_ModuleMap.insert(pair<wstring, GW_MOD>(L"hdf5", &Hdf5Module::Load));
     m_ModuleMap.insert(pair<wstring, GW_MOD>(L"dynamic_link", &DynamicLinkModule::Load));
+    m_ModuleMap.insert(pair<wstring, GW_MOD>(L"action_binding", &ActionBindingModule::Load));
     if (ConfigVariable::getScilabMode() != SCILAB_NWNI)
     {
         m_ModuleMap.insert(pair<wstring, GW_MOD>(L"jvm", &JvmModule::Load));