summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorBruno JOFRET <bruno.jofret@scilab.org>2010-05-07 15:14:05 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-05-10 13:31:50 +0200
commit17b7a9f89ddcd70739ca53506ce1daad63fcf058 (patch)
treeb95d37717b2b507d676dde8d99b51d8282a2c0f4 /scilab/modules
parente99f2d527ac2e8443d2bbee1f507c3f257a82d56 (diff)
downloadscilab-17b7a9f89ddcd70739ca53506ce1daad63fcf058.zip
scilab-17b7a9f89ddcd70739ca53506ce1daad63fcf058.tar.gz
Move command queue management to core. Action_bindings is no more requested for scilab engine
Change-Id: Iea70d535e0ac21d484dec5cc1a195e4e419ed0f2
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/Makefile.am2
-rw-r--r--scilab/modules/Makefile.in2
-rw-r--r--scilab/modules/action_binding/Makefile.am3
-rw-r--r--scilab/modules/action_binding/Makefile.in7
-rw-r--r--scilab/modules/action_binding/src/c/InterpreterManagement.c2
-rw-r--r--scilab/modules/action_binding/src/c/LibScilab_Import.def5
-rw-r--r--scilab/modules/action_binding/src/c/action_binding.vcproj14
-rw-r--r--scilab/modules/call_scilab/src/c/call_scilab.c2
-rw-r--r--scilab/modules/console/src/c/LibScilab_Import.def1
-rw-r--r--scilab/modules/console/src/c/dropFiles.c2
-rw-r--r--scilab/modules/core/Makefile.am3
-rw-r--r--scilab/modules/core/Makefile.in14
-rw-r--r--scilab/modules/core/includes/storeCommand.h (renamed from scilab/modules/action_binding/includes/dynamic_menus.h)21
-rw-r--r--scilab/modules/core/src/c/core.vcproj8
-rw-r--r--scilab/modules/core/src/c/parse.c3
-rw-r--r--scilab/modules/core/src/c/run.c3
-rw-r--r--scilab/modules/core/src/c/storeCommand.c (renamed from scilab/modules/action_binding/src/c/dynamic_menus.c)6
-rw-r--r--scilab/modules/scicos/src/c/scicos.c2
-rw-r--r--scilab/modules/shell/src/c/GetCommandLine.c2
-rw-r--r--scilab/modules/shell/src/c/LibScilab_Import.def2
-rw-r--r--scilab/modules/shell/src/c/windows/TermCommand.c2
-rw-r--r--scilab/modules/shell/src/c/windows/TermConsole.c2
-rw-r--r--scilab/modules/tclsci/LibScilab_Import.def8
-rw-r--r--scilab/modules/tclsci/src/c/ScilabEval.c2
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/LibScilab_Import.def3
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/WndThread.c2
26 files changed, 66 insertions, 57 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index dd122b8..caa64ee 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -129,6 +129,7 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
129 $(top_builddir)/modules/graphics/libscigraphics.la \ 129 $(top_builddir)/modules/graphics/libscigraphics.la \
130 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \ 130 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \
131 $(top_builddir)/modules/console/libsciconsole.la \ 131 $(top_builddir)/modules/console/libsciconsole.la \
132 $(top_builddir)/modules/action_binding/libsciaction_binding.la \
132 $(top_builddir)/modules/jvm/libscijvm.la \ 133 $(top_builddir)/modules/jvm/libscijvm.la \
133 $(top_builddir)/modules/xcos/libscixcos.la \ 134 $(top_builddir)/modules/xcos/libscixcos.la \
134 $(top_builddir)/modules/xpad/libscixpad.la 135 $(top_builddir)/modules/xpad/libscixpad.la
@@ -178,7 +179,6 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
178 $(top_builddir)/modules/shell/libscishell.la \ 179 $(top_builddir)/modules/shell/libscishell.la \
179 $(top_builddir)/modules/completion/libscicompletion.la \ 180 $(top_builddir)/modules/completion/libscicompletion.la \
180 $(top_builddir)/modules/history_manager/libscihistory_manager.la \ 181 $(top_builddir)/modules/history_manager/libscihistory_manager.la \
181 $(top_builddir)/modules/action_binding/libsciaction_binding.la \
182 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 182 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
183 $(top_builddir)/modules/string/libscistring.la \ 183 $(top_builddir)/modules/string/libscistring.la \
184 $(top_builddir)/modules/fftw/libscifftw.la \ 184 $(top_builddir)/modules/fftw/libscifftw.la \
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index cd34418..4b00f79 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -468,6 +468,7 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
468 $(top_builddir)/modules/graphics/libscigraphics.la \ 468 $(top_builddir)/modules/graphics/libscigraphics.la \
469 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \ 469 $(top_builddir)/modules/graphic_export/libscigraphic_export.la \
470 $(top_builddir)/modules/console/libsciconsole.la \ 470 $(top_builddir)/modules/console/libsciconsole.la \
471 $(top_builddir)/modules/action_binding/libsciaction_binding.la \
471 $(top_builddir)/modules/jvm/libscijvm.la \ 472 $(top_builddir)/modules/jvm/libscijvm.la \
472 $(top_builddir)/modules/xcos/libscixcos.la \ 473 $(top_builddir)/modules/xcos/libscixcos.la \
473 $(top_builddir)/modules/xpad/libscixpad.la $(am__append_3) 474 $(top_builddir)/modules/xpad/libscixpad.la $(am__append_3)
@@ -509,7 +510,6 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
509 $(top_builddir)/modules/shell/libscishell.la \ 510 $(top_builddir)/modules/shell/libscishell.la \
510 $(top_builddir)/modules/completion/libscicompletion.la \ 511 $(top_builddir)/modules/completion/libscicompletion.la \
511 $(top_builddir)/modules/history_manager/libscihistory_manager.la \ 512 $(top_builddir)/modules/history_manager/libscihistory_manager.la \
512 $(top_builddir)/modules/action_binding/libsciaction_binding.la \
513 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 513 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
514 $(top_builddir)/modules/string/libscistring.la \ 514 $(top_builddir)/modules/string/libscistring.la \
515 $(top_builddir)/modules/fftw/libscifftw.la \ 515 $(top_builddir)/modules/fftw/libscifftw.la \
diff --git a/scilab/modules/action_binding/Makefile.am b/scilab/modules/action_binding/Makefile.am
index ca6e577..30ac3f39 100644
--- a/scilab/modules/action_binding/Makefile.am
+++ b/scilab/modules/action_binding/Makefile.am
@@ -13,8 +13,7 @@ if GUI
13USEANT=1 13USEANT=1
14 14
15# List of the c files 15# List of the c files
16ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c \ 16ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c
17src/c/dynamic_menus.c
18 17
19# List of the gateway c files 18# List of the gateway c files
20CONSOLE_C_JNI_SOURCES = src/jni/InterpreterManagement_wrap.c 19CONSOLE_C_JNI_SOURCES = src/jni/InterpreterManagement_wrap.c
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index b840f07..2c20fc1 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -124,8 +124,7 @@ am__libsciaction_binding_la_SOURCES_DIST = \
124@GUI_FALSE@ libsciaction_binding_la-noaction_binding.lo \ 124@GUI_FALSE@ libsciaction_binding_la-noaction_binding.lo \
125@GUI_FALSE@ libsciaction_binding_la-dynamic_menus.lo 125@GUI_FALSE@ libsciaction_binding_la-dynamic_menus.lo
126@GUI_TRUE@am__objects_1 = \ 126@GUI_TRUE@am__objects_1 = \
127@GUI_TRUE@ libsciaction_binding_la-InterpreterManagement.lo \ 127@GUI_TRUE@ libsciaction_binding_la-InterpreterManagement.lo
128@GUI_TRUE@ libsciaction_binding_la-dynamic_menus.lo
129@GUI_TRUE@am__objects_2 = libsciaction_binding_la-InterpreterManagement_wrap.lo 128@GUI_TRUE@am__objects_2 = libsciaction_binding_la-InterpreterManagement_wrap.lo
130am_libsciaction_binding_la_OBJECTS = $(am__objects_1) $(am__objects_2) 129am_libsciaction_binding_la_OBJECTS = $(am__objects_1) $(am__objects_2)
131libsciaction_binding_la_OBJECTS = \ 130libsciaction_binding_la_OBJECTS = \
@@ -402,9 +401,7 @@ top_srcdir = @top_srcdir@
402 401
403 402
404# List of the c files 403# List of the c files
405@GUI_TRUE@ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c \ 404@GUI_TRUE@ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c
406@GUI_TRUE@src/c/dynamic_menus.c
407
408 405
409# List of the gateway c files 406# List of the gateway c files
410@GUI_TRUE@CONSOLE_C_JNI_SOURCES = src/jni/InterpreterManagement_wrap.c 407@GUI_TRUE@CONSOLE_C_JNI_SOURCES = src/jni/InterpreterManagement_wrap.c
diff --git a/scilab/modules/action_binding/src/c/InterpreterManagement.c b/scilab/modules/action_binding/src/c/InterpreterManagement.c
index f816842..7853610 100644
--- a/scilab/modules/action_binding/src/c/InterpreterManagement.c
+++ b/scilab/modules/action_binding/src/c/InterpreterManagement.c
@@ -12,7 +12,7 @@
12 12
13#include <signal.h> /* for SIGINT */ 13#include <signal.h> /* for SIGINT */
14#include "InterpreterManagement.h" 14#include "InterpreterManagement.h"
15#include "dynamic_menus.h" 15#include "storeCommand.h"
16#include "sigbas.h" 16#include "sigbas.h"
17/*--------------------------------------------------------------------------*/ 17/*--------------------------------------------------------------------------*/
18int putCommandInScilabQueue(char *command) 18int putCommandInScilabQueue(char *command)
diff --git a/scilab/modules/action_binding/src/c/LibScilab_Import.def b/scilab/modules/action_binding/src/c/LibScilab_Import.def
index 7442f11..70a8266 100644
--- a/scilab/modules/action_binding/src/c/LibScilab_Import.def
+++ b/scilab/modules/action_binding/src/c/LibScilab_Import.def
@@ -6,4 +6,7 @@ EXPORTS
6 iop_ 6 iop_
7 com_ 7 com_
8 ;core_f 8 ;core_f
9 sigbas_ \ No newline at end of file 9 sigbas_
10 StoreCommand
11 StoreCommandWithFlag
12 \ No newline at end of file
diff --git a/scilab/modules/action_binding/src/c/action_binding.vcproj b/scilab/modules/action_binding/src/c/action_binding.vcproj
index 9af0bec..ec1bf43 100644
--- a/scilab/modules/action_binding/src/c/action_binding.vcproj
+++ b/scilab/modules/action_binding/src/c/action_binding.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -380,10 +380,6 @@
380 > 380 >
381 </File> 381 </File>
382 <File 382 <File
383 RelativePath=".\dynamic_menus.c"
384 >
385 </File>
386 <File
387 RelativePath=".\InterpreterManagement.c" 383 RelativePath=".\InterpreterManagement.c"
388 > 384 >
389 </File> 385 </File>
@@ -397,10 +393,6 @@
397 Filter="h;hpp;hxx;hm;inl" 393 Filter="h;hpp;hxx;hm;inl"
398 > 394 >
399 <File 395 <File
400 RelativePath="..\..\includes\dynamic_menus.h"
401 >
402 </File>
403 <File
404 RelativePath="..\..\includes\dynlib_action_binding.h" 396 RelativePath="..\..\includes\dynlib_action_binding.h"
405 > 397 >
406 </File> 398 </File>
@@ -408,10 +400,6 @@
408 RelativePath=".\InterpreterManagement.h" 400 RelativePath=".\InterpreterManagement.h"
409 > 401 >
410 </File> 402 </File>
411 <File
412 RelativePath=".\resource.h"
413 >
414 </File>
415 </Filter> 403 </Filter>
416 <Filter 404 <Filter
417 Name="localization" 405 Name="localization"
diff --git a/scilab/modules/call_scilab/src/c/call_scilab.c b/scilab/modules/call_scilab/src/c/call_scilab.c
index 2da0537..8b5a3a1 100644
--- a/scilab/modules/call_scilab/src/c/call_scilab.c
+++ b/scilab/modules/call_scilab/src/c/call_scilab.c
@@ -24,7 +24,7 @@
24#include "scirun.h" 24#include "scirun.h"
25#include "scilabmode.h" 25#include "scilabmode.h"
26#include "sciquit.h" 26#include "sciquit.h"
27#include "dynamic_menus.h" 27#include "storeCommand.h"
28#include "WindowList.h" 28#include "WindowList.h"
29#include "../../core/src/c/TerminateCore.h" 29#include "../../core/src/c/TerminateCore.h"
30 30
diff --git a/scilab/modules/console/src/c/LibScilab_Import.def b/scilab/modules/console/src/c/LibScilab_Import.def
index d240871..9f968b9 100644
--- a/scilab/modules/console/src/c/LibScilab_Import.def
+++ b/scilab/modules/console/src/c/LibScilab_Import.def
@@ -6,4 +6,5 @@ EXPORTS
6; 6;
7getSCIHOME 7getSCIHOME
8with_module 8with_module
9StoreCommand
9; \ No newline at end of file 10; \ No newline at end of file
diff --git a/scilab/modules/console/src/c/dropFiles.c b/scilab/modules/console/src/c/dropFiles.c
index 578f7ea..39d59e4 100644
--- a/scilab/modules/console/src/c/dropFiles.c
+++ b/scilab/modules/console/src/c/dropFiles.c
@@ -16,7 +16,7 @@
16#include <stdlib.h> 16#include <stdlib.h>
17#include "dropFiles.h" 17#include "dropFiles.h"
18#include "MALLOC.h" 18#include "MALLOC.h"
19#include "../../../action_binding/includes/dynamic_menus.h" /* storecommand */ 19#include "../../../core/includes/storeCommand.h" /* storecommand */
20#include "../../../fileio/includes/FindFileExtension.h" 20#include "../../../fileio/includes/FindFileExtension.h"
21#include "../../../fileio/includes/URIFileToFilename.h" 21#include "../../../fileio/includes/URIFileToFilename.h"
22#include "../../../string/includes/stricmp.h" 22#include "../../../string/includes/stricmp.h"
diff --git a/scilab/modules/core/Makefile.am b/scilab/modules/core/Makefile.am
index 422e9be..9a4c7e5 100644
--- a/scilab/modules/core/Makefile.am
+++ b/scilab/modules/core/Makefile.am
@@ -85,7 +85,8 @@ src/c/funcprot.c \
85src/c/eqid.c \ 85src/c/eqid.c \
86src/c/exitCodeValue.c \ 86src/c/exitCodeValue.c \
87src/c/getversion.c \ 87src/c/getversion.c \
88src/c/dynamic_tclsci.c 88src/c/dynamic_tclsci.c \
89src/c/storeCommand.c
89 90
90CORE_CPP_SOURCES = src/cpp/hashtable_core.cpp \ 91CORE_CPP_SOURCES = src/cpp/hashtable_core.cpp \
91src/cpp/namstr.cpp \ 92src/cpp/namstr.cpp \
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index 234ae07..3cc7ebb 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -151,7 +151,7 @@ am__libscicore_la_SOURCES_DIST = src/c/inffic.c src/c/cs2st.c \
151 src/c/recursionFunction.c src/c/typename.c \ 151 src/c/recursionFunction.c src/c/typename.c \
152 src/c/inittypenames.c src/c/funcprot.c src/c/eqid.c \ 152 src/c/inittypenames.c src/c/funcprot.c src/c/eqid.c \
153 src/c/exitCodeValue.c src/c/getversion.c \ 153 src/c/exitCodeValue.c src/c/getversion.c \
154 src/c/dynamic_tclsci.c src/c/scimem64.c \ 154 src/c/dynamic_tclsci.c src/c/storeCommand.c src/c/scimem64.c \
155 src/cpp/hashtable_core.cpp src/cpp/namstr.cpp \ 155 src/cpp/hashtable_core.cpp src/cpp/namstr.cpp \
156 src/cpp/search_functions.cpp src/fortran/clunit.f \ 156 src/cpp/search_functions.cpp src/fortran/clunit.f \
157 src/fortran/getlin.f src/fortran/allowptr.f \ 157 src/fortran/getlin.f src/fortran/allowptr.f \
@@ -285,7 +285,7 @@ am__objects_2 = libscicore_la-inffic.lo libscicore_la-cs2st.lo \
285 libscicore_la-inittypenames.lo libscicore_la-funcprot.lo \ 285 libscicore_la-inittypenames.lo libscicore_la-funcprot.lo \
286 libscicore_la-eqid.lo libscicore_la-exitCodeValue.lo \ 286 libscicore_la-eqid.lo libscicore_la-exitCodeValue.lo \
287 libscicore_la-getversion.lo libscicore_la-dynamic_tclsci.lo \ 287 libscicore_la-getversion.lo libscicore_la-dynamic_tclsci.lo \
288 $(am__objects_1) 288 libscicore_la-storeCommand.lo $(am__objects_1)
289am__objects_3 = libscicore_la-hashtable_core.lo \ 289am__objects_3 = libscicore_la-hashtable_core.lo \
290 libscicore_la-namstr.lo libscicore_la-search_functions.lo 290 libscicore_la-namstr.lo libscicore_la-search_functions.lo
291@USE_DYNAMIC_STACK_TRUE@am__objects_4 = relocstack.lo 291@USE_DYNAMIC_STACK_TRUE@am__objects_4 = relocstack.lo
@@ -655,7 +655,7 @@ CORE_C_SOURCES = src/c/inffic.c src/c/cs2st.c src/c/tmpdir.c \
655 src/c/recursionFunction.c src/c/typename.c \ 655 src/c/recursionFunction.c src/c/typename.c \
656 src/c/inittypenames.c src/c/funcprot.c src/c/eqid.c \ 656 src/c/inittypenames.c src/c/funcprot.c src/c/eqid.c \
657 src/c/exitCodeValue.c src/c/getversion.c \ 657 src/c/exitCodeValue.c src/c/getversion.c \
658 src/c/dynamic_tclsci.c $(am__append_1) 658 src/c/dynamic_tclsci.c src/c/storeCommand.c $(am__append_1)
659CORE_CPP_SOURCES = src/cpp/hashtable_core.cpp \ 659CORE_CPP_SOURCES = src/cpp/hashtable_core.cpp \
660src/cpp/namstr.cpp \ 660src/cpp/namstr.cpp \
661src/cpp/search_functions.cpp 661src/cpp/search_functions.cpp
@@ -1126,6 +1126,7 @@ distclean-compile:
1126@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-stack2.Plo@am__quote@ 1126@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-stack2.Plo@am__quote@
1127@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-stack3.Plo@am__quote@ 1127@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-stack3.Plo@am__quote@
1128@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-stackinfo.Plo@am__quote@ 1128@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-stackinfo.Plo@am__quote@
1129@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-storeCommand.Plo@am__quote@
1129@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-str2sci.Plo@am__quote@ 1130@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-str2sci.Plo@am__quote@
1130@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-syncexec.Plo@am__quote@ 1131@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-syncexec.Plo@am__quote@
1131@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-terme.Plo@am__quote@ 1132@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-terme.Plo@am__quote@
@@ -1699,6 +1700,13 @@ libscicore_la-dynamic_tclsci.lo: src/c/dynamic_tclsci.c
1699@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1700@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1700@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -c -o libscicore_la-dynamic_tclsci.lo `test -f 'src/c/dynamic_tclsci.c' || echo '$(srcdir)/'`src/c/dynamic_tclsci.c 1701@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -c -o libscicore_la-dynamic_tclsci.lo `test -f 'src/c/dynamic_tclsci.c' || echo '$(srcdir)/'`src/c/dynamic_tclsci.c
1701 1702
1703libscicore_la-storeCommand.lo: src/c/storeCommand.c
1704@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -MT libscicore_la-storeCommand.lo -MD -MP -MF $(DEPDIR)/libscicore_la-storeCommand.Tpo -c -o libscicore_la-storeCommand.lo `test -f 'src/c/storeCommand.c' || echo '$(srcdir)/'`src/c/storeCommand.c
1705@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libscicore_la-storeCommand.Tpo $(DEPDIR)/libscicore_la-storeCommand.Plo
1706@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/storeCommand.c' object='libscicore_la-storeCommand.lo' libtool=yes @AMDEPBACKSLASH@
1707@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1708@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -c -o libscicore_la-storeCommand.lo `test -f 'src/c/storeCommand.c' || echo '$(srcdir)/'`src/c/storeCommand.c
1709
1702libscicore_la-scimem64.lo: src/c/scimem64.c 1710libscicore_la-scimem64.lo: src/c/scimem64.c
1703@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -MT libscicore_la-scimem64.lo -MD -MP -MF $(DEPDIR)/libscicore_la-scimem64.Tpo -c -o libscicore_la-scimem64.lo `test -f 'src/c/scimem64.c' || echo '$(srcdir)/'`src/c/scimem64.c 1711@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -MT libscicore_la-scimem64.lo -MD -MP -MF $(DEPDIR)/libscicore_la-scimem64.Tpo -c -o libscicore_la-scimem64.lo `test -f 'src/c/scimem64.c' || echo '$(srcdir)/'`src/c/scimem64.c
1704@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libscicore_la-scimem64.Tpo $(DEPDIR)/libscicore_la-scimem64.Plo 1712@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libscicore_la-scimem64.Tpo $(DEPDIR)/libscicore_la-scimem64.Plo
diff --git a/scilab/modules/action_binding/includes/dynamic_menus.h b/scilab/modules/core/includes/storeCommand.h
index e93ec68..97c9186 100644
--- a/scilab/modules/action_binding/includes/dynamic_menus.h
+++ b/scilab/modules/core/includes/storeCommand.h
@@ -11,10 +11,9 @@
11 * 11 *
12 */ 12 */
13 13
14#ifndef __DYNAMIC_MENUS_H__ 14#ifndef __STORECOMMAND_H__
15#define __DYNAMIC_MENUS_H__ 15#define __STORECOMMAND_H__
16 16
17#include "dynlib_action_binding.h"
18#include "machine.h" 17#include "machine.h"
19 18
20/* 19/*
@@ -22,7 +21,7 @@
22 * commandQueue 21 * commandQueue
23 * @return 22 * @return
24 */ 23 */
25ACTION_BINDING_IMPEXP int ismenu(void); 24int ismenu(void);
26 25
27/** 26/**
28 * try to execute a command or add it to the end of command queue 27 * try to execute a command or add it to the end of command queue
@@ -30,7 +29,7 @@ ACTION_BINDING_IMPEXP int ismenu(void);
30 * @param command the command 29 * @param command the command
31 * @return <ReturnValue> 30 * @return <ReturnValue>
32 */ 31 */
33ACTION_BINDING_IMPEXP int StoreCommand (char *command); 32int StoreCommand (char *command);
34 33
35/** 34/**
36 * try to execute a command or add it to the end of command queue 35 * try to execute a command or add it to the end of command queue
@@ -39,7 +38,7 @@ ACTION_BINDING_IMPEXP int StoreCommand (char *command);
39 * @param flag a internal execution flag for sequential execution 38 * @param flag a internal execution flag for sequential execution
40 * @return <ReturnValue> 39 * @return <ReturnValue>
41 */ 40 */
42ACTION_BINDING_IMPEXP int StoreCommandWithFlag (char *command, int flag); 41int StoreCommandWithFlag (char *command, int flag);
43 42
44/** 43/**
45 * @TODO add comment 44 * @TODO add comment
@@ -47,24 +46,24 @@ ACTION_BINDING_IMPEXP int StoreCommandWithFlag (char *command, int flag);
47 * @param str 46 * @param str
48 * @return <ReturnValue> 47 * @return <ReturnValue>
49 */ 48 */
50ACTION_BINDING_IMPEXP int GetCommand (char *str); 49int GetCommand (char *str);
51 50
52/** 51/**
53* try to execute a command or add it to the _BEGINNING_ of command queue 52* try to execute a command or add it to the _BEGINNING_ of command queue
54* flag = 0 : the command is not shown in scilab window 53* flag = 0 : the command is not shown in scilab window
55* flag = 1 : the command is shown in scilab window (if at prompt) and executed sequentially 54* flag = 1 : the command is shown in scilab window (if at prompt) and executed sequentially
56*/ 55*/
57ACTION_BINDING_IMPEXP int StorePrioritaryCommandWithFlag (char *command,int flag); 56int StorePrioritaryCommandWithFlag (char *command,int flag);
58 57
59/** 58/**
60* 59*
61*/ 60*/
62ACTION_BINDING_IMPEXP int C2F(getmen)(char * btn_cmd,int * lb, int * entry); 61int C2F(getmen)(char * btn_cmd,int * lb, int * entry);
63 62
64/** 63/**
65* check if command queue is empty 64* check if command queue is empty
66* @return 1 if empty , 0 is not empty 65* @return 1 if empty , 0 is not empty
67*/ 66*/
68ACTION_BINDING_IMPEXP int isEmptyCommandQueue(void); 67int isEmptyCommandQueue(void);
69 68
70#endif /* __DYNAMIC_MENUS_H__ */ 69#endif /* __STORECOMMAND_H__ */
diff --git a/scilab/modules/core/src/c/core.vcproj b/scilab/modules/core/src/c/core.vcproj
index e5c58b9..80c5a23 100644
--- a/scilab/modules/core/src/c/core.vcproj
+++ b/scilab/modules/core/src/c/core.vcproj
@@ -877,6 +877,10 @@
877 > 877 >
878 </File> 878 </File>
879 <File 879 <File
880 RelativePath=".\storeCommand.c"
881 >
882 </File>
883 <File
880 RelativePath=".\str2sci.c" 884 RelativePath=".\str2sci.c"
881 > 885 >
882 </File> 886 </File>
@@ -1286,6 +1290,10 @@
1286 > 1290 >
1287 </File> 1291 </File>
1288 <File 1292 <File
1293 RelativePath="..\..\includes\storeCommand.h"
1294 >
1295 </File>
1296 <File
1289 RelativePath=".\str2sci.h" 1297 RelativePath=".\str2sci.h"
1290 > 1298 >
1291 </File> 1299 </File>
diff --git a/scilab/modules/core/src/c/parse.c b/scilab/modules/core/src/c/parse.c
index c1ad9e1..d899f49 100644
--- a/scilab/modules/core/src/c/parse.c
+++ b/scilab/modules/core/src/c/parse.c
@@ -17,7 +17,6 @@
17#include <string.h> 17#include <string.h>
18#include <stdio.h> 18#include <stdio.h>
19#include "stack-c.h" 19#include "stack-c.h"
20#include "dynamic_menus.h"
21/*--------------------------------------------------------------------------*/ 20/*--------------------------------------------------------------------------*/
22#include "parse.h" 21#include "parse.h"
23#include "basout.h" 22#include "basout.h"
@@ -29,7 +28,7 @@
29#include "Scierror.h" 28#include "Scierror.h"
30#include "do_error_number.h" 29#include "do_error_number.h"
31#include "prompt.h" 30#include "prompt.h"
32#include "dynamic_menus.h" 31#include "storeCommand.h"
33#include "msgs.h" 32#include "msgs.h"
34#include "eqid.h" 33#include "eqid.h"
35/*--------------------------------------------------------------------------*/ 34/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/core/src/c/run.c b/scilab/modules/core/src/c/run.c
index 8132404..2240927 100644
--- a/scilab/modules/core/src/c/run.c
+++ b/scilab/modules/core/src/c/run.c
@@ -28,13 +28,12 @@
28#include "stack-c.h" 28#include "stack-c.h"
29#include "run.h" 29#include "run.h"
30#include "basout.h" 30#include "basout.h"
31#include "dynamic_menus.h"
32#include "parse.h" 31#include "parse.h"
33#include "localization.h" 32#include "localization.h"
34#include "core_math.h" 33#include "core_math.h"
35#include "scilabmode.h" 34#include "scilabmode.h"
36#include "stack-def.h" /* C2F(basbrk) */ 35#include "stack-def.h" /* C2F(basbrk) */
37#include "dynamic_menus.h" 36#include "storeCommand.h"
38#include "do_error_number.h" 37#include "do_error_number.h"
39#include "Scierror.h" 38#include "Scierror.h"
40#include "msgs.h" 39#include "msgs.h"
diff --git a/scilab/modules/action_binding/src/c/dynamic_menus.c b/scilab/modules/core/src/c/storeCommand.c
index 18887d6..58132f1889 100644
--- a/scilab/modules/action_binding/src/c/dynamic_menus.c
+++ b/scilab/modules/core/src/c/storeCommand.c
@@ -15,7 +15,7 @@
15#include <string.h> 15#include <string.h>
16#include "stack-c.h" 16#include "stack-c.h"
17#include "MALLOC.h" 17#include "MALLOC.h"
18#include "dynamic_menus.h" 18#include "storeCommand.h"
19#include "sciprint.h" 19#include "sciprint.h"
20#include "sciprint_full.h" 20#include "sciprint_full.h"
21#include "localization.h" 21#include "localization.h"
@@ -30,11 +30,7 @@
30 * int C2F(getmen)(char * btn_cmd,int * lb, int * entry) 30 * int C2F(getmen)(char * btn_cmd,int * lb, int * entry)
31*/ 31*/
32/*--------------------------------------------------------------------------*/ 32/*--------------------------------------------------------------------------*/
33#ifdef _MSC_VER
34#define IMPORT_SIGNAL __declspec(dllimport)
35#else
36#define IMPORT_SIGNAL extern 33#define IMPORT_SIGNAL extern
37#endif
38/*--------------------------------------------------------------------------*/ 34/*--------------------------------------------------------------------------*/
39typedef struct commandRec 35typedef struct commandRec
40{ 36{
diff --git a/scilab/modules/scicos/src/c/scicos.c b/scilab/modules/scicos/src/c/scicos.c
index cc6ad5e..8adcc1d 100644
--- a/scilab/modules/scicos/src/c/scicos.c
+++ b/scilab/modules/scicos/src/c/scicos.c
@@ -61,7 +61,7 @@
61#include "import.h" 61#include "import.h"
62#include "blocks.h" 62#include "blocks.h"
63#include "core_math.h" 63#include "core_math.h"
64#include "dynamic_menus.h" 64#include "storeCommand.h"
65#include "syncexec.h" 65#include "syncexec.h"
66#include "realtime.h" 66#include "realtime.h"
67#include "math_graphics.h" 67#include "math_graphics.h"
diff --git a/scilab/modules/shell/src/c/GetCommandLine.c b/scilab/modules/shell/src/c/GetCommandLine.c
index 5312c38..b61afcf 100644
--- a/scilab/modules/shell/src/c/GetCommandLine.c
+++ b/scilab/modules/shell/src/c/GetCommandLine.c
@@ -24,7 +24,7 @@
24#include "MALLOC.h" 24#include "MALLOC.h"
25#include "prompt.h" 25#include "prompt.h"
26#include "HistoryManager.h" 26#include "HistoryManager.h"
27#include "dynamic_menus.h" /* for ismenu() */ 27#include "storeCommand.h" /* for ismenu() */
28#include "zzledt.h" 28#include "zzledt.h"
29#include "GetCommandLine.h" 29#include "GetCommandLine.h"
30#include "TermReadAndProcess.h" 30#include "TermReadAndProcess.h"
diff --git a/scilab/modules/shell/src/c/LibScilab_Import.def b/scilab/modules/shell/src/c/LibScilab_Import.def
index 44e88cd..bbb4e91 100644
--- a/scilab/modules/shell/src/c/LibScilab_Import.def
+++ b/scilab/modules/shell/src/c/LibScilab_Import.def
@@ -26,3 +26,5 @@ set_is_reading
26freeArrayOfString 26freeArrayOfString
27vartype_ 27vartype_
28getWarningMode 28getWarningMode
29ismenu
30StoreCommand
diff --git a/scilab/modules/shell/src/c/windows/TermCommand.c b/scilab/modules/shell/src/c/windows/TermCommand.c
index 68f2cf8..254900f 100644
--- a/scilab/modules/shell/src/c/windows/TermCommand.c
+++ b/scilab/modules/shell/src/c/windows/TermCommand.c
@@ -14,7 +14,7 @@
14#include "TermCommand.h" 14#include "TermCommand.h"
15#include "machine.h" /* C2F */ 15#include "machine.h" /* C2F */
16#include "sigbas.h" /* C2F (sigbas) */ 16#include "sigbas.h" /* C2F (sigbas) */
17#include "dynamic_menus.h" /* StoreCommand */ 17#include "storeCommand.h" /* StoreCommand */
18#include "clrscr_nw.h" 18#include "clrscr_nw.h"
19#include "TermLine.h" 19#include "TermLine.h"
20#include "MALLOC.h" 20#include "MALLOC.h"
diff --git a/scilab/modules/shell/src/c/windows/TermConsole.c b/scilab/modules/shell/src/c/windows/TermConsole.c
index c094118..7eb8fb9 100644
--- a/scilab/modules/shell/src/c/windows/TermConsole.c
+++ b/scilab/modules/shell/src/c/windows/TermConsole.c
@@ -22,7 +22,7 @@
22#include "TermLine.h" 22#include "TermLine.h"
23#include "scilines.h" 23#include "scilines.h"
24#include "HistoryManager.h" 24#include "HistoryManager.h"
25#include "dynamic_menus.h" /* ismenu */ 25#include "storeCommand.h" /* ismenu */
26#include "localization.h" 26#include "localization.h"
27/*--------------------------------------------------------------------------*/ 27/*--------------------------------------------------------------------------*/
28#ifdef CR_1 28#ifdef CR_1
diff --git a/scilab/modules/tclsci/LibScilab_Import.def b/scilab/modules/tclsci/LibScilab_Import.def
index f7d0f5f..71f4cd8 100644
--- a/scilab/modules/tclsci/LibScilab_Import.def
+++ b/scilab/modules/tclsci/LibScilab_Import.def
@@ -23,3 +23,11 @@ EXPORTS
23 getSCIpath 23 getSCIpath
24 callFunctionFromGateway 24 callFunctionFromGateway
25 freeArrayOfString 25 freeArrayOfString
26 StoreCommand
27 StoreCommandWithFlag
28 GetCommand
29 ismenu
30 StorePrioritaryCommandWithFlag
31
32
33 \ No newline at end of file
diff --git a/scilab/modules/tclsci/src/c/ScilabEval.c b/scilab/modules/tclsci/src/c/ScilabEval.c
index 02b8133..d69c436 100644
--- a/scilab/modules/tclsci/src/c/ScilabEval.c
+++ b/scilab/modules/tclsci/src/c/ScilabEval.c
@@ -20,7 +20,7 @@
20#include "localization.h" 20#include "localization.h"
21#include "../../localization/includes/localization.h" 21#include "../../localization/includes/localization.h"
22#include "syncexec.h" 22#include "syncexec.h"
23#include "dynamic_menus.h" 23#include "storeCommand.h"
24#ifdef _MSC_VER 24#ifdef _MSC_VER
25#include "strdup_windows.h" 25#include "strdup_windows.h"
26#endif 26#endif
diff --git a/scilab/modules/windows_tools/src/c/scilab_windows/LibScilab_Import.def b/scilab/modules/windows_tools/src/c/scilab_windows/LibScilab_Import.def
index 0b9b82f..cb3bc43 100644
--- a/scilab/modules/windows_tools/src/c/scilab_windows/LibScilab_Import.def
+++ b/scilab/modules/windows_tools/src/c/scilab_windows/LibScilab_Import.def
@@ -13,4 +13,5 @@ setSCIpath
13sciquit 13sciquit
14realmain 14realmain
15InitializeLaunchScilabSignal 15InitializeLaunchScilabSignal
16with_module \ No newline at end of file 16with_module
17StoreCommand
diff --git a/scilab/modules/windows_tools/src/c/scilab_windows/WndThread.c b/scilab/modules/windows_tools/src/c/scilab_windows/WndThread.c
index 52194f3..e75e1d7 100644
--- a/scilab/modules/windows_tools/src/c/scilab_windows/WndThread.c
+++ b/scilab/modules/windows_tools/src/c/scilab_windows/WndThread.c
@@ -18,7 +18,7 @@
18#include "MALLOC.h" 18#include "MALLOC.h"
19#include "version.h" 19#include "version.h"
20#include "wmcopydata.h" 20#include "wmcopydata.h"
21#include "dynamic_menus.h" 21#include "storeCommand.h"
22#include "strdup_windows.h" 22#include "strdup_windows.h"
23/*--------------------------------------------------------------------------*/ 23/*--------------------------------------------------------------------------*/
24static HWND hWndScilab = NULL; 24static HWND hWndScilab = NULL;