rename YaspRead/Write functions and files in scilabRead/Write and mode scilabRead... 42/4742/9
Antoine ELIAS [Wed, 24 Aug 2011 13:21:39 +0000 (15:21 +0200)]
Change-Id: Iaed642a57f82f6ec54ec3377bb8851045dc9791f

70 files changed:
scilab/Scilab.sln
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/ast/includes/run_AssignExp.hxx
scilab/modules/ast/includes/run_CallExp.hxx
scilab/modules/ast/includes/runvisitor.hxx
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/includes/SetConsolePrompt.h [moved from scilab/modules/console/src/c/SetConsolePrompt.h with 100% similarity]
scilab/modules/console/includes/console_gw.hxx [new file with mode: 0644]
scilab/modules/console/includes/dynlib_console_gw.h [new file with mode: 0644]
scilab/modules/console/includes/gw_console.h
scilab/modules/console/includes/scilabRead.h [new file with mode: 0644]
scilab/modules/console/sci_gateway/c/gw_console.c
scilab/modules/console/sci_gateway/cpp/console_gw.cpp [new file with mode: 0644]
scilab/modules/console/sci_gateway/cpp/console_gw.vcxproj [new file with mode: 0644]
scilab/modules/console/sci_gateway/cpp/console_gw.vcxproj.filters [new file with mode: 0644]
scilab/modules/console/sci_gateway/cpp/sci_clc.cpp [new file with mode: 0644]
scilab/modules/console/sci_gateway/cpp/sci_iswaitingforinput.cpp [new file with mode: 0644]
scilab/modules/console/sci_gateway/cpp/sci_lines.cpp [new file with mode: 0644]
scilab/modules/console/sci_gateway/cpp/sci_prompt.cpp [new file with mode: 0644]
scilab/modules/console/sci_gateway/cpp/sci_tohome.cpp [new file with mode: 0644]
scilab/modules/console/src/c/clc.h
scilab/modules/console/src/c/console.vcxproj
scilab/modules/console/src/c/console.vcxproj.filters
scilab/modules/console/src/cpp/scilabRead.cpp [new file with mode: 0644]
scilab/modules/console/src/noconsole/noconsole.c
scilab/modules/core/sci_gateway/cpp/sci_stacksize.cpp
scilab/modules/core/sci_gateway/cpp/sci_who.cpp
scilab/modules/core/src/cpp/banner.cpp
scilab/modules/core/src/cpp/runner.cpp
scilab/modules/core/src/cpp/scilab.cpp
scilab/modules/core/src/cpp/storeCommand.cpp
scilab/modules/core/src/cpp/tasks.cpp
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/sci_gateway/cpp/fileio_gw.vcxproj
scilab/modules/fileio/sci_gateway/cpp/sci_mfprintf.cpp
scilab/modules/fileio/sci_gateway/cpp/sci_mscanf.cpp
scilab/modules/functions/sci_gateway/cpp/sci_exec.cpp
scilab/modules/functions/sci_gateway/cpp/sci_execstr.cpp
scilab/modules/functions_manager/Makefile.am
scilab/modules/functions_manager/Makefile.in
scilab/modules/functions_manager/functions_manager.vcxproj
scilab/modules/functions_manager/includes/module_declaration.hxx
scilab/modules/functions_manager/src/cpp/funcmanager.cpp
scilab/modules/io/sci_gateway/cpp/sci_genlib.cpp
scilab/modules/linear_algebra/sci_gateway/c/sci_eig.c
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj.filters
scilab/modules/localization/sci_gateway/cpp/sci_gettext.cpp
scilab/modules/localization/sci_gateway/cpp/sci_setdefaultlanguage.cpp
scilab/modules/mexlib/src/cpp/mexlib.cpp
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/includes/scilabWrite.hxx [moved from scilab/modules/output_stream/includes/yaspio.hxx with 51% similarity]
scilab/modules/output_stream/sci_gateway/cpp/sci_disp.cpp
scilab/modules/output_stream/sci_gateway/cpp/sci_mprintf.cpp
scilab/modules/output_stream/src/c/Scierror.c
scilab/modules/output_stream/src/c/output_stream.vcxproj
scilab/modules/output_stream/src/c/output_stream.vcxproj.filters
scilab/modules/output_stream/src/c/sciprint.c
scilab/modules/output_stream/src/cpp/scilabWrite.cpp [new file with mode: 0644]
scilab/modules/output_stream/src/cpp/yaspio.cpp [deleted file]
scilab/modules/shell/src/c/System_env_Import.def [deleted file]
scilab/modules/system_env/includes/configvariable.hxx
scilab/modules/system_env/src/cpp/configvariable.cpp
scilab/modules/types/src/cpp/macro.cpp
scilab/modules/types/src/cpp/macrofile.cpp

index 4c13180..61f60d3 100644 (file)
@@ -644,6 +644,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "history_manager_gw", "modul
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noui_data", "modules\ui_data\src\noui_data\noui_data.vcxproj", "{337A52F8-310E-49E3-A2BA-F19CA32EB617}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console_gw", "modules\console\sci_gateway\cpp\console_gw.vcxproj", "{273B1F5C-C137-46D1-B516-FFE5764FABE5}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2056,6 +2058,14 @@ Global
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|Win32.Build.0 = Release|Win32
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|x64.ActiveCfg = Release|x64
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|x64.Build.0 = Release|x64
+               {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Debug|Win32.ActiveCfg = Debug|Win32
+               {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Debug|Win32.Build.0 = Debug|Win32
+               {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Debug|x64.ActiveCfg = Debug|x64
+               {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Debug|x64.Build.0 = Debug|x64
+               {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Release|Win32.ActiveCfg = Release|Win32
+               {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Release|Win32.Build.0 = Release|Win32
+               {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Release|x64.ActiveCfg = Release|x64
+               {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index c7fe673..3d3f680 100644 (file)
@@ -43,5 +43,6 @@
     <module name="mexlib" activate="yes"/>
     <module name="history_manager" activate="yes"/>
     <module name="parse" activate="yes"/>
+    <module name="console" activate="yes"/>
 </modules>
 
index c641828..448866c 100644 (file)
@@ -40,5 +40,6 @@
     <module name="mexlib" activate="yes"/>
     <module name="history_manager" activate="yes"/>
     <module name="parse" activate="yes"/>
+    <module name="console" activate="yes"/>
 </modules>
 
index 85509bc..11b0eb9 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 # Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru
 # Copyright (C) DIGITEO - 2009 - Sylvestre Ledru
 #
index 94d29b0..9f3088d 100644 (file)
 
 @SET_MAKE@
 
-#
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-# Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru
-# Copyright (C) DIGITEO - 2009 - Sylvestre Ledru
-#
-# 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
-#
-
-# The order DOES matter !!!
-
-# core is the main module of Scilab. All the compilation deps has been removed
-# since it already linked almost the whole world
-
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -455,6 +438,20 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 yacc_present = @yacc_present@
+# Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru
+# Copyright (C) DIGITEO - 2009 - Sylvestre Ledru
+#
+# 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
+#
+
+# The order DOES matter !!!
+
+# core is the main module of Scilab. All the compilation deps has been removed
+# since it already linked almost the whole world
 SUBDIRS = threads operations output_stream arnoldi \
        elementary_functions matio functions_manager string api_scilab \
        dynamic_link fileio history_manager spreadsheet tclsci \
@@ -984,6 +981,9 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
        uninstall-pkglibLTLIBRARIES
 
 
+#
+ Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+
 #if MPI
 #libscilab_la_LIBADD += $(top_builddir)/modules/mpi/libscimpi.la
 #endif
index 1130507..4f3b7a1 100644 (file)
@@ -131,7 +131,7 @@ void visitprivate(const AssignExp  &e)
                     }
                     ostr << std::endl;
                     ostr << pOut->toString(ConfigVariable::getFormat(), ConfigVariable::getConsoleWidth());
-                    YaspWriteW(ostr.str().c_str());
+                    scilabWriteW(ostr.str().c_str());
                 }
             }
             else
@@ -540,7 +540,7 @@ void visitprivate(const AssignExp  &e)
                     }
                     ostr << std::endl;
                     ostr << pOut->toString(ConfigVariable::getFormat(), ConfigVariable::getConsoleWidth());
-                    YaspWriteW(ostr.str().c_str());
+                    scilabWriteW(ostr.str().c_str());
                 }
             }
             else
@@ -596,7 +596,7 @@ void visitprivate(const AssignExp  &e)
                 std::wostringstream ostr;
                 ostr << pVar->name_get().name_get() << L"  = " << std::endl << std::endl;
                 ostr << pIT->toString(ConfigVariable::getFormat(), ConfigVariable::getConsoleWidth());
-                YaspWriteW(ostr.str().c_str());
+                scilabWriteW(ostr.str().c_str());
             }
         }
         else if(pList)
@@ -629,7 +629,7 @@ void visitprivate(const AssignExp  &e)
                     ostr << pListVar->name_get().name_get() << L"  = " << std::endl;
                     ostr << std::endl;
                     ostr << execMeR.result_get(i)->toString(ConfigVariable::getFormat(), ConfigVariable::getConsoleWidth());
-                    YaspWriteW(ostr.str().c_str());
+                    scilabWriteW(ostr.str().c_str());
                 }
                 i--;
             }
@@ -729,7 +729,7 @@ void visitprivate(const AssignExp  &e)
                 std::wostringstream ostr;
                 ostr << *pstName << L"  = " << std::endl << std::endl;
                 ostr << symbol::Context::getInstance()->get(symbol::Symbol(*pstName))->toString(ConfigVariable::getFormat(), ConfigVariable::getConsoleWidth());
-                YaspWriteW(ostr.str().c_str());
+                scilabWriteW(ostr.str().c_str());
             }
         }
         else
index fecc101..e51f5aa 100644 (file)
@@ -191,7 +191,7 @@ void visitprivate(const CallExp &e)
 
                 if(bTypeSet == true && execArg.result_get()->getType() != rtIndex)
                 {//TODO: error
-                    YaspWriteW(L"merdouille");
+                    scilabWriteW(L"merdouille");
                 }
 
                 if(execArg.result_get()->isString())
index c00e00e..293327f 100644 (file)
@@ -51,7 +51,7 @@ extern "C" {
 #include "timer.hxx"
 #include "localization.h"
 
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 #include "context.hxx"
 
 #include "all.hxx"
@@ -365,7 +365,7 @@ namespace ast
                     ostr << e.name_get().name_get() << L"  = " << L"(" << pI->getRef() << L")"<< std::endl;
                     ostr << std::endl;
                     ostr << pI->toString(ConfigVariable::getFormat(), ConfigVariable::getConsoleWidth());
-                    YaspWriteW(ostr.str().c_str());
+                    scilabWriteW(ostr.str().c_str());
                 }
             }
             else
@@ -1058,7 +1058,7 @@ namespace ast
                                 std::wostringstream ostr;
                                 ostr << L"ans = " << std::endl << std::endl;
                                 ostr << execMe.result_get()->toString(ConfigVariable::getFormat(), ConfigVariable::getConsoleWidth());
-                                YaspWriteW(ostr.str().c_str());
+                                scilabWriteW(ostr.str().c_str());
                             }
                         }
 
@@ -1085,7 +1085,7 @@ namespace ast
                 }
                 catch(ScilabMessage sm)
                 {
-                    YaspErrorW(sm.GetErrorMessage().c_str());
+                    scilabErrorW(sm.GetErrorMessage().c_str());
 
                     CallExp* pCall = dynamic_cast<CallExp*>(*itExp);
                     if(pCall != NULL)
@@ -1135,7 +1135,7 @@ namespace ast
                                 pCall->accept(printMe);
                                 os << std::endl << std::endl;
                                 ConfigVariable::setLastErrorFunction(execFunc.result_get()->getAsCallable()->getName());
-                                YaspErrorW(se.GetErrorMessage().c_str());
+                                scilabErrorW(se.GetErrorMessage().c_str());
                                 throw ScilabMessage(os.str(), 0, (*itExp)->location_get());
                             }
                         }
@@ -1144,7 +1144,7 @@ namespace ast
                         }
                     }
 
-                    YaspErrorW(se.GetErrorMessage().c_str());
+                    scilabErrorW(se.GetErrorMessage().c_str());
                     throw ScilabMessage((*itExp)->location_get());
                 }
             }
index b7a0d0f..7807f6e 100644 (file)
@@ -1,10 +1,11 @@
 #
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 # Copyright (C) INRIA   - 2006-2008 - Sylvestre Ledru
 # Copyright (C) INRIA   - 2007 - Vincent COUVERT
 # Copyright (C) DIGITEO - 2009 - Sylvestre Ledru
 # Copyright (C) DIGITEO - 2009 - Pierre MARECHAL
 # Copyright (C) DIGITEO - 2011 - Allan CORNET
+# 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
@@ -27,48 +28,59 @@ libsciconsole_la_etc_DATA = etc/console.quit etc/console.start etc/configuration
 
 
 #### console : List of the cpp files ####
-CONSOLE_CPP_JNI_SOURCES = src/jni/CallScilabBridge.cpp \
-src/jni/GiwsException.cpp
-
-CONSOLE_CPP_SOURCES =  src/cpp/ClearConsole.cpp \
-src/cpp/ClearConsolePart.cpp \
-src/cpp/ConsolePrintf.cpp \
-src/cpp/ConsoleRead.cpp \
-src/cpp/ConsoleIsWaitingForInput.cpp \
-src/cpp/GetCharWithoutOutput.cpp \
-src/cpp/PromptToHome.cpp \
-src/cpp/ScilabLinesUpdate.cpp \
-src/cpp/SetConsolePrompt.cpp
+CONSOLE_CPP_JNI_SOURCES = \
+    src/jni/CallScilabBridge.cpp \
+    src/jni/GiwsException.cpp
+
+CONSOLE_CPP_SOURCES =  \
+    src/cpp/ClearConsole.cpp \
+    src/cpp/ClearConsolePart.cpp \
+    src/cpp/ConsolePrintf.cpp \
+    src/cpp/ConsoleRead.cpp \
+    src/cpp/ConsoleIsWaitingForInput.cpp \
+    src/cpp/GetCharWithoutOutput.cpp \
+    src/cpp/PromptToHome.cpp \
+    src/cpp/ScilabLinesUpdate.cpp \
+    src/cpp/SetConsolePrompt.cpp \
+    src/cpp/scilabRead.cpp
 
 #### console : List of the c files ####
-CONSOLE_C_JNI_SOURCES = src/jni/GuiManagement_wrap.c \
-src/jni/DropFiles_wrap.c
-
-CONSOLE_C_SOURCES = src/c/InitializeConsole.c \
-src/c/GuiManagement.c \
-src/c/dropFiles.c \
-src/c/clc.c \
-src/c/tohome.c \
-src/c/more.c \
-src/c/scilines.c \
-src/c/GetCommandLine.c \
-src/c/others/zzledt.c \
-src/c/others/gotoxy_nw.c \
-src/c/others/clrscr_nw.c \
-src/c/prompt.c \
-src/c/promptecho.c
+CONSOLE_C_JNI_SOURCES = \
+    src/jni/GuiManagement_wrap.c \
+    src/jni/DropFiles_wrap.c
+
+CONSOLE_C_SOURCES = \
+    src/c/InitializeConsole.c \
+    src/c/GuiManagement.c \
+    src/c/dropFiles.c \
+    src/c/clc.c \
+    src/c/tohome.c \
+    src/c/more.c \
+    src/c/scilines.c \
+    src/c/GetCommandLine.c \
+    src/c/others/zzledt.c \
+    src/c/others/gotoxy_nw.c \
+    src/c/others/clrscr_nw.c \
+    src/c/prompt.c \
+    src/c/promptecho.c
 
 if IS_MACOSX
 CONSOLE_C_SOURCES += src/c/others/initMacOSXEnv.c
 endif
 
+# List of the gateway cpp files
+CONSOLE_GATEWAY_CPP_SOURCES = \
+    sci_gateway/cpp/console_gw.cpp \
+    sci_gateway/cpp/sci_clc.cpp \
+    sci_gateway/cpp/sci_iswaitingforinput.cpp \
+    sci_gateway/cpp/sci_lines.cpp \
+    sci_gateway/cpp/sci_prompt.cpp \
+    sci_gateway/cpp/sci_tohome.cpp
+    
+
 # List of the gateway c files
-CONSOLE_GATEWAY_C_SOURCES = sci_gateway/c/gw_console.c \
-sci_gateway/c/sci_clc.c \
-sci_gateway/c/sci_tohome.c \
-sci_gateway/c/sci_lines.c \
-sci_gateway/c/sci_prompt.c \
-sci_gateway/c/sci_iswaitingforinput.c
+CONSOLE_GATEWAY_C_SOURCES = \
+    sci_gateway/c/gw_console.c
 
 GIWS_WRAPPERS = src/jni/CallScilabBridge.giws.xml
 
@@ -84,88 +96,124 @@ endif
 
 
 # List of the c files
-libsciconsole_disable_la_SOURCES = src/noconsole/noconsole.c \
-sci_gateway/c/gw_console.c \
-sci_gateway/c/sci_clc.c \
-sci_gateway/c/sci_tohome.c \
-sci_gateway/c/sci_lines.c \
-sci_gateway/c/sci_prompt.c \
-sci_gateway/c/sci_iswaitingforinput.c \
-src/c/clc.c \
-src/c/tohome.c \
-src/c/more.c \
-src/c/scilines.c \
-src/c/GetCommandLine.c \
-src/c/others/zzledt.c \
-src/c/others/gotoxy_nw.c \
-src/c/others/clrscr_nw.c \
-src/c/prompt.c \
-src/c/promptecho.c
+libsciconsole_disable_la_SOURCES = \
+    src/noconsole/noconsole.c \
+    src/cpp/scilabRead.cpp \
+    sci_gateway/cpp/console_gw.cpp \
+    sci_gateway/cpp/sci_clc.cpp \
+    sci_gateway/cpp/sci_tohome.cpp \
+    sci_gateway/cpp/sci_lines.cpp \
+    sci_gateway/cpp/sci_prompt.cpp \
+    sci_gateway/cpp/sci_iswaitingforinput.cpp \
+    sci_gateway/c/gw_console.c \
+    src/c/clc.c \
+    src/c/tohome.c \
+    src/c/more.c \
+    src/c/scilines.c \
+    src/c/GetCommandLine.c \
+    src/c/others/zzledt.c \
+    src/c/others/gotoxy_nw.c \
+    src/c/others/clrscr_nw.c \
+    src/c/prompt.c \
+    src/c/promptecho.c
 
 if IS_MACOSX
 libsciconsole_disable_la_SOURCES += src/c/others/initMacOSXEnv.c
 endif
 
 
-libsciconsole_disable_la_CFLAGS = -I$(srcdir)/includes/ \
-                               -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
-                               -I$(top_srcdir)/modules/fileio/includes \
-                               -I$(top_srcdir)/modules/output_stream/includes \
-                               -I$(top_srcdir)/modules/history_manager/includes/ \
-                               -I$(top_srcdir)/modules/output_stream/includes \
-                               -I$(top_srcdir)/modules/core/includes \
-                               -I$(top_srcdir)/modules/completion/includes \
-                               -I$(top_srcdir)/modules/localization/includes \
-                               -I$(top_srcdir)/modules/action_binding/includes/ \
-                               -I$(top_srcdir)/modules/fileio/src/c/ \
-                               -I$(top_srcdir)/modules/api_scilab/includes \
-                               -I$(top_srcdir)/modules/fileio/includes \
-                               -I$(top_srcdir)/modules/operations/includes \
-                               -I$(top_srcdir)/modules/system_env/includes \
-                               -I$(top_srcdir)/modules/threads/includes \
-                               -I$(top_srcdir)/modules/string/includes \
-                               -I$(top_srcdir)/modules/ui_data/includes/
+libsciconsole_disable_la_CFLAGS = \
+    -I$(srcdir)/includes/ \
+       -I$(srcdir)/src/c/ \
+       -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(top_srcdir)/modules/fileio/includes \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/history_manager/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/core/includes \
+       -I$(top_srcdir)/modules/completion/includes \
+       -I$(top_srcdir)/modules/localization/includes \
+       -I$(top_srcdir)/modules/action_binding/includes/ \
+       -I$(top_srcdir)/modules/fileio/src/c/ \
+       -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(top_srcdir)/modules/fileio/includes \
+       -I$(top_srcdir)/modules/operations/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
+       -I$(top_srcdir)/modules/threads/includes \
+       -I$(top_srcdir)/modules/string/includes \
+       -I$(top_srcdir)/modules/ui_data/includes/
+
+# Includes need for the compilation
+libsciconsole_la_CPPFLAGS = \
+    $(JAVA_JNI_INCLUDE) \
+       -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(srcdir)/includes/ \
+       -I$(srcdir)/src/cpp/ \
+       -I$(srcdir)/src/c/ \
+       -I$(srcdir)/src/jni/ \
+       -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(top_srcdir)/modules/jvm/includes/ \
+       -I$(top_srcdir)/modules/action_binding/includes \
+       -I$(top_srcdir)/modules/history_manager/includes/ \
+       -I$(top_srcdir)/modules/operations/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
+       -I$(top_srcdir)/modules/ui_data/includes/ \
+       -I$(top_srcdir)/modules/threads/includes \
+       -I$(top_srcdir)/modules/completion/includes \
+       -I$(top_srcdir)/modules/types/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
+       -I$(top_srcdir)/modules/ast/includes \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/symbol/includes \
+       -I$(top_srcdir)/modules/string/includes
 
 
 # Includes need for the compilation
-libsciconsole_la_CPPFLAGS =    $(JAVA_JNI_INCLUDE) \
-                                                               -I$(top_srcdir)/modules/api_scilab/includes \
-                                                               -I$(srcdir)/includes/ \
-                                                               -I$(srcdir)/src/cpp/ \
-                                                               -I$(srcdir)/src/c/ \
-                                                               -I$(srcdir)/src/jni/ \
-                                                               -I$(top_srcdir)/libs/MALLOC/includes/ \
-                                                               -I$(top_srcdir)/modules/jvm/includes/ \
-                                                               -I$(top_srcdir)/modules/action_binding/includes \
-                                                               -I$(top_srcdir)/modules/history_manager/includes/ \
-                                                               -I$(top_srcdir)/modules/operations/includes \
-                                                               -I$(top_srcdir)/modules/system_env/includes \
-                                                               -I$(top_srcdir)/modules/ui_data/includes/ \
-                                                               -I$(top_srcdir)/modules/threads/includes \
-                                                               -I$(top_srcdir)/modules/completion/includes \
-                                                               -I$(top_srcdir)/modules/string/includes
+libsciconsole_disable_la_CPPFLAGS = \
+    $(JAVA_JNI_INCLUDE) \
+       -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(srcdir)/includes/ \
+       -I$(srcdir)/src/cpp/ \
+       -I$(srcdir)/src/c/ \
+       -I$(srcdir)/src/jni/ \
+       -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(top_srcdir)/modules/jvm/includes/ \
+       -I$(top_srcdir)/modules/action_binding/includes \
+       -I$(top_srcdir)/modules/history_manager/includes/ \
+       -I$(top_srcdir)/modules/operations/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
+       -I$(top_srcdir)/modules/ui_data/includes/ \
+       -I$(top_srcdir)/modules/threads/includes \
+       -I$(top_srcdir)/modules/completion/includes \
+       -I$(top_srcdir)/modules/types/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
+       -I$(top_srcdir)/modules/ast/includes \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/symbol/includes \
+       -I$(top_srcdir)/modules/string/includes
 
 # Includes need for the compilation
-libsciconsole_la_CFLAGS=       $(JAVA_JNI_INCLUDE) \
-                               -I$(srcdir)/includes/ \
-                               -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
-                               -I$(top_srcdir)/modules/output_stream/includes \
-                               -I$(top_srcdir)/modules/system_env/includes \
-                               -I$(top_srcdir)/modules/fileio/includes \
-                               -I$(top_srcdir)/modules/string/includes
-                               -I$(top_srcdir)/modules/output_stream/includes \
-                               -I$(top_srcdir)/modules/history_manager/includes/ \
-                               -I$(top_srcdir)/modules/output_stream/includes \
-                               -I$(top_srcdir)/modules/core/includes \
-                               -I$(top_srcdir)/modules/completion/includes \
-                               -I$(top_srcdir)/modules/localization/includes \
-                               -I$(top_srcdir)/modules/action_binding/includes/ \
-                               -I$(top_srcdir)/modules/fileio/src/c/ \
-                               -I$(top_srcdir)/modules/api_scilab/includes \
-                               -I$(top_srcdir)/modules/fileio/includes \
-                               -I$(top_srcdir)/modules/ui_data/includes/
+libsciconsole_la_CFLAGS= \
+    $(JAVA_JNI_INCLUDE) \
+       -I$(srcdir)/includes/ \
+       -I$(srcdir)/src/c/ \
+       -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
+       -I$(top_srcdir)/modules/fileio/includes \
+       -I$(top_srcdir)/modules/string/includes
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/history_manager/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/core/includes \
+       -I$(top_srcdir)/modules/completion/includes \
+       -I$(top_srcdir)/modules/localization/includes \
+       -I$(top_srcdir)/modules/action_binding/includes/ \
+       -I$(top_srcdir)/modules/fileio/src/c/ \
+       -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(top_srcdir)/modules/fileio/includes \
+       -I$(top_srcdir)/modules/ui_data/includes/
+
 if IS_MACOSX
 libsciconsole_la_CFLAGS += -msse2
 endif
@@ -181,7 +229,7 @@ endif
 libsciconsole_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
 # All the sources needed by libsciconsole.la
-libsciconsole_la_SOURCES = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES) $(CONSOLE_CPP_JNI_SOURCES) $(CONSOLE_CPP_SOURCES) $(CONSOLE_GATEWAY_C_SOURCES)
+libsciconsole_la_SOURCES = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES) $(CONSOLE_CPP_JNI_SOURCES) $(CONSOLE_CPP_SOURCES) $(CONSOLE_GATEWAY_C_SOURCES) $(CONSOLE_GATEWAY_CPP_SOURCES)
 
 # For the code check (splint)
 CHECK_SRC= $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES)
index 413b04b..4d1969c 100644 (file)
 
 @SET_MAKE@
 
-#
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-# Copyright (C) INRIA   - 2006-2008 - Sylvestre Ledru
-# Copyright (C) INRIA   - 2007 - Vincent COUVERT
-# Copyright (C) DIGITEO - 2009 - Sylvestre Ledru
-# Copyright (C) DIGITEO - 2009 - Pierre MARECHAL
-# Copyright (C) DIGITEO - 2011 - Allan CORNET
-# 
-# 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
-#
-
 # Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 # Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
 # Copyright (C) 2008      - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
@@ -126,24 +111,27 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libsciconsole_disable_la_LIBADD =
 am__libsciconsole_disable_la_SOURCES_DIST = src/noconsole/noconsole.c \
-       sci_gateway/c/gw_console.c sci_gateway/c/sci_clc.c \
-       sci_gateway/c/sci_tohome.c sci_gateway/c/sci_lines.c \
-       sci_gateway/c/sci_prompt.c \
-       sci_gateway/c/sci_iswaitingforinput.c src/c/clc.c \
-       src/c/tohome.c src/c/more.c src/c/scilines.c \
-       src/c/GetCommandLine.c src/c/others/zzledt.c \
-       src/c/others/gotoxy_nw.c src/c/others/clrscr_nw.c \
-       src/c/prompt.c src/c/promptecho.c src/c/others/initMacOSXEnv.c
+       src/cpp/scilabRead.cpp sci_gateway/cpp/console_gw.cpp \
+       sci_gateway/cpp/sci_clc.cpp sci_gateway/cpp/sci_tohome.cpp \
+       sci_gateway/cpp/sci_lines.cpp sci_gateway/cpp/sci_prompt.cpp \
+       sci_gateway/cpp/sci_iswaitingforinput.cpp \
+       sci_gateway/c/gw_console.c src/c/clc.c src/c/tohome.c \
+       src/c/more.c src/c/scilines.c src/c/GetCommandLine.c \
+       src/c/others/zzledt.c src/c/others/gotoxy_nw.c \
+       src/c/others/clrscr_nw.c src/c/prompt.c src/c/promptecho.c \
+       src/c/others/initMacOSXEnv.c
 @IS_MACOSX_TRUE@am__objects_1 =  \
 @IS_MACOSX_TRUE@       libsciconsole_disable_la-initMacOSXEnv.lo
 am_libsciconsole_disable_la_OBJECTS =  \
        libsciconsole_disable_la-noconsole.lo \
-       libsciconsole_disable_la-gw_console.lo \
+       libsciconsole_disable_la-scilabRead.lo \
+       libsciconsole_disable_la-console_gw.lo \
        libsciconsole_disable_la-sci_clc.lo \
        libsciconsole_disable_la-sci_tohome.lo \
        libsciconsole_disable_la-sci_lines.lo \
        libsciconsole_disable_la-sci_prompt.lo \
        libsciconsole_disable_la-sci_iswaitingforinput.lo \
+       libsciconsole_disable_la-gw_console.lo \
        libsciconsole_disable_la-clc.lo \
        libsciconsole_disable_la-tohome.lo \
        libsciconsole_disable_la-more.lo \
@@ -156,10 +144,6 @@ am_libsciconsole_disable_la_OBJECTS =  \
        libsciconsole_disable_la-promptecho.lo $(am__objects_1)
 libsciconsole_disable_la_OBJECTS =  \
        $(am_libsciconsole_disable_la_OBJECTS)
-libsciconsole_disable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
 libsciconsole_la_DEPENDENCIES =  \
        $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/libs/MALLOC/libscimalloc.la
@@ -176,10 +160,11 @@ am__libsciconsole_la_SOURCES_DIST = src/jni/GuiManagement_wrap.c \
        src/cpp/ConsoleIsWaitingForInput.cpp \
        src/cpp/GetCharWithoutOutput.cpp src/cpp/PromptToHome.cpp \
        src/cpp/ScilabLinesUpdate.cpp src/cpp/SetConsolePrompt.cpp \
-       sci_gateway/c/gw_console.c sci_gateway/c/sci_clc.c \
-       sci_gateway/c/sci_tohome.c sci_gateway/c/sci_lines.c \
-       sci_gateway/c/sci_prompt.c \
-       sci_gateway/c/sci_iswaitingforinput.c
+       src/cpp/scilabRead.cpp sci_gateway/c/gw_console.c \
+       sci_gateway/cpp/console_gw.cpp sci_gateway/cpp/sci_clc.cpp \
+       sci_gateway/cpp/sci_iswaitingforinput.cpp \
+       sci_gateway/cpp/sci_lines.cpp sci_gateway/cpp/sci_prompt.cpp \
+       sci_gateway/cpp/sci_tohome.cpp
 am__objects_2 = libsciconsole_la-GuiManagement_wrap.lo \
        libsciconsole_la-DropFiles_wrap.lo
 @IS_MACOSX_TRUE@am__objects_3 = libsciconsole_la-initMacOSXEnv.lo
@@ -202,13 +187,17 @@ am__objects_6 = libsciconsole_la-ClearConsole.lo \
        libsciconsole_la-GetCharWithoutOutput.lo \
        libsciconsole_la-PromptToHome.lo \
        libsciconsole_la-ScilabLinesUpdate.lo \
-       libsciconsole_la-SetConsolePrompt.lo
-am__objects_7 = libsciconsole_la-gw_console.lo \
-       libsciconsole_la-sci_clc.lo libsciconsole_la-sci_tohome.lo \
+       libsciconsole_la-SetConsolePrompt.lo \
+       libsciconsole_la-scilabRead.lo
+am__objects_7 = libsciconsole_la-gw_console.lo
+am__objects_8 = libsciconsole_la-console_gw.lo \
+       libsciconsole_la-sci_clc.lo \
+       libsciconsole_la-sci_iswaitingforinput.lo \
        libsciconsole_la-sci_lines.lo libsciconsole_la-sci_prompt.lo \
-       libsciconsole_la-sci_iswaitingforinput.lo
+       libsciconsole_la-sci_tohome.lo
 am_libsciconsole_la_OBJECTS = $(am__objects_2) $(am__objects_4) \
-       $(am__objects_5) $(am__objects_6) $(am__objects_7)
+       $(am__objects_5) $(am__objects_6) $(am__objects_7) \
+       $(am__objects_8)
 libsciconsole_la_OBJECTS = $(am_libsciconsole_la_OBJECTS)
 libsciconsole_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -504,6 +493,19 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 yacc_present = @yacc_present@
+# Copyright (C) INRIA   - 2006-2008 - Sylvestre Ledru
+# Copyright (C) INRIA   - 2007 - Vincent COUVERT
+# Copyright (C) DIGITEO - 2009 - Sylvestre Ledru
+# Copyright (C) DIGITEO - 2009 - Pierre MARECHAL
+# Copyright (C) DIGITEO - 2011 - Allan CORNET
+# 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
+#
 
 #### Target ######
 modulename = console
@@ -517,23 +519,27 @@ libsciconsole_la_etcdir = $(mydatadir)/etc
 libsciconsole_la_etc_DATA = etc/console.quit etc/console.start etc/configuration.xml
 
 #### console : List of the cpp files ####
-CONSOLE_CPP_JNI_SOURCES = src/jni/CallScilabBridge.cpp \
-src/jni/GiwsException.cpp
-
-CONSOLE_CPP_SOURCES = src/cpp/ClearConsole.cpp \
-src/cpp/ClearConsolePart.cpp \
-src/cpp/ConsolePrintf.cpp \
-src/cpp/ConsoleRead.cpp \
-src/cpp/ConsoleIsWaitingForInput.cpp \
-src/cpp/GetCharWithoutOutput.cpp \
-src/cpp/PromptToHome.cpp \
-src/cpp/ScilabLinesUpdate.cpp \
-src/cpp/SetConsolePrompt.cpp
+CONSOLE_CPP_JNI_SOURCES = \
+    src/jni/CallScilabBridge.cpp \
+    src/jni/GiwsException.cpp
+
+CONSOLE_CPP_SOURCES = \
+    src/cpp/ClearConsole.cpp \
+    src/cpp/ClearConsolePart.cpp \
+    src/cpp/ConsolePrintf.cpp \
+    src/cpp/ConsoleRead.cpp \
+    src/cpp/ConsoleIsWaitingForInput.cpp \
+    src/cpp/GetCharWithoutOutput.cpp \
+    src/cpp/PromptToHome.cpp \
+    src/cpp/ScilabLinesUpdate.cpp \
+    src/cpp/SetConsolePrompt.cpp \
+    src/cpp/scilabRead.cpp
 
 
 #### console : List of the c files ####
-CONSOLE_C_JNI_SOURCES = src/jni/GuiManagement_wrap.c \
-src/jni/DropFiles_wrap.c
+CONSOLE_C_JNI_SOURCES = \
+    src/jni/GuiManagement_wrap.c \
+    src/jni/DropFiles_wrap.c
 
 CONSOLE_C_SOURCES = src/c/InitializeConsole.c src/c/GuiManagement.c \
        src/c/dropFiles.c src/c/clc.c src/c/tohome.c src/c/more.c \
@@ -541,65 +547,104 @@ CONSOLE_C_SOURCES = src/c/InitializeConsole.c src/c/GuiManagement.c \
        src/c/others/gotoxy_nw.c src/c/others/clrscr_nw.c \
        src/c/prompt.c src/c/promptecho.c $(am__append_1)
 
+# List of the gateway cpp files
+CONSOLE_GATEWAY_CPP_SOURCES = \
+    sci_gateway/cpp/console_gw.cpp \
+    sci_gateway/cpp/sci_clc.cpp \
+    sci_gateway/cpp/sci_iswaitingforinput.cpp \
+    sci_gateway/cpp/sci_lines.cpp \
+    sci_gateway/cpp/sci_prompt.cpp \
+    sci_gateway/cpp/sci_tohome.cpp
+
+
 # List of the gateway c files
-CONSOLE_GATEWAY_C_SOURCES = sci_gateway/c/gw_console.c \
-sci_gateway/c/sci_clc.c \
-sci_gateway/c/sci_tohome.c \
-sci_gateway/c/sci_lines.c \
-sci_gateway/c/sci_prompt.c \
-sci_gateway/c/sci_iswaitingforinput.c
+CONSOLE_GATEWAY_C_SOURCES = \
+    sci_gateway/c/gw_console.c
 
 GIWS_WRAPPERS = src/jni/CallScilabBridge.giws.xml
 BUILT_SOURCES = $(am__append_2) $(am__append_3)
 
 # List of the c files
 libsciconsole_disable_la_SOURCES = src/noconsole/noconsole.c \
-       sci_gateway/c/gw_console.c sci_gateway/c/sci_clc.c \
-       sci_gateway/c/sci_tohome.c sci_gateway/c/sci_lines.c \
-       sci_gateway/c/sci_prompt.c \
-       sci_gateway/c/sci_iswaitingforinput.c src/c/clc.c \
-       src/c/tohome.c src/c/more.c src/c/scilines.c \
-       src/c/GetCommandLine.c src/c/others/zzledt.c \
-       src/c/others/gotoxy_nw.c src/c/others/clrscr_nw.c \
-       src/c/prompt.c src/c/promptecho.c $(am__append_4)
-libsciconsole_disable_la_CFLAGS = -I$(srcdir)/includes/ \
-                               -I$(srcdir)/src/c/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
-                               -I$(top_srcdir)/modules/fileio/includes \
-                               -I$(top_srcdir)/modules/output_stream/includes \
-                               -I$(top_srcdir)/modules/history_manager/includes/ \
-                               -I$(top_srcdir)/modules/output_stream/includes \
-                               -I$(top_srcdir)/modules/core/includes \
-                               -I$(top_srcdir)/modules/completion/includes \
-                               -I$(top_srcdir)/modules/localization/includes \
-                               -I$(top_srcdir)/modules/action_binding/includes/ \
-                               -I$(top_srcdir)/modules/fileio/src/c/ \
-                               -I$(top_srcdir)/modules/api_scilab/includes \
-                               -I$(top_srcdir)/modules/fileio/includes \
-                               -I$(top_srcdir)/modules/operations/includes \
-                               -I$(top_srcdir)/modules/system_env/includes \
-                               -I$(top_srcdir)/modules/threads/includes \
-                               -I$(top_srcdir)/modules/string/includes \
-                               -I$(top_srcdir)/modules/ui_data/includes/
+       src/cpp/scilabRead.cpp sci_gateway/cpp/console_gw.cpp \
+       sci_gateway/cpp/sci_clc.cpp sci_gateway/cpp/sci_tohome.cpp \
+       sci_gateway/cpp/sci_lines.cpp sci_gateway/cpp/sci_prompt.cpp \
+       sci_gateway/cpp/sci_iswaitingforinput.cpp \
+       sci_gateway/c/gw_console.c src/c/clc.c src/c/tohome.c \
+       src/c/more.c src/c/scilines.c src/c/GetCommandLine.c \
+       src/c/others/zzledt.c src/c/others/gotoxy_nw.c \
+       src/c/others/clrscr_nw.c src/c/prompt.c src/c/promptecho.c \
+       $(am__append_4)
+libsciconsole_disable_la_CFLAGS = \
+    -I$(srcdir)/includes/ \
+       -I$(srcdir)/src/c/ \
+       -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(top_srcdir)/modules/fileio/includes \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/history_manager/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/core/includes \
+       -I$(top_srcdir)/modules/completion/includes \
+       -I$(top_srcdir)/modules/localization/includes \
+       -I$(top_srcdir)/modules/action_binding/includes/ \
+       -I$(top_srcdir)/modules/fileio/src/c/ \
+       -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(top_srcdir)/modules/fileio/includes \
+       -I$(top_srcdir)/modules/operations/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
+       -I$(top_srcdir)/modules/threads/includes \
+       -I$(top_srcdir)/modules/string/includes \
+       -I$(top_srcdir)/modules/ui_data/includes/
 
 
 # Includes need for the compilation
-libsciconsole_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
-                                                               -I$(top_srcdir)/modules/api_scilab/includes \
-                                                               -I$(srcdir)/includes/ \
-                                                               -I$(srcdir)/src/cpp/ \
-                                                               -I$(srcdir)/src/c/ \
-                                                               -I$(srcdir)/src/jni/ \
-                                                               -I$(top_srcdir)/libs/MALLOC/includes/ \
-                                                               -I$(top_srcdir)/modules/jvm/includes/ \
-                                                               -I$(top_srcdir)/modules/action_binding/includes \
-                                                               -I$(top_srcdir)/modules/history_manager/includes/ \
-                                                               -I$(top_srcdir)/modules/operations/includes \
-                                                               -I$(top_srcdir)/modules/system_env/includes \
-                                                               -I$(top_srcdir)/modules/ui_data/includes/ \
-                                                               -I$(top_srcdir)/modules/threads/includes \
-                                                               -I$(top_srcdir)/modules/completion/includes \
-                                                               -I$(top_srcdir)/modules/string/includes
+libsciconsole_la_CPPFLAGS = \
+    $(JAVA_JNI_INCLUDE) \
+       -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(srcdir)/includes/ \
+       -I$(srcdir)/src/cpp/ \
+       -I$(srcdir)/src/c/ \
+       -I$(srcdir)/src/jni/ \
+       -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(top_srcdir)/modules/jvm/includes/ \
+       -I$(top_srcdir)/modules/action_binding/includes \
+       -I$(top_srcdir)/modules/history_manager/includes/ \
+       -I$(top_srcdir)/modules/operations/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
+       -I$(top_srcdir)/modules/ui_data/includes/ \
+       -I$(top_srcdir)/modules/threads/includes \
+       -I$(top_srcdir)/modules/completion/includes \
+       -I$(top_srcdir)/modules/types/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
+       -I$(top_srcdir)/modules/ast/includes \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/symbol/includes \
+       -I$(top_srcdir)/modules/string/includes
+
+
+# Includes need for the compilation
+libsciconsole_disable_la_CPPFLAGS = \
+    $(JAVA_JNI_INCLUDE) \
+       -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(srcdir)/includes/ \
+       -I$(srcdir)/src/cpp/ \
+       -I$(srcdir)/src/c/ \
+       -I$(srcdir)/src/jni/ \
+       -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(top_srcdir)/modules/jvm/includes/ \
+       -I$(top_srcdir)/modules/action_binding/includes \
+       -I$(top_srcdir)/modules/history_manager/includes/ \
+       -I$(top_srcdir)/modules/operations/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
+       -I$(top_srcdir)/modules/ui_data/includes/ \
+       -I$(top_srcdir)/modules/threads/includes \
+       -I$(top_srcdir)/modules/completion/includes \
+       -I$(top_srcdir)/modules/types/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
+       -I$(top_srcdir)/modules/ast/includes \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/symbol/includes \
+       -I$(top_srcdir)/modules/string/includes
 
 
 # Includes need for the compilation
@@ -615,7 +660,7 @@ pkglib_LTLIBRARIES = libsciconsole-disable.la $(am__append_6)
 libsciconsole_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 
 # All the sources needed by libsciconsole.la
-libsciconsole_la_SOURCES = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES) $(CONSOLE_CPP_JNI_SOURCES) $(CONSOLE_CPP_SOURCES) $(CONSOLE_GATEWAY_C_SOURCES)
+libsciconsole_la_SOURCES = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES) $(CONSOLE_CPP_JNI_SOURCES) $(CONSOLE_CPP_SOURCES) $(CONSOLE_GATEWAY_C_SOURCES) $(CONSOLE_GATEWAY_CPP_SOURCES)
 
 # For the code check (splint)
 CHECK_SRC = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES)
@@ -768,7 +813,7 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libsciconsole-disable.la: $(libsciconsole_disable_la_OBJECTS) $(libsciconsole_disable_la_DEPENDENCIES) 
-       $(libsciconsole_disable_la_LINK) -rpath $(pkglibdir) $(libsciconsole_disable_la_OBJECTS) $(libsciconsole_disable_la_LIBADD) $(LIBS)
+       $(CXXLINK) -rpath $(pkglibdir) $(libsciconsole_disable_la_OBJECTS) $(libsciconsole_disable_la_LIBADD) $(LIBS)
 libsciconsole.la: $(libsciconsole_la_OBJECTS) $(libsciconsole_la_DEPENDENCIES) 
        $(libsciconsole_la_LINK) $(am_libsciconsole_la_rpath) $(libsciconsole_la_OBJECTS) $(libsciconsole_la_LIBADD) $(LIBS)
 
@@ -781,6 +826,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_disable_la-GetCommandLine.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_disable_la-clc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_disable_la-clrscr_nw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_disable_la-console_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_disable_la-gotoxy_nw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_disable_la-gw_console.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_disable_la-initMacOSXEnv.Plo@am__quote@
@@ -793,6 +839,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_disable_la-sci_lines.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_disable_la-sci_prompt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_disable_la-sci_tohome.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_disable_la-scilabRead.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_disable_la-scilines.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_disable_la-tohome.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_disable_la-zzledt.Plo@am__quote@
@@ -814,6 +861,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_la-SetConsolePrompt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_la-clc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_la-clrscr_nw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_la-console_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_la-dropFiles.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_la-gotoxy_nw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_la-gw_console.Plo@am__quote@
@@ -826,6 +874,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_la-sci_lines.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_la-sci_prompt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_la-sci_tohome.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_la-scilabRead.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_la-scilines.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_la-tohome.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciconsole_la-zzledt.Plo@am__quote@
@@ -852,130 +901,95 @@ distclean-compile:
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
 libsciconsole_disable_la-noconsole.lo: src/noconsole/noconsole.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-noconsole.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-noconsole.Tpo -c -o libsciconsole_disable_la-noconsole.lo `test -f 'src/noconsole/noconsole.c' || echo '$(srcdir)/'`src/noconsole/noconsole.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-noconsole.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-noconsole.Tpo -c -o libsciconsole_disable_la-noconsole.lo `test -f 'src/noconsole/noconsole.c' || echo '$(srcdir)/'`src/noconsole/noconsole.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-noconsole.Tpo $(DEPDIR)/libsciconsole_disable_la-noconsole.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/noconsole/noconsole.c' object='libsciconsole_disable_la-noconsole.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-noconsole.lo `test -f 'src/noconsole/noconsole.c' || echo '$(srcdir)/'`src/noconsole/noconsole.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-noconsole.lo `test -f 'src/noconsole/noconsole.c' || echo '$(srcdir)/'`src/noconsole/noconsole.c
 
 libsciconsole_disable_la-gw_console.lo: sci_gateway/c/gw_console.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-gw_console.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-gw_console.Tpo -c -o libsciconsole_disable_la-gw_console.lo `test -f 'sci_gateway/c/gw_console.c' || echo '$(srcdir)/'`sci_gateway/c/gw_console.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-gw_console.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-gw_console.Tpo -c -o libsciconsole_disable_la-gw_console.lo `test -f 'sci_gateway/c/gw_console.c' || echo '$(srcdir)/'`sci_gateway/c/gw_console.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-gw_console.Tpo $(DEPDIR)/libsciconsole_disable_la-gw_console.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/gw_console.c' object='libsciconsole_disable_la-gw_console.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-gw_console.lo `test -f 'sci_gateway/c/gw_console.c' || echo '$(srcdir)/'`sci_gateway/c/gw_console.c
-
-libsciconsole_disable_la-sci_clc.lo: sci_gateway/c/sci_clc.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-sci_clc.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-sci_clc.Tpo -c -o libsciconsole_disable_la-sci_clc.lo `test -f 'sci_gateway/c/sci_clc.c' || echo '$(srcdir)/'`sci_gateway/c/sci_clc.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-sci_clc.Tpo $(DEPDIR)/libsciconsole_disable_la-sci_clc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_clc.c' object='libsciconsole_disable_la-sci_clc.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-sci_clc.lo `test -f 'sci_gateway/c/sci_clc.c' || echo '$(srcdir)/'`sci_gateway/c/sci_clc.c
-
-libsciconsole_disable_la-sci_tohome.lo: sci_gateway/c/sci_tohome.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-sci_tohome.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-sci_tohome.Tpo -c -o libsciconsole_disable_la-sci_tohome.lo `test -f 'sci_gateway/c/sci_tohome.c' || echo '$(srcdir)/'`sci_gateway/c/sci_tohome.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-sci_tohome.Tpo $(DEPDIR)/libsciconsole_disable_la-sci_tohome.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_tohome.c' object='libsciconsole_disable_la-sci_tohome.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-sci_tohome.lo `test -f 'sci_gateway/c/sci_tohome.c' || echo '$(srcdir)/'`sci_gateway/c/sci_tohome.c
-
-libsciconsole_disable_la-sci_lines.lo: sci_gateway/c/sci_lines.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-sci_lines.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-sci_lines.Tpo -c -o libsciconsole_disable_la-sci_lines.lo `test -f 'sci_gateway/c/sci_lines.c' || echo '$(srcdir)/'`sci_gateway/c/sci_lines.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-sci_lines.Tpo $(DEPDIR)/libsciconsole_disable_la-sci_lines.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_lines.c' object='libsciconsole_disable_la-sci_lines.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-sci_lines.lo `test -f 'sci_gateway/c/sci_lines.c' || echo '$(srcdir)/'`sci_gateway/c/sci_lines.c
-
-libsciconsole_disable_la-sci_prompt.lo: sci_gateway/c/sci_prompt.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-sci_prompt.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-sci_prompt.Tpo -c -o libsciconsole_disable_la-sci_prompt.lo `test -f 'sci_gateway/c/sci_prompt.c' || echo '$(srcdir)/'`sci_gateway/c/sci_prompt.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-sci_prompt.Tpo $(DEPDIR)/libsciconsole_disable_la-sci_prompt.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_prompt.c' object='libsciconsole_disable_la-sci_prompt.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-sci_prompt.lo `test -f 'sci_gateway/c/sci_prompt.c' || echo '$(srcdir)/'`sci_gateway/c/sci_prompt.c
-
-libsciconsole_disable_la-sci_iswaitingforinput.lo: sci_gateway/c/sci_iswaitingforinput.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-sci_iswaitingforinput.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-sci_iswaitingforinput.Tpo -c -o libsciconsole_disable_la-sci_iswaitingforinput.lo `test -f 'sci_gateway/c/sci_iswaitingforinput.c' || echo '$(srcdir)/'`sci_gateway/c/sci_iswaitingforinput.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-sci_iswaitingforinput.Tpo $(DEPDIR)/libsciconsole_disable_la-sci_iswaitingforinput.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_iswaitingforinput.c' object='libsciconsole_disable_la-sci_iswaitingforinput.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-sci_iswaitingforinput.lo `test -f 'sci_gateway/c/sci_iswaitingforinput.c' || echo '$(srcdir)/'`sci_gateway/c/sci_iswaitingforinput.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-gw_console.lo `test -f 'sci_gateway/c/gw_console.c' || echo '$(srcdir)/'`sci_gateway/c/gw_console.c
 
 libsciconsole_disable_la-clc.lo: src/c/clc.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-clc.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-clc.Tpo -c -o libsciconsole_disable_la-clc.lo `test -f 'src/c/clc.c' || echo '$(srcdir)/'`src/c/clc.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-clc.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-clc.Tpo -c -o libsciconsole_disable_la-clc.lo `test -f 'src/c/clc.c' || echo '$(srcdir)/'`src/c/clc.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-clc.Tpo $(DEPDIR)/libsciconsole_disable_la-clc.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/clc.c' object='libsciconsole_disable_la-clc.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-clc.lo `test -f 'src/c/clc.c' || echo '$(srcdir)/'`src/c/clc.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-clc.lo `test -f 'src/c/clc.c' || echo '$(srcdir)/'`src/c/clc.c
 
 libsciconsole_disable_la-tohome.lo: src/c/tohome.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-tohome.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-tohome.Tpo -c -o libsciconsole_disable_la-tohome.lo `test -f 'src/c/tohome.c' || echo '$(srcdir)/'`src/c/tohome.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-tohome.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-tohome.Tpo -c -o libsciconsole_disable_la-tohome.lo `test -f 'src/c/tohome.c' || echo '$(srcdir)/'`src/c/tohome.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-tohome.Tpo $(DEPDIR)/libsciconsole_disable_la-tohome.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/tohome.c' object='libsciconsole_disable_la-tohome.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-tohome.lo `test -f 'src/c/tohome.c' || echo '$(srcdir)/'`src/c/tohome.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-tohome.lo `test -f 'src/c/tohome.c' || echo '$(srcdir)/'`src/c/tohome.c
 
 libsciconsole_disable_la-more.lo: src/c/more.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-more.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-more.Tpo -c -o libsciconsole_disable_la-more.lo `test -f 'src/c/more.c' || echo '$(srcdir)/'`src/c/more.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-more.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-more.Tpo -c -o libsciconsole_disable_la-more.lo `test -f 'src/c/more.c' || echo '$(srcdir)/'`src/c/more.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-more.Tpo $(DEPDIR)/libsciconsole_disable_la-more.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/more.c' object='libsciconsole_disable_la-more.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-more.lo `test -f 'src/c/more.c' || echo '$(srcdir)/'`src/c/more.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-more.lo `test -f 'src/c/more.c' || echo '$(srcdir)/'`src/c/more.c
 
 libsciconsole_disable_la-scilines.lo: src/c/scilines.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-scilines.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-scilines.Tpo -c -o libsciconsole_disable_la-scilines.lo `test -f 'src/c/scilines.c' || echo '$(srcdir)/'`src/c/scilines.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-scilines.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-scilines.Tpo -c -o libsciconsole_disable_la-scilines.lo `test -f 'src/c/scilines.c' || echo '$(srcdir)/'`src/c/scilines.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-scilines.Tpo $(DEPDIR)/libsciconsole_disable_la-scilines.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/scilines.c' object='libsciconsole_disable_la-scilines.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-scilines.lo `test -f 'src/c/scilines.c' || echo '$(srcdir)/'`src/c/scilines.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-scilines.lo `test -f 'src/c/scilines.c' || echo '$(srcdir)/'`src/c/scilines.c
 
 libsciconsole_disable_la-GetCommandLine.lo: src/c/GetCommandLine.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-GetCommandLine.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-GetCommandLine.Tpo -c -o libsciconsole_disable_la-GetCommandLine.lo `test -f 'src/c/GetCommandLine.c' || echo '$(srcdir)/'`src/c/GetCommandLine.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-GetCommandLine.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-GetCommandLine.Tpo -c -o libsciconsole_disable_la-GetCommandLine.lo `test -f 'src/c/GetCommandLine.c' || echo '$(srcdir)/'`src/c/GetCommandLine.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-GetCommandLine.Tpo $(DEPDIR)/libsciconsole_disable_la-GetCommandLine.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/GetCommandLine.c' object='libsciconsole_disable_la-GetCommandLine.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-GetCommandLine.lo `test -f 'src/c/GetCommandLine.c' || echo '$(srcdir)/'`src/c/GetCommandLine.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-GetCommandLine.lo `test -f 'src/c/GetCommandLine.c' || echo '$(srcdir)/'`src/c/GetCommandLine.c
 
 libsciconsole_disable_la-zzledt.lo: src/c/others/zzledt.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-zzledt.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-zzledt.Tpo -c -o libsciconsole_disable_la-zzledt.lo `test -f 'src/c/others/zzledt.c' || echo '$(srcdir)/'`src/c/others/zzledt.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-zzledt.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-zzledt.Tpo -c -o libsciconsole_disable_la-zzledt.lo `test -f 'src/c/others/zzledt.c' || echo '$(srcdir)/'`src/c/others/zzledt.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-zzledt.Tpo $(DEPDIR)/libsciconsole_disable_la-zzledt.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/others/zzledt.c' object='libsciconsole_disable_la-zzledt.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-zzledt.lo `test -f 'src/c/others/zzledt.c' || echo '$(srcdir)/'`src/c/others/zzledt.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-zzledt.lo `test -f 'src/c/others/zzledt.c' || echo '$(srcdir)/'`src/c/others/zzledt.c
 
 libsciconsole_disable_la-gotoxy_nw.lo: src/c/others/gotoxy_nw.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-gotoxy_nw.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-gotoxy_nw.Tpo -c -o libsciconsole_disable_la-gotoxy_nw.lo `test -f 'src/c/others/gotoxy_nw.c' || echo '$(srcdir)/'`src/c/others/gotoxy_nw.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-gotoxy_nw.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-gotoxy_nw.Tpo -c -o libsciconsole_disable_la-gotoxy_nw.lo `test -f 'src/c/others/gotoxy_nw.c' || echo '$(srcdir)/'`src/c/others/gotoxy_nw.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-gotoxy_nw.Tpo $(DEPDIR)/libsciconsole_disable_la-gotoxy_nw.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/others/gotoxy_nw.c' object='libsciconsole_disable_la-gotoxy_nw.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-gotoxy_nw.lo `test -f 'src/c/others/gotoxy_nw.c' || echo '$(srcdir)/'`src/c/others/gotoxy_nw.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-gotoxy_nw.lo `test -f 'src/c/others/gotoxy_nw.c' || echo '$(srcdir)/'`src/c/others/gotoxy_nw.c
 
 libsciconsole_disable_la-clrscr_nw.lo: src/c/others/clrscr_nw.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-clrscr_nw.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-clrscr_nw.Tpo -c -o libsciconsole_disable_la-clrscr_nw.lo `test -f 'src/c/others/clrscr_nw.c' || echo '$(srcdir)/'`src/c/others/clrscr_nw.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-clrscr_nw.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-clrscr_nw.Tpo -c -o libsciconsole_disable_la-clrscr_nw.lo `test -f 'src/c/others/clrscr_nw.c' || echo '$(srcdir)/'`src/c/others/clrscr_nw.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-clrscr_nw.Tpo $(DEPDIR)/libsciconsole_disable_la-clrscr_nw.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/others/clrscr_nw.c' object='libsciconsole_disable_la-clrscr_nw.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-clrscr_nw.lo `test -f 'src/c/others/clrscr_nw.c' || echo '$(srcdir)/'`src/c/others/clrscr_nw.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-clrscr_nw.lo `test -f 'src/c/others/clrscr_nw.c' || echo '$(srcdir)/'`src/c/others/clrscr_nw.c
 
 libsciconsole_disable_la-prompt.lo: src/c/prompt.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-prompt.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-prompt.Tpo -c -o libsciconsole_disable_la-prompt.lo `test -f 'src/c/prompt.c' || echo '$(srcdir)/'`src/c/prompt.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-prompt.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-prompt.Tpo -c -o libsciconsole_disable_la-prompt.lo `test -f 'src/c/prompt.c' || echo '$(srcdir)/'`src/c/prompt.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-prompt.Tpo $(DEPDIR)/libsciconsole_disable_la-prompt.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/prompt.c' object='libsciconsole_disable_la-prompt.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-prompt.lo `test -f 'src/c/prompt.c' || echo '$(srcdir)/'`src/c/prompt.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-prompt.lo `test -f 'src/c/prompt.c' || echo '$(srcdir)/'`src/c/prompt.c
 
 libsciconsole_disable_la-promptecho.lo: src/c/promptecho.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-promptecho.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-promptecho.Tpo -c -o libsciconsole_disable_la-promptecho.lo `test -f 'src/c/promptecho.c' || echo '$(srcdir)/'`src/c/promptecho.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-promptecho.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-promptecho.Tpo -c -o libsciconsole_disable_la-promptecho.lo `test -f 'src/c/promptecho.c' || echo '$(srcdir)/'`src/c/promptecho.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-promptecho.Tpo $(DEPDIR)/libsciconsole_disable_la-promptecho.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/promptecho.c' object='libsciconsole_disable_la-promptecho.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-promptecho.lo `test -f 'src/c/promptecho.c' || echo '$(srcdir)/'`src/c/promptecho.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-promptecho.lo `test -f 'src/c/promptecho.c' || echo '$(srcdir)/'`src/c/promptecho.c
 
 libsciconsole_disable_la-initMacOSXEnv.lo: src/c/others/initMacOSXEnv.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-initMacOSXEnv.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-initMacOSXEnv.Tpo -c -o libsciconsole_disable_la-initMacOSXEnv.lo `test -f 'src/c/others/initMacOSXEnv.c' || echo '$(srcdir)/'`src/c/others/initMacOSXEnv.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -MT libsciconsole_disable_la-initMacOSXEnv.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-initMacOSXEnv.Tpo -c -o libsciconsole_disable_la-initMacOSXEnv.lo `test -f 'src/c/others/initMacOSXEnv.c' || echo '$(srcdir)/'`src/c/others/initMacOSXEnv.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_disable_la-initMacOSXEnv.Tpo $(DEPDIR)/libsciconsole_disable_la-initMacOSXEnv.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/others/initMacOSXEnv.c' object='libsciconsole_disable_la-initMacOSXEnv.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) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-initMacOSXEnv.lo `test -f 'src/c/others/initMacOSXEnv.c' || echo '$(srcdir)/'`src/c/others/initMacOSXEnv.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_disable_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_disable_la-initMacOSXEnv.lo `test -f 'src/c/others/initMacOSXEnv.c' || echo '$(srcdir)/'`src/c/others/initMacOSXEnv.c
 
 libsciconsole_la-GuiManagement_wrap.lo: src/jni/GuiManagement_wrap.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_la_CFLAGS) $(CFLAGS) -MT libsciconsole_la-GuiManagement_wrap.lo -MD -MP -MF $(DEPDIR)/libsciconsole_la-GuiManagement_wrap.Tpo -c -o libsciconsole_la-GuiManagement_wrap.lo `test -f 'src/jni/GuiManagement_wrap.c' || echo '$(srcdir)/'`src/jni/GuiManagement_wrap.c
@@ -1096,41 +1110,6 @@ libsciconsole_la-gw_console.lo: sci_gateway/c/gw_console.c
 @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) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_la-gw_console.lo `test -f 'sci_gateway/c/gw_console.c' || echo '$(srcdir)/'`sci_gateway/c/gw_console.c
 
-libsciconsole_la-sci_clc.lo: sci_gateway/c/sci_clc.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_la_CFLAGS) $(CFLAGS) -MT libsciconsole_la-sci_clc.lo -MD -MP -MF $(DEPDIR)/libsciconsole_la-sci_clc.Tpo -c -o libsciconsole_la-sci_clc.lo `test -f 'sci_gateway/c/sci_clc.c' || echo '$(srcdir)/'`sci_gateway/c/sci_clc.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_la-sci_clc.Tpo $(DEPDIR)/libsciconsole_la-sci_clc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_clc.c' object='libsciconsole_la-sci_clc.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) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_la-sci_clc.lo `test -f 'sci_gateway/c/sci_clc.c' || echo '$(srcdir)/'`sci_gateway/c/sci_clc.c
-
-libsciconsole_la-sci_tohome.lo: sci_gateway/c/sci_tohome.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_la_CFLAGS) $(CFLAGS) -MT libsciconsole_la-sci_tohome.lo -MD -MP -MF $(DEPDIR)/libsciconsole_la-sci_tohome.Tpo -c -o libsciconsole_la-sci_tohome.lo `test -f 'sci_gateway/c/sci_tohome.c' || echo '$(srcdir)/'`sci_gateway/c/sci_tohome.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_la-sci_tohome.Tpo $(DEPDIR)/libsciconsole_la-sci_tohome.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_tohome.c' object='libsciconsole_la-sci_tohome.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) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_la-sci_tohome.lo `test -f 'sci_gateway/c/sci_tohome.c' || echo '$(srcdir)/'`sci_gateway/c/sci_tohome.c
-
-libsciconsole_la-sci_lines.lo: sci_gateway/c/sci_lines.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_la_CFLAGS) $(CFLAGS) -MT libsciconsole_la-sci_lines.lo -MD -MP -MF $(DEPDIR)/libsciconsole_la-sci_lines.Tpo -c -o libsciconsole_la-sci_lines.lo `test -f 'sci_gateway/c/sci_lines.c' || echo '$(srcdir)/'`sci_gateway/c/sci_lines.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_la-sci_lines.Tpo $(DEPDIR)/libsciconsole_la-sci_lines.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_lines.c' object='libsciconsole_la-sci_lines.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) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_la-sci_lines.lo `test -f 'sci_gateway/c/sci_lines.c' || echo '$(srcdir)/'`sci_gateway/c/sci_lines.c
-
-libsciconsole_la-sci_prompt.lo: sci_gateway/c/sci_prompt.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_la_CFLAGS) $(CFLAGS) -MT libsciconsole_la-sci_prompt.lo -MD -MP -MF $(DEPDIR)/libsciconsole_la-sci_prompt.Tpo -c -o libsciconsole_la-sci_prompt.lo `test -f 'sci_gateway/c/sci_prompt.c' || echo '$(srcdir)/'`sci_gateway/c/sci_prompt.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_la-sci_prompt.Tpo $(DEPDIR)/libsciconsole_la-sci_prompt.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_prompt.c' object='libsciconsole_la-sci_prompt.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) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_la-sci_prompt.lo `test -f 'sci_gateway/c/sci_prompt.c' || echo '$(srcdir)/'`sci_gateway/c/sci_prompt.c
-
-libsciconsole_la-sci_iswaitingforinput.lo: sci_gateway/c/sci_iswaitingforinput.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_la_CFLAGS) $(CFLAGS) -MT libsciconsole_la-sci_iswaitingforinput.lo -MD -MP -MF $(DEPDIR)/libsciconsole_la-sci_iswaitingforinput.Tpo -c -o libsciconsole_la-sci_iswaitingforinput.lo `test -f 'sci_gateway/c/sci_iswaitingforinput.c' || echo '$(srcdir)/'`sci_gateway/c/sci_iswaitingforinput.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciconsole_la-sci_iswaitingforinput.Tpo $(DEPDIR)/libsciconsole_la-sci_iswaitingforinput.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_iswaitingforinput.c' object='libsciconsole_la-sci_iswaitingforinput.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) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(libsciconsole_la_CFLAGS) $(CFLAGS) -c -o libsciconsole_la-sci_iswaitingforinput.lo `test -f 'sci_gateway/c/sci_iswaitingforinput.c' || echo '$(srcdir)/'`sci_gateway/c/sci_iswaitingforinput.c
-
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@@ -1152,6 +1131,55 @@ libsciconsole_la-sci_iswaitingforinput.lo: sci_gateway/c/sci_iswaitingforinput.c
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
 
+libsciconsole_disable_la-scilabRead.lo: src/cpp/scilabRead.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciconsole_disable_la-scilabRead.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-scilabRead.Tpo -c -o libsciconsole_disable_la-scilabRead.lo `test -f 'src/cpp/scilabRead.cpp' || echo '$(srcdir)/'`src/cpp/scilabRead.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciconsole_disable_la-scilabRead.Tpo $(DEPDIR)/libsciconsole_disable_la-scilabRead.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/scilabRead.cpp' object='libsciconsole_disable_la-scilabRead.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) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciconsole_disable_la-scilabRead.lo `test -f 'src/cpp/scilabRead.cpp' || echo '$(srcdir)/'`src/cpp/scilabRead.cpp
+
+libsciconsole_disable_la-console_gw.lo: sci_gateway/cpp/console_gw.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciconsole_disable_la-console_gw.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-console_gw.Tpo -c -o libsciconsole_disable_la-console_gw.lo `test -f 'sci_gateway/cpp/console_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/console_gw.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciconsole_disable_la-console_gw.Tpo $(DEPDIR)/libsciconsole_disable_la-console_gw.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/console_gw.cpp' object='libsciconsole_disable_la-console_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) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciconsole_disable_la-console_gw.lo `test -f 'sci_gateway/cpp/console_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/console_gw.cpp
+
+libsciconsole_disable_la-sci_clc.lo: sci_gateway/cpp/sci_clc.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciconsole_disable_la-sci_clc.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-sci_clc.Tpo -c -o libsciconsole_disable_la-sci_clc.lo `test -f 'sci_gateway/cpp/sci_clc.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_clc.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciconsole_disable_la-sci_clc.Tpo $(DEPDIR)/libsciconsole_disable_la-sci_clc.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_clc.cpp' object='libsciconsole_disable_la-sci_clc.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) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciconsole_disable_la-sci_clc.lo `test -f 'sci_gateway/cpp/sci_clc.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_clc.cpp
+
+libsciconsole_disable_la-sci_tohome.lo: sci_gateway/cpp/sci_tohome.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciconsole_disable_la-sci_tohome.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-sci_tohome.Tpo -c -o libsciconsole_disable_la-sci_tohome.lo `test -f 'sci_gateway/cpp/sci_tohome.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_tohome.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciconsole_disable_la-sci_tohome.Tpo $(DEPDIR)/libsciconsole_disable_la-sci_tohome.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_tohome.cpp' object='libsciconsole_disable_la-sci_tohome.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) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciconsole_disable_la-sci_tohome.lo `test -f 'sci_gateway/cpp/sci_tohome.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_tohome.cpp
+
+libsciconsole_disable_la-sci_lines.lo: sci_gateway/cpp/sci_lines.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciconsole_disable_la-sci_lines.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-sci_lines.Tpo -c -o libsciconsole_disable_la-sci_lines.lo `test -f 'sci_gateway/cpp/sci_lines.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_lines.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciconsole_disable_la-sci_lines.Tpo $(DEPDIR)/libsciconsole_disable_la-sci_lines.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_lines.cpp' object='libsciconsole_disable_la-sci_lines.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) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciconsole_disable_la-sci_lines.lo `test -f 'sci_gateway/cpp/sci_lines.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_lines.cpp
+
+libsciconsole_disable_la-sci_prompt.lo: sci_gateway/cpp/sci_prompt.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciconsole_disable_la-sci_prompt.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-sci_prompt.Tpo -c -o libsciconsole_disable_la-sci_prompt.lo `test -f 'sci_gateway/cpp/sci_prompt.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_prompt.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciconsole_disable_la-sci_prompt.Tpo $(DEPDIR)/libsciconsole_disable_la-sci_prompt.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_prompt.cpp' object='libsciconsole_disable_la-sci_prompt.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) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciconsole_disable_la-sci_prompt.lo `test -f 'sci_gateway/cpp/sci_prompt.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_prompt.cpp
+
+libsciconsole_disable_la-sci_iswaitingforinput.lo: sci_gateway/cpp/sci_iswaitingforinput.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciconsole_disable_la-sci_iswaitingforinput.lo -MD -MP -MF $(DEPDIR)/libsciconsole_disable_la-sci_iswaitingforinput.Tpo -c -o libsciconsole_disable_la-sci_iswaitingforinput.lo `test -f 'sci_gateway/cpp/sci_iswaitingforinput.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_iswaitingforinput.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciconsole_disable_la-sci_iswaitingforinput.Tpo $(DEPDIR)/libsciconsole_disable_la-sci_iswaitingforinput.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_iswaitingforinput.cpp' object='libsciconsole_disable_la-sci_iswaitingforinput.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) $(libsciconsole_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciconsole_disable_la-sci_iswaitingforinput.lo `test -f 'sci_gateway/cpp/sci_iswaitingforinput.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_iswaitingforinput.cpp
+
 libsciconsole_la-CallScilabBridge.lo: src/jni/CallScilabBridge.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciconsole_la-CallScilabBridge.lo -MD -MP -MF $(DEPDIR)/libsciconsole_la-CallScilabBridge.Tpo -c -o libsciconsole_la-CallScilabBridge.lo `test -f 'src/jni/CallScilabBridge.cpp' || echo '$(srcdir)/'`src/jni/CallScilabBridge.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciconsole_la-CallScilabBridge.Tpo $(DEPDIR)/libsciconsole_la-CallScilabBridge.Plo
@@ -1229,6 +1257,55 @@ libsciconsole_la-SetConsolePrompt.lo: src/cpp/SetConsolePrompt.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) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciconsole_la-SetConsolePrompt.lo `test -f 'src/cpp/SetConsolePrompt.cpp' || echo '$(srcdir)/'`src/cpp/SetConsolePrompt.cpp
 
+libsciconsole_la-scilabRead.lo: src/cpp/scilabRead.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciconsole_la-scilabRead.lo -MD -MP -MF $(DEPDIR)/libsciconsole_la-scilabRead.Tpo -c -o libsciconsole_la-scilabRead.lo `test -f 'src/cpp/scilabRead.cpp' || echo '$(srcdir)/'`src/cpp/scilabRead.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciconsole_la-scilabRead.Tpo $(DEPDIR)/libsciconsole_la-scilabRead.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/scilabRead.cpp' object='libsciconsole_la-scilabRead.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) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciconsole_la-scilabRead.lo `test -f 'src/cpp/scilabRead.cpp' || echo '$(srcdir)/'`src/cpp/scilabRead.cpp
+
+libsciconsole_la-console_gw.lo: sci_gateway/cpp/console_gw.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciconsole_la-console_gw.lo -MD -MP -MF $(DEPDIR)/libsciconsole_la-console_gw.Tpo -c -o libsciconsole_la-console_gw.lo `test -f 'sci_gateway/cpp/console_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/console_gw.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciconsole_la-console_gw.Tpo $(DEPDIR)/libsciconsole_la-console_gw.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/console_gw.cpp' object='libsciconsole_la-console_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) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciconsole_la-console_gw.lo `test -f 'sci_gateway/cpp/console_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/console_gw.cpp
+
+libsciconsole_la-sci_clc.lo: sci_gateway/cpp/sci_clc.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciconsole_la-sci_clc.lo -MD -MP -MF $(DEPDIR)/libsciconsole_la-sci_clc.Tpo -c -o libsciconsole_la-sci_clc.lo `test -f 'sci_gateway/cpp/sci_clc.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_clc.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciconsole_la-sci_clc.Tpo $(DEPDIR)/libsciconsole_la-sci_clc.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_clc.cpp' object='libsciconsole_la-sci_clc.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) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciconsole_la-sci_clc.lo `test -f 'sci_gateway/cpp/sci_clc.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_clc.cpp
+
+libsciconsole_la-sci_iswaitingforinput.lo: sci_gateway/cpp/sci_iswaitingforinput.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciconsole_la-sci_iswaitingforinput.lo -MD -MP -MF $(DEPDIR)/libsciconsole_la-sci_iswaitingforinput.Tpo -c -o libsciconsole_la-sci_iswaitingforinput.lo `test -f 'sci_gateway/cpp/sci_iswaitingforinput.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_iswaitingforinput.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciconsole_la-sci_iswaitingforinput.Tpo $(DEPDIR)/libsciconsole_la-sci_iswaitingforinput.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_iswaitingforinput.cpp' object='libsciconsole_la-sci_iswaitingforinput.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) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciconsole_la-sci_iswaitingforinput.lo `test -f 'sci_gateway/cpp/sci_iswaitingforinput.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_iswaitingforinput.cpp
+
+libsciconsole_la-sci_lines.lo: sci_gateway/cpp/sci_lines.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciconsole_la-sci_lines.lo -MD -MP -MF $(DEPDIR)/libsciconsole_la-sci_lines.Tpo -c -o libsciconsole_la-sci_lines.lo `test -f 'sci_gateway/cpp/sci_lines.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_lines.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciconsole_la-sci_lines.Tpo $(DEPDIR)/libsciconsole_la-sci_lines.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_lines.cpp' object='libsciconsole_la-sci_lines.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) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciconsole_la-sci_lines.lo `test -f 'sci_gateway/cpp/sci_lines.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_lines.cpp
+
+libsciconsole_la-sci_prompt.lo: sci_gateway/cpp/sci_prompt.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciconsole_la-sci_prompt.lo -MD -MP -MF $(DEPDIR)/libsciconsole_la-sci_prompt.Tpo -c -o libsciconsole_la-sci_prompt.lo `test -f 'sci_gateway/cpp/sci_prompt.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_prompt.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciconsole_la-sci_prompt.Tpo $(DEPDIR)/libsciconsole_la-sci_prompt.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_prompt.cpp' object='libsciconsole_la-sci_prompt.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) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciconsole_la-sci_prompt.lo `test -f 'sci_gateway/cpp/sci_prompt.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_prompt.cpp
+
+libsciconsole_la-sci_tohome.lo: sci_gateway/cpp/sci_tohome.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciconsole_la-sci_tohome.lo -MD -MP -MF $(DEPDIR)/libsciconsole_la-sci_tohome.Tpo -c -o libsciconsole_la-sci_tohome.lo `test -f 'sci_gateway/cpp/sci_tohome.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_tohome.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libsciconsole_la-sci_tohome.Tpo $(DEPDIR)/libsciconsole_la-sci_tohome.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_tohome.cpp' object='libsciconsole_la-sci_tohome.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) $(libsciconsole_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciconsole_la-sci_tohome.lo `test -f 'sci_gateway/cpp/sci_tohome.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_tohome.cpp
+
 mostlyclean-libtool:
        -rm -f *.lo
 
@@ -1513,17 +1590,20 @@ uninstall-am: uninstall-libsciconsole_la_etcDATA \
        uninstall-libsciconsole_la_sci_gatewayDATA \
        uninstall-pkglibLTLIBRARIES
 
-                               -I$(top_srcdir)/modules/output_stream/includes \
-                               -I$(top_srcdir)/modules/history_manager/includes/ \
-                               -I$(top_srcdir)/modules/output_stream/includes \
-                               -I$(top_srcdir)/modules/core/includes \
-                               -I$(top_srcdir)/modules/completion/includes \
-                               -I$(top_srcdir)/modules/localization/includes \
-                               -I$(top_srcdir)/modules/action_binding/includes/ \
-                               -I$(top_srcdir)/modules/fileio/src/c/ \
-                               -I$(top_srcdir)/modules/api_scilab/includes \
-                               -I$(top_srcdir)/modules/fileio/includes \
-                               -I$(top_srcdir)/modules/ui_data/includes/
+
+#
+ Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/history_manager/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/core/includes \
+       -I$(top_srcdir)/modules/completion/includes \
+       -I$(top_srcdir)/modules/localization/includes \
+       -I$(top_srcdir)/modules/action_binding/includes/ \
+       -I$(top_srcdir)/modules/fileio/src/c/ \
+       -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(top_srcdir)/modules/fileio/includes \
+       -I$(top_srcdir)/modules/ui_data/includes/
 
 # This target enables tests for Scilab
 check-local: $(top_builddir)/scilab-bin test
diff --git a/scilab/modules/console/includes/console_gw.hxx b/scilab/modules/console/includes/console_gw.hxx
new file mode 100644 (file)
index 0000000..3d93d48
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  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 __SHELL_GW_HXX__
+#define __SHELL_GW_HXX__
+
+#include "cpp_gateway_prototype.hxx"
+
+extern "C"
+{
+#include "dynlib_console_gw.h"
+}
+
+class ConsoleModule
+{
+private :
+   ConsoleModule(){};
+   ~ConsoleModule(){};
+public :
+   EXTERN_CONSOLE_GW static int Load();
+};
+
+CPP_GATEWAY_PROTOTYPE(sci_clc);
+CPP_GATEWAY_PROTOTYPE(sci_iswaitingforinput);
+CPP_GATEWAY_PROTOTYPE(sci_lines);
+CPP_GATEWAY_PROTOTYPE(sci_tohome);
+CPP_GATEWAY_PROTOTYPE(sci_prompt);
+
+#endif /* !__SHELL_GW_HXX__ */
\ No newline at end of file
diff --git a/scilab/modules/console/includes/dynlib_console_gw.h b/scilab/modules/console/includes/dynlib_console_gw.h
new file mode 100644 (file)
index 0000000..522c82b
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) DIGITEO - 2009 - Allan CORNET
+* 
+* 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_CONSOLE_GW_H__
+#define __DYNLIB_CONSOLE_GW_H__
+
+#ifdef _MSC_VER
+#ifdef CONSOLE_GW_EXPORTS
+#define EXTERN_CONSOLE_GW __declspec(dllexport)
+#else
+#define EXTERN_CONSOLE_GW __declspec(dllimport)
+#endif
+#else
+#define EXTERN_CONSOLE_GW
+#endif
+
+#endif /* __DYNLIB_CONSOLE_GW_H__ */
+/*--------------------------------------------------------------------------*/ 
\ No newline at end of file
index a784f50..12cff6d 100644 (file)
@@ -21,11 +21,11 @@ CONSOLE_IMPEXP int gw_console(void);
 /*--------------------------------------------------------------------------*/
 /* Declaration of all the profile function declared and */
 /* used in sci_gateway */
-CONSOLE_IMPEXP int sci_clc(char *fname,unsigned long fname_len);
-CONSOLE_IMPEXP int sci_tohome(char *fname,unsigned long fname_len);
-CONSOLE_IMPEXP int sci_lines(char *fname, int *_piKey);
-CONSOLE_IMPEXP int sci_prompt(char *fname,unsigned long fname_len);
-CONSOLE_IMPEXP int sci_iswaitingforinput(char *fname,unsigned long fname_len);
+//CONSOLE_IMPEXP int sci_clc(char *fname,unsigned long fname_len);
+//CONSOLE_IMPEXP int sci_tohome(char *fname,unsigned long fname_len);
+//CONSOLE_IMPEXP int sci_lines(char *fname, int *_piKey);
+//CONSOLE_IMPEXP int sci_prompt(char *fname,unsigned long fname_len);
+//CONSOLE_IMPEXP int sci_iswaitingforinput(char *fname,unsigned long fname_len);
 /*--------------------------------------------------------------------------*/
 #endif /*  __GW_CONSOLE_H__ */
 
diff --git a/scilab/modules/console/includes/scilabRead.h b/scilab/modules/console/includes/scilabRead.h
new file mode 100644 (file)
index 0000000..065304a
--- /dev/null
@@ -0,0 +1,23 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2011 - DIGITEO - 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 __SCILAB_READ_H__
+#define __SCILAB_READ_H__
+
+#include "dynlib_console.h"
+
+typedef char* (*SCILAB_INPUT_METHOD)(void);
+
+CONSOLE_IMPEXP void setScilabInputMethod(SCILAB_INPUT_METHOD reader);
+CONSOLE_IMPEXP char* scilabRead();
+
+#endif /* !__SCILAB_READ_H__ */
index 7875a51..471c2cd 100644 (file)
 /*--------------------------------------------------------------------------*/
 static gw_generic_table Tab[]=
 {
-{sci_clc,"clc"},
-{sci_tohome,"tohome"},
-//{sci_lines,"lines"},
-{sci_prompt,"prompt"},
-{sci_iswaitingforinput,"iswaitingforinput"}
+{NULL, ""}, //clc
+{NULL, ""}, //tohome
+{NULL, ""}, //lines
+{NULL, ""}, //prompt
+{NULL, ""} //iswaitingforinput
 };
 /*--------------------------------------------------------------------------*/
 int gw_console(void)
diff --git a/scilab/modules/console/sci_gateway/cpp/console_gw.cpp b/scilab/modules/console/sci_gateway/cpp/console_gw.cpp
new file mode 100644 (file)
index 0000000..92970cc
--- /dev/null
@@ -0,0 +1,33 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2011 - DIGITEO - Cedric DELAMARRE
+ *  Copyright (C) 2011 - DIGITEO - 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 "context.hxx"
+#include "function.hxx"
+#include "console_gw.hxx"
+
+extern "C"
+{
+    #include "gw_console.h"
+}
+
+#define MODULE_NAME L"console"
+
+int ConsoleModule::Load()
+{
+    symbol::Context::getInstance()->AddFunction(types::Function::createFunction(L"clc", &sci_clc, MODULE_NAME));
+    symbol::Context::getInstance()->AddFunction(types::Function::createFunction(L"tohome", &sci_tohome, MODULE_NAME));
+    symbol::Context::getInstance()->AddFunction(types::Function::createFunction(L"lines", &sci_lines, MODULE_NAME));
+    symbol::Context::getInstance()->AddFunction(types::Function::createFunction(L"prompt", &sci_prompt, MODULE_NAME));
+    symbol::Context::getInstance()->AddFunction(types::Function::createFunction(L"iswaitingforinput",   &sci_iswaitingforinput, MODULE_NAME));
+    return true;
+}
\ No newline at end of file
diff --git a/scilab/modules/console/sci_gateway/cpp/console_gw.vcxproj b/scilab/modules/console/sci_gateway/cpp/console_gw.vcxproj
new file mode 100644 (file)
index 0000000..67a394c
--- /dev/null
@@ -0,0 +1,206 @@
+<?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>
+  <ItemGroup>
+    <ClCompile Include="console_gw.cpp" />
+    <ClCompile Include="sci_clc.cpp" />
+    <ClCompile Include="sci_iswaitingforinput.cpp" />
+    <ClCompile Include="sci_lines.cpp" />
+    <ClCompile Include="sci_prompt.cpp" />
+    <ClCompile Include="sci_tohome.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\includes\console_gw.hxx" />
+    <ClInclude Include="..\..\includes\dynlib_console_gw.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <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="..\..\..\system_env\system_env.vcxproj">
+      <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\types\types.vcxproj">
+      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\c\console.vcxproj">
+      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Library Include="..\..\..\..\bin\libintl.lib" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{273B1F5C-C137-46D1-B516-FFE5764FABE5}</ProjectGuid>
+    <RootNamespace>console_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>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</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'">true</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'">true</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>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/scilab/modules/console/sci_gateway/cpp/console_gw.vcxproj.filters b/scilab/modules/console/sci_gateway/cpp/console_gw.vcxproj.filters
new file mode 100644 (file)
index 0000000..66ab7a5
--- /dev/null
@@ -0,0 +1,48 @@
+<?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>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="console_gw.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_clc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_iswaitingforinput.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_lines.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_prompt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sci_tohome.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\includes\console_gw.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\dynlib_console_gw.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Library Include="..\..\..\..\bin\libintl.lib" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/scilab/modules/console/sci_gateway/cpp/sci_clc.cpp b/scilab/modules/console/sci_gateway/cpp/sci_clc.cpp
new file mode 100644 (file)
index 0000000..bfe0ab8
--- /dev/null
@@ -0,0 +1,65 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* 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 "console_gw.hxx"
+#include "function.hxx"
+#include "double.hxx"
+
+extern "C"
+{
+#include "localization.h"
+#include "Scierror.h"
+#include "clc.h"
+}
+/*--------------------------------------------------------------------------*/
+
+types::Function::ReturnValue sci_clc(types::typed_list &in, int _iRetCount, types::typed_list &out)
+{
+       BOOL res = FALSE;
+       int nblines = -1;
+
+    if(in.size() == 0)
+    {
+               /* Clear console full */
+               nblines = -1;
+    }
+    else if(in.size() == 1)
+    {
+        if((in[0]->isDouble() == false) || !in[0]->getAs<types::Double>()->isScalar())
+        {
+            ScierrorW(999, _W("%ls: Wrong type for input argument #%d: A double scalar expected.\n"), L"clc", 1);
+            return types::Function::Error;
+        }
+        nblines = (int)in[0]->getAs<types::Double>()->get(0);
+        if(nblines < 0)
+        {
+            ScierrorW(999, _W("%ls: Wrong value for input argument #%d: A positive double expected\n"), L"clc", 1);
+            return types::Function::Error;
+        }
+    }
+    else
+    {
+        ScierrorW(77, _W("%ls: Wrong number of input argument(s): %d to %d expected.\n"), L"clc", 0, 1);
+        return types::Function::Error;
+    }
+
+    res = clc(nblines);
+    if (!res)
+    {
+        ScierrorW(999, _W("%ls: This feature has not been implemented in this mode.\n"), L"clc");
+        return types::Function::Error;
+    }
+
+    return types::Function::OK;
+}
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/console/sci_gateway/cpp/sci_iswaitingforinput.cpp b/scilab/modules/console/sci_gateway/cpp/sci_iswaitingforinput.cpp
new file mode 100644 (file)
index 0000000..800dd95
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* 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 "console_gw.hxx"
+#include "function.hxx"
+#include "bool.hxx"
+
+extern "C"
+{
+#include "localization.h"
+#include "Scierror.h"
+#include "ConsoleIsWaitingForInput.h"
+#include "sci_mode.h"
+}
+/*--------------------------------------------------------------------------*/
+
+types::Function::ReturnValue sci_iswaitingforinput(types::typed_list &in, int _iRetCount, types::typed_list &out)
+{
+       BOOL res = FALSE;
+
+    if (getScilabMode() == SCILAB_STD) 
+    {
+        res = ConsoleIsWaitingForInput();
+    } 
+    else 
+    {
+        ScierrorW(999, _W("%ls: Not implemented in this mode.\n"), L"iswaitingforinput");
+        return types::Function::Error;
+    }
+
+    out.push_back(new types::Bool(res));
+    return types::Function::OK;
+}
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/console/sci_gateway/cpp/sci_lines.cpp b/scilab/modules/console/sci_gateway/cpp/sci_lines.cpp
new file mode 100644 (file)
index 0000000..ebd5955
--- /dev/null
@@ -0,0 +1,64 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* 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 "console_gw.hxx"
+#include "function.hxx"
+#include "double.hxx"
+#include "configvariable.hxx"
+
+extern "C"
+{
+#include "localization.h"
+#include "Scierror.h"
+}
+/*--------------------------------------------------------------------------*/
+
+types::Function::ReturnValue sci_lines(types::typed_list &in, int _iRetCount, types::typed_list &out)
+{
+    if(in.size() > 2)
+    {
+        ScierrorW(77, _W("%ls: Wrong number of input argument(s): %d to %d expected.\n"), L"lines", 0, 2);
+        return types::Function::Error;
+    }
+
+    if(in.size() == 0)
+    {
+        double size[] = {(double)ConfigVariable::getConsoleWidth(),
+                         (double)ConfigVariable::getConsoleLines()};
+        types::Double* pDbl = new types::Double(1,2);
+        pDbl->set(size); 
+        out.push_back(pDbl);
+        return types::Function::OK;
+    }
+
+    if(in.size() == 2)
+    {
+        if((in[1]->isDouble() == false) || !in[1]->getAs<types::Double>()->isScalar())
+        {
+            ScierrorW(999, _W("%ls: Wrong type for input argument #%d: A scalar expected.\n"), L"lines", 2);
+            return types::Function::Error;
+        }
+               ConfigVariable::setConsoleWidth((int)in[1]->getAs<types::Double>()->get(0));
+    }
+
+    if((in[0]->isDouble() == false) || !in[0]->getAs<types::Double>()->isScalar())
+    {
+        ScierrorW(999, _W("%ls: Wrong type for input argument #%d: A scalar expected.\n"), L"lines", 1);
+        return types::Function::Error;
+    }
+
+    ConfigVariable::setConsoleLines((int)in[0]->getAs<types::Double>()->get(0));
+
+    return types::Function::OK;
+}
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/console/sci_gateway/cpp/sci_prompt.cpp b/scilab/modules/console/sci_gateway/cpp/sci_prompt.cpp
new file mode 100644 (file)
index 0000000..c7df7bc
--- /dev/null
@@ -0,0 +1,67 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* 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 "console_gw.hxx"
+#include "function.hxx"
+#include "double.hxx"
+#include "string.hxx"
+#include "configvariable.hxx"
+
+extern "C"
+{
+#include "localization.h"
+#include "Scierror.h"
+#include "prompt.h"
+}
+/*--------------------------------------------------------------------------*/
+
+types::Function::ReturnValue sci_prompt(types::typed_list &in, int _iRetCount, types::typed_list &out)
+{
+       char currentPrompt[PROMPT_SIZE_MAX];
+
+    if(_iRetCount != 0)
+    {
+        ScierrorW(78, _W("%ls: Wrong number of output argument(s): %d expected.\n"), L"prompt", 0);
+        return types::Function::Error;
+    }
+
+    if(in.size() > 1)
+    {
+        ScierrorW(77, _W("%ls: Wrong number of input argument(s): %d to %d expected.\n"), L"prompt", 0, 1);
+        return types::Function::Error;
+    }
+
+    if(in.size() == 0)/* Get current Scilab prompt */
+    {
+               GetCurrentPrompt(currentPrompt);
+        out.push_back(new types::String(currentPrompt));
+        if(_iRetCount == 2)
+        {
+            types::Double* pDbl = new types::Double(1,1);
+            pDbl->set(0, ConfigVariable::getPauseLevel());
+            out.push_back(pDbl);
+        }
+    }
+    else //if(in.size() == 1)
+    {
+        if((in[0]->isString() == false) || !in[0]->getAs<types::String>()->isScalar())
+        {
+            ScierrorW(999, _W("%ls: Wrong type for input argument #%d: A string expected.\n"), L"prompt", 1);
+            return types::Function::Error;
+        }
+               SetTemporaryPrompt(wide_string_to_UTF8(in[0]->getAs<types::String>()->get(0)));
+    }
+
+    return types::Function::OK;
+}
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/console/sci_gateway/cpp/sci_tohome.cpp b/scilab/modules/console/sci_gateway/cpp/sci_tohome.cpp
new file mode 100644 (file)
index 0000000..9d368c8
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* 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 "console_gw.hxx"
+#include "function.hxx"
+
+extern "C"
+{
+#include "localization.h"
+#include "Scierror.h"
+#include "tohome.h"
+}
+/*--------------------------------------------------------------------------*/
+
+types::Function::ReturnValue sci_tohome(types::typed_list &in, int _iRetCount, types::typed_list &out)
+{
+    if(in.size() != 0)
+    {
+        ScierrorW(77, _W("%ls: Wrong number of input argument(s): %d expected.\n"), L"prompt", 0);
+        return types::Function::Error;
+    }
+    if (!tohome())
+    {
+        ScierrorW(999, _W("%ls: This feature has not been implemented in this mode.\n"), L"prompt");
+        return types::Function::Error;
+    }
+
+    return types::Function::OK;
+}
+/*--------------------------------------------------------------------------*/
+
index 8db38bf..dff1939 100644 (file)
 #define __CLC_H__
 /*--------------------------------------------------------------------------*/
 #include "BOOL.h"
+#include "dynlib_console.h"
 /*--------------------------------------------------------------------------*/
 /**
 * clc function 
 * @param nblines numbers of lines -1 --> all
 * @return a boolean
 */
-BOOL clc(int nblines);
+CONSOLE_IMPEXP BOOL clc(int nblines);
 /*--------------------------------------------------------------------------*/
 #endif /* __CLC_H__ */
 
index cbcf099..1ad57a3 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -81,7 +81,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../types/includes;../../../ast/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -122,7 +122,7 @@ lib /DEF:"$(ProjectDir)libjvm_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../types/includes;../../../ast/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -163,7 +163,7 @@ lib /DEF:"$(ProjectDir)libjvm_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../types/includes;../../../ast/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -211,7 +211,7 @@ lib /DEF:"$(ProjectDir)libjvm_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../types/includes;../../../ast/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -254,11 +254,7 @@ lib /DEF:"$(ProjectDir)libjvm_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\sci_gateway\c\gw_console.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_clc.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_iswaitingforinput.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_lines.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_prompt.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_tohome.c" />
+    <ClCompile Include="..\cpp\scilabRead.cpp" />
     <ClCompile Include="..\jni\CallScilabBridge.cpp" />
     <ClCompile Include="..\cpp\ClearConsole.cpp" />
     <ClCompile Include="..\cpp\ClearConsolePart.cpp" />
@@ -358,6 +354,18 @@ lib /DEF:"$(ProjectDir)libjvm_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\includes\ConsolePrintf.h" />
+    <ClInclude Include="..\..\includes\ConsoleRead.h" />
+    <ClInclude Include="..\..\includes\dynlib_console.h" />
+    <ClInclude Include="..\..\includes\GetCommandLine.h" />
+    <ClInclude Include="..\..\includes\gw_console.h" />
+    <ClInclude Include="..\..\includes\InitializeConsole.h" />
+    <ClInclude Include="..\..\includes\more.h" />
+    <ClInclude Include="..\..\includes\prompt.h" />
+    <ClInclude Include="..\..\includes\scilabRead.h" />
+    <ClInclude Include="..\..\includes\scilines.h" />
+    <ClInclude Include="..\..\includes\SetConsolePrompt.h" />
+    <ClInclude Include="..\..\includes\zzledt.h" />
     <ClInclude Include="..\cpp\ClearConsole.hxx" />
     <ClInclude Include="..\cpp\ClearConsolePart.hxx" />
     <ClInclude Include="..\cpp\ConsoleIsWaitingForInput.hxx" />
@@ -367,11 +375,11 @@ lib /DEF:"$(ProjectDir)libjvm_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClInclude Include="..\cpp\PromptToHome.hxx" />
     <ClInclude Include="..\cpp\ScilabLinesUpdate.hxx" />
     <ClInclude Include="..\cpp\SetConsolePrompt.hxx" />
+    <ClInclude Include="..\jni\GiwsException.hxx" />
     <ClInclude Include="clc.h" />
     <ClInclude Include="ClearConsole.h" />
     <ClInclude Include="ClearConsolePart.h" />
     <ClInclude Include="ConsoleIsWaitingForInput.h" />
-    <ClInclude Include="ConsoleRead.h" />
     <ClInclude Include="dropFiles.h" />
     <ClInclude Include="GetCharWithoutOutput.h" />
     <ClInclude Include="GuiManagement.h" />
@@ -379,17 +387,8 @@ lib /DEF:"$(ProjectDir)libjvm_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClInclude Include="PromptToHome.h" />
     <ClInclude Include="PutChar.h" />
     <ClInclude Include="ScilabLinesUpdate.h" />
-    <ClInclude Include="SetConsolePrompt.h" />
     <ClInclude Include="TermReadAndProcess.h" />
     <ClInclude Include="tohome.h" />
-    <ClInclude Include="windows\clrscrPart_nw.h" />
-    <ClInclude Include="windows\clrscr_nw.h" />
-    <ClInclude Include="windows\TermCommand.h" />
-    <ClInclude Include="windows\TermCompletion.h" />
-    <ClInclude Include="windows\TermConsole.h" />
-    <ClInclude Include="windows\TermLine.h" />
-    <ClInclude Include="windows\TermPosition.h" />
-    <ClInclude Include="windows\TermPrintf.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
index 99fc7cf..2a4ec3b 100644 (file)
     <ClCompile Include="..\..\sci_gateway\c\gw_console.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_clc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_iswaitingforinput.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_lines.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_prompt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_tohome.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="clc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="windows\TermReadAndProcess.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\cpp\scilabRead.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="console.rc">
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\cpp\ClearConsole.hxx">
+    <None Include="..\jni\DropFiles.i">
+      <Filter>Swig Files</Filter>
+    </None>
+    <None Include="..\jni\GuiManagement.i">
+      <Filter>Swig Files</Filter>
+    </None>
+    <None Include="libjvm_Import.def">
+      <Filter>Libraries Dependencies\Imports</Filter>
+    </None>
+    <None Include="LibScilab_Import.def">
+      <Filter>Libraries Dependencies\Imports</Filter>
+    </None>
+    <None Include="..\..\console.iss" />
+    <None Include="..\..\Makefile.am" />
+    <None Include="..\..\locales\en_US\console.pot" />
+    <None Include="..\..\console.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\includes\ConsolePrintf.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\ClearConsolePart.hxx">
+    <ClInclude Include="..\..\includes\ConsoleRead.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\ConsoleIsWaitingForInput.hxx">
+    <ClInclude Include="..\..\includes\dynlib_console.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\ConsolePrintf.hxx">
+    <ClInclude Include="..\..\includes\GetCommandLine.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\ConsoleRead.hxx">
+    <ClInclude Include="..\..\includes\gw_console.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\GetCharWithoutOutput.hxx">
+    <ClInclude Include="..\..\includes\InitializeConsole.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\PromptToHome.hxx">
+    <ClInclude Include="..\..\includes\more.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\ScilabLinesUpdate.hxx">
+    <ClInclude Include="..\..\includes\prompt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\SetConsolePrompt.hxx">
+    <ClInclude Include="..\..\includes\scilines.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\zzledt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="clc.h">
     <ClInclude Include="ConsoleIsWaitingForInput.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ConsoleRead.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="dropFiles.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="ScilabLinesUpdate.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SetConsolePrompt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="TermReadAndProcess.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="tohome.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="windows\clrscrPart_nw.h">
+    <ClInclude Include="..\cpp\ClearConsole.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="windows\clrscr_nw.h">
+    <ClInclude Include="..\cpp\ClearConsolePart.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="windows\TermCommand.h">
+    <ClInclude Include="..\cpp\ConsoleIsWaitingForInput.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="windows\TermCompletion.h">
+    <ClInclude Include="..\cpp\ConsolePrintf.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="windows\TermConsole.h">
+    <ClInclude Include="..\cpp\ConsoleRead.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="windows\TermLine.h">
+    <ClInclude Include="..\cpp\GetCharWithoutOutput.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="windows\TermPosition.h">
+    <ClInclude Include="..\cpp\PromptToHome.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="windows\TermPrintf.h">
+    <ClInclude Include="..\cpp\ScilabLinesUpdate.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\cpp\SetConsolePrompt.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\jni\GiwsException.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\SetConsolePrompt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\scilabRead.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\jni\DropFiles.i">
-      <Filter>Swig Files</Filter>
-    </None>
-    <None Include="..\jni\GuiManagement.i">
-      <Filter>Swig Files</Filter>
-    </None>
-    <None Include="libjvm_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
-    <None Include="LibScilab_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
-    <None Include="..\..\console.iss" />
-    <None Include="..\..\Makefile.am" />
-    <None Include="..\..\locales\en_US\console.pot" />
-    <None Include="..\..\console.xml" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/scilab/modules/console/src/cpp/scilabRead.cpp b/scilab/modules/console/src/cpp/scilabRead.cpp
new file mode 100644 (file)
index 0000000..5de3b29
--- /dev/null
@@ -0,0 +1,67 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2011 - DIGITEO - 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 "configvariable.hxx"
+
+extern "C"
+{
+#include "scilabRead.h"
+#include "SetConsolePrompt.h"
+#include "prompt.h"
+#include "TermReadAndProcess.h"
+#include "os_strdup.h"
+#include "sci_mode.h"
+#include "localization.h"
+#include "diary.h"
+}
+
+static SCILAB_INPUT_METHOD _reader;
+
+void setScilabInputMethod(SCILAB_INPUT_METHOD reader)
+{
+    _reader = reader;
+}
+
+char *scilabRead()
+{
+    if (getScilabMode() == SCILAB_STD)
+    {
+        /* Send new prompt to Java Console, do not display it */
+        if (GetTemporaryPrompt() != NULL)
+        {
+            SetConsolePrompt(GetTemporaryPrompt());
+        }
+        else
+        {
+            char pstCurrentPrompt[PROMPT_SIZE_MAX];
+            GetCurrentPrompt(pstCurrentPrompt);
+            SetConsolePrompt(pstCurrentPrompt);
+        }
+    }
+
+    //call reader
+    char* pstTemp = (*_reader)();
+
+    //add prompt to diary
+    static char pstPrompt[PROMPT_SIZE_MAX];
+    GetCurrentPrompt(pstPrompt);
+    wchar_t* pwstPrompt = to_wide_string(pstPrompt);
+    diaryWrite(pwstPrompt, TRUE);
+    FREE(pwstPrompt);
+
+    //add input to diary
+    wchar_t* pwstIn = to_wide_string(pstTemp);
+    diaryWriteln(pwstIn, TRUE);
+    FREE(pwstIn);
+
+    return pstTemp;
+}
index 874fdbb..ef45883 100644 (file)
@@ -12,6 +12,7 @@
  */
 
 /*--------------------------------------------------------------------------*/
+
 #include <stdlib.h>
 #include "ConsolePrintf.h"
 #include "ConsoleRead.h"
@@ -25,6 +26,7 @@
 #include "GetCharWithoutOutput.h"
 #include "ConsoleIsWaitingForInput.h"
 #include "scilines.h"
+
 /*--------------------------------------------------------------------------*/
 char *ConsoleRead(void)
 {
index ff1a768..d4f89d1 100644 (file)
@@ -13,7 +13,7 @@
 #include "core_gw.hxx"
 #include "function.hxx"
 #include "double.hxx"
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 
 extern "C"
 {
@@ -37,7 +37,7 @@ Function::ReturnValue sci_stacksize(types::typed_list &in, int _iRetCount, types
         return types::Function::Error;
     }
 
-    YaspWriteW(_W("[WARNING]: stakcsize: No more need to change Scilab stack size. Function will be remove in version 6.1.\n"));
+    scilabWriteW(_W("[WARNING]: stakcsize: No more need to change Scilab stack size. Function will be remove in version 6.1.\n"));
 
     if(in.size() == 0)
     {
index 2956294..66086f4 100644 (file)
@@ -14,7 +14,7 @@
 #include "core_gw.hxx"
 #include "function.hxx"
 #include "context.hxx"
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 
 using namespace types;
 
@@ -23,7 +23,7 @@ Function::ReturnValue sci_who(typed_list& in, int iRetCount, typed_list& out)
     std::wstringstream wstream;
     wstream << *(symbol::Context::getInstance()) << std::endl;
 
-    YaspWriteW(wstream.str().c_str());
+    scilabWriteW(wstream.str().c_str());
 
     return Function::OK;
 }
index 52cc034..8a124a2 100644 (file)
@@ -11,7 +11,7 @@
  */
 
 #include "banner.hxx"
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 
 extern "C"
 {
@@ -28,33 +28,33 @@ void banner(void)
     wchar_t *line = L"        ___________________________________________        ";
     int startVersion = (int)(floor((double)(wcslen(line)/2)) - floor((double)(wcslen(SCI_VERSION_WIDE_STRING)/2)));
 
-    YaspForcedWriteW(line);
-    YaspForcedWriteW(L"\n");
+    scilabForcedWriteW(line);
+    scilabForcedWriteW(L"\n");
 
     /* To center the version name */
     for(i = 0 ; i < startVersion ; i++ )
     {
-        YaspForcedWriteW(L" ");
+        scilabForcedWriteW(L" ");
     }
 
-    YaspForcedWriteW(SCI_VERSION_WIDE_STRING);
-    YaspForcedWriteW(L"\n\n");
+    scilabForcedWriteW(SCI_VERSION_WIDE_STRING);
+    scilabForcedWriteW(L"\n\n");
 
-    YaspForcedWriteW(_W("                 Consortium Scilab (DIGITEO)\n"));
+    scilabForcedWriteW(_W("                 Consortium Scilab (DIGITEO)\n"));
 
-    YaspForcedWriteW(_W("               Copyright (c) 1989-2011 (INRIA)\n"));
-    YaspForcedWriteW(_W("               Copyright (c) 1989-2007 (ENPC)\n"));
-    YaspForcedWriteW(line);
-    YaspForcedWriteW(L"\n");
-    YaspForcedWriteW(L"\n");
-    YaspForcedWriteW(L"                     -*- THIS IS YaSp -*-\n");
-    YaspForcedWriteW(L"\n");
-    YaspForcedWriteW(line);
-    YaspForcedWriteW(L"\n");
+    scilabForcedWriteW(_W("               Copyright (c) 1989-2011 (INRIA)\n"));
+    scilabForcedWriteW(_W("               Copyright (c) 1989-2007 (ENPC)\n"));
+    scilabForcedWriteW(line);
+    scilabForcedWriteW(L"\n");
+    scilabForcedWriteW(L"\n");
+    scilabForcedWriteW(L"                     -*- THIS IS YaSp -*-\n");
+    scilabForcedWriteW(L"\n");
+    scilabForcedWriteW(line);
+    scilabForcedWriteW(L"\n");
 
 #if ( defined(_MSC_VER) && ( (_MSC_VER >= 1200) && (_MSC_VER < 1300) ) )
-    YaspForcedWriteW(L"\n\n");
-    YaspForcedWriteW(_W("Warning: the operational team of the Scilab Consortium\ndoesn't provide and doesn't support this version of Scilab built with\n"));
-    YaspForcedWriteW(L"   ");
+    scilabForcedWriteW(L"\n\n");
+    scilabForcedWriteW(_W("Warning: the operational team of the Scilab Consortium\ndoesn't provide and doesn't support this version of Scilab built with\n"));
+    scilabForcedWriteW(L"   ");
 #endif
 }
index 9dcfc62..ae47720 100644 (file)
@@ -38,7 +38,7 @@ void *Runner::launch(void *args)
     }
     catch(ScilabException se)
     {
-        YaspErrorW(se.GetErrorMessage().c_str());
+        scilabErrorW(se.GetErrorMessage().c_str());
     }
 
     __threadKey currentThreadKey = __GetCurrentThreadKey();
index e2ba489..df7a8ca 100644 (file)
@@ -62,6 +62,7 @@ extern "C"
 #include "sci_tmpdir.h"
 #include "deleteafile.h"
 #include "setgetlanguage.h"
+#include "scilabRead.h"
 
 #include "elem_common.h"
 
@@ -74,7 +75,7 @@ extern "C"
     extern char *TermReadAndProcess(void);
 }
 
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 #include "tasks.hxx"
 #include "exit_status.hxx"
 #include "parser.hxx"
@@ -334,12 +335,12 @@ static int interactiveMain (void)
                 FREE(command);
                 command = NULL;
             }
-            YaspWriteW(L"\n");
-            command = YaspRead();
+            scilabWriteW(L"\n");
+            command = scilabRead();
         }
         else
         {
-            char* pstRead = YaspRead();
+            char* pstRead = scilabRead();
             //+1 for null termination and +1 for '\n'
             size_t iLen = strlen(command) + strlen(pstRead) + 2;
             char* pstNewCommand = (char*)MALLOC(iLen * sizeof(char));
@@ -417,7 +418,7 @@ static Parser::ControlStatus processCommand(char* _pstCommand)
                 callOnPrompt();
             }
 
-            YaspWriteW(parser->getErrorMessage());
+            scilabWriteW(parser->getErrorMessage());
         }
 
         FREE(pwstCommand);
@@ -469,8 +470,8 @@ int main(int argc, char *argv[])
 #ifndef WITHOUT_GUI
     if (consoleMode)
     {
-        setYaspInputMethod(&TermReadAndProcess);
-        setYaspOutputMethod(&TermPrintf);
+        setScilabInputMethod(&TermReadAndProcess);
+        setScilabOutputMethod(&TermPrintf);
   #if defined(__APPLE__)
         if(!noJvm)
         {
@@ -481,8 +482,8 @@ int main(int argc, char *argv[])
     }
     else
     {
-        setYaspInputMethod(&ConsoleRead);
-        setYaspOutputMethod(&ConsolePrintf);
+        setScilabInputMethod(&ConsoleRead);
+        setScilabOutputMethod(&ConsolePrintf);
   #if defined(__APPLE__)
         return initMacOSXEnv(argc, argv, iFileIndex);
   #else
@@ -490,8 +491,8 @@ int main(int argc, char *argv[])
   #endif // !defined(__APPLE__)
     }
 #else
-        setYaspInputMethod(&TermReadAndProcess);
-        setYaspOutputMethod(&TermPrintf);
+        setScilabInputMethod(&TermReadAndProcess);
+        setScilabOutputMethod(&TermPrintf);
         return StartScilabEngine(argc, argv, iFileIndex, iLangIndex);
 #endif // defined(WITHOUT_GUI)
 }
@@ -535,7 +536,7 @@ static int batchMain(char *pstFileName)
     }
     else
     {
-        YaspWriteW(parser->getErrorMessage());
+        scilabWriteW(parser->getErrorMessage());
     }
 
 #ifdef DEBUG
@@ -626,7 +627,7 @@ int StartScilabEngine(int argc, char*argv[], int iFileIndex, int iLangIndex)
     }
     catch(ScilabException se)
     {
-        YaspErrorW(se.GetErrorMessage().c_str());
+        scilabErrorW(se.GetErrorMessage().c_str());
     }
 
     ConfigVariable::setPromptMode(2);
index 7baba26..55b561a 100644 (file)
@@ -19,7 +19,7 @@ extern "C"
 #include "parser.hxx"
 #include "execvisitor.hxx"
 #include "tasks.hxx"
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 #include "scilabexception.hxx"
 
 /*--------------------------------------------------------------------------*/
@@ -75,23 +75,23 @@ int StoreCommandWithFlag (wchar_t *command,int flag)
     }
     catch(ScilabException se)
     {
-        YaspErrorW(L"\n");
-        YaspErrorW(L"\n");
-        YaspErrorW(command);
-        YaspErrorW(L"\n");
-        YaspErrorW(se.GetErrorMessage().c_str());
-        YaspErrorW(L"\n");
-        YaspErrorW(_W("while executing a callback"));
+        scilabErrorW(L"\n");
+        scilabErrorW(L"\n");
+        scilabErrorW(command);
+        scilabErrorW(L"\n");
+        scilabErrorW(se.GetErrorMessage().c_str());
+        scilabErrorW(L"\n");
+        scilabErrorW(_W("while executing a callback"));
     }
     catch(ScilabMessage sm)
     {
-        YaspErrorW(L"\n");
-        YaspErrorW(L"\n");
-        YaspErrorW(command);
-        YaspErrorW(L"\n");
-        YaspErrorW(sm.GetErrorMessage().c_str());
-        YaspErrorW(L"\n");
-        YaspErrorW(_W("while executing a callback"));
+        scilabErrorW(L"\n");
+        scilabErrorW(L"\n");
+        scilabErrorW(command);
+        scilabErrorW(L"\n");
+        scilabErrorW(sm.GetErrorMessage().c_str());
+        scilabErrorW(L"\n");
+        scilabErrorW(_W("while executing a callback"));
     }
 
     delete parser.getTree();
@@ -122,23 +122,23 @@ int StorePrioritaryCommandWithFlag (wchar_t *command,int flag)
     }
     catch(ScilabException se)
     {
-        YaspErrorW(L"\n");
-        YaspErrorW(L"\n");
-        YaspErrorW(command);
-        YaspErrorW(L"\n");
-        YaspErrorW(se.GetErrorMessage().c_str());
-        YaspErrorW(L"\n");
-        YaspErrorW(_W("while executing a callback"));
+        scilabErrorW(L"\n");
+        scilabErrorW(L"\n");
+        scilabErrorW(command);
+        scilabErrorW(L"\n");
+        scilabErrorW(se.GetErrorMessage().c_str());
+        scilabErrorW(L"\n");
+        scilabErrorW(_W("while executing a callback"));
     }
     catch(ScilabMessage sm)
     {
-        YaspErrorW(L"\n");
-        YaspErrorW(L"\n");
-        YaspErrorW(command);
-        YaspErrorW(L"\n");
-        YaspErrorW(sm.GetErrorMessage().c_str());
-        YaspErrorW(L"\n");
-        YaspErrorW(_W("while executing a callback"));
+        scilabErrorW(L"\n");
+        scilabErrorW(L"\n");
+        scilabErrorW(command);
+        scilabErrorW(L"\n");
+        scilabErrorW(sm.GetErrorMessage().c_str());
+        scilabErrorW(L"\n");
+        scilabErrorW(_W("while executing a callback"));
     }
 
     delete parser.getTree();
index eccc8a1..126edac 100644 (file)
@@ -20,7 +20,7 @@
 #include "debugvisitor.hxx"
 #include "configvariable.hxx"
 
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 #include "runner.hxx"
 
 #define SCILAB_START    L"/etc/scilab.start"
@@ -197,8 +197,8 @@ void execScilabStartTask(void)
 
     if(parse.getExitStatus() != Parser::Succeded)
     {
-        YaspWriteW(parse.getErrorMessage());
-        YaspWriteW(L"Failed to parse scilab.start");
+        scilabWriteW(parse.getErrorMessage());
+        scilabWriteW(L"Failed to parse scilab.start");
         return;
     }
 
@@ -219,8 +219,8 @@ void execScilabQuitTask(void)
 
     if(parse.getExitStatus() != Parser::Succeded)
     {
-        YaspWriteW(parse.getErrorMessage());
-        YaspWriteW(L"Failed to parse scilab.start");
+        scilabWriteW(parse.getErrorMessage());
+        scilabWriteW(L"Failed to parse scilab.start");
         return;
     }
 
index a0d411f..bbb1a4d 100644 (file)
@@ -124,6 +124,7 @@ libscifileio_la_CPPFLAGS=   -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/io/includes \
                                -I$(top_srcdir)/modules/shell/includes \
                                -I$(top_srcdir)/modules/threads/includes \
+                               -I$(top_srcdir)/modules/console/includes \
                                $(HDF5_CFLAGS)
 
 libscifileio_la_CFLAGS=                -I$(srcdir)/includes/ \
index f9e580f..4d0ba87 100644 (file)
@@ -610,6 +610,7 @@ libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/io/includes \
                                -I$(top_srcdir)/modules/shell/includes \
                                -I$(top_srcdir)/modules/threads/includes \
+                               -I$(top_srcdir)/modules/console/includes \
                                $(HDF5_CFLAGS)
 
 libscifileio_la_CFLAGS = -I$(srcdir)/includes/ \
index d0d57e4..fb81efd 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -99,7 +99,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\console\src\c\console.vcxproj">
+      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
       <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
index ac0822b..e5ada56 100644 (file)
@@ -207,10 +207,10 @@ Function::ReturnValue sci_mfprintf(types::typed_list &in, int _iRetCount, types:
             }
             else
             {
-                YaspForcedWriteW(wcsStringToWrite[i]);
+                scilabForcedWriteW(wcsStringToWrite[i]);
             }
         }
-        YaspForcedWriteW(L"\n");
+        scilabForcedWriteW(L"\n");
         iRet = 0;
     }
     else
index 9142211..9856447 100644 (file)
@@ -15,7 +15,7 @@
 /*--------------------------------------------------------------------------*/
 #include "fileio_gw.hxx"
 #include "string.hxx"
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 #include "cell.hxx"
 #include "function.hxx"
 #include "double.hxx"
@@ -27,6 +27,7 @@ extern "C"
 #include "do_xxprintf.h"
 #include "do_xxscanf.h"
 #include "scanf_functions.h"
+#include "scilabRead.h"
 }
 
 types::Function::ReturnValue sci_mscanf(types::typed_list &in, int _iRetCount, types::typed_list &out)
@@ -78,7 +79,7 @@ types::Function::ReturnValue sci_mscanf(types::typed_list &in, int _iRetCount, t
     {
         if ((iNiter >= 0) && (rowcount >= iNiter)) break;
         // get data
-        wcsRead = to_wide_string(YaspRead());
+        wcsRead = to_wide_string(scilabRead());
         int err = do_xxscanf(L"sscanf",(FILE *)0,wcsFormat,&args,wcsRead,&retval,buf,type);
         if(err < 0) return types::Function::Error;
         err=Store_Scan(&nrow,&ncol,type_s,type,&retval,&retval_s,buf,&data,rowcount,args);
index 2f515bf..66ecb8e 100644 (file)
@@ -17,7 +17,7 @@
 #include "functions_gw.hxx"
 #include "execvisitor.hxx"
 #include "mutevisitor.hxx"
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 #include "scilabexception.hxx"
 #include "configvariable.hxx"
 
@@ -125,7 +125,7 @@ Function::ReturnValue sci_exec(types::typed_list &in, int _iRetCount, types::typ
         FREE(pwstTemp);
                if(parser.getExitStatus() !=  Parser::Succeded)
                {
-                       YaspWriteW(parser.getErrorMessage());
+                       scilabWriteW(parser.getErrorMessage());
                        delete parser.getTree();
             mclose(iID);
                        return Function::Error;
@@ -302,18 +302,18 @@ Function::ReturnValue sci_exec(types::typed_list &in, int _iRetCount, types::typ
                                        ostr << L"ans = " << std::endl;
                                        ostr << std::endl;
                                        ostr << execMe.result_get()->toString(ConfigVariable::getFormat(), ConfigVariable::getConsoleWidth()) << std::endl;
-                                       YaspWriteW(ostr.str().c_str());
+                                       scilabWriteW(ostr.str().c_str());
                                }
                        }
 
                        //if( !checkPrompt(iMode, EXEC_MODE_MUTE) && bErrCatch == false)
                        //{
-                       //      YaspWriteW(L"\n");
+                       //      scilabWriteW(L"\n");
                        //}
                }
         catch(ScilabMessage sm)
         {
-            YaspErrorW(sm.GetErrorMessage().c_str());
+            scilabErrorW(sm.GetErrorMessage().c_str());
 
             CallExp* pCall = dynamic_cast<CallExp*>(*j);
             if(pCall != NULL)
@@ -367,8 +367,8 @@ Function::ReturnValue sci_exec(types::typed_list &in, int _iRetCount, types::typ
             if(bErrCatch == false)
             {
                 //write error
-                YaspErrorW(se.GetErrorMessage().c_str());
-                YaspErrorW(L"\n");
+                scilabErrorW(se.GetErrorMessage().c_str());
+                scilabErrorW(L"\n");
 
                 //write positino
                 wchar_t szError[bsiz];
@@ -529,7 +529,7 @@ void printLine(char* _stPrompt, char* _stLine, bool _bLF)
         strcat(sz, "\n");
     }
 
-    YaspWrite(sz);
+    scilabWrite(sz);
     FREE(sz);
 }
 /*--------------------------------------------------------------------------*/
index a26b22e..2637112 100644 (file)
@@ -15,7 +15,7 @@
 #include "functions_gw.hxx"
 #include "execvisitor.hxx"
 #include "mutevisitor.hxx"
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 #include "scilabexception.hxx"
 #include "configvariable.hxx"
 
@@ -253,21 +253,21 @@ Function::ReturnValue sci_execstr(types::typed_list &in, int _iRetCount, types::
                                        ostr << L"ans = " << std::endl;
                                        ostr << std::endl;
                                        ostr << execMe.result_get()->toString(ConfigVariable::getFormat(), ConfigVariable::getConsoleWidth()) << std::endl;
-                                       YaspWriteW(ostr.str().c_str());
+                                       scilabWriteW(ostr.str().c_str());
                                }
                        }
 
                        //if( !checkPrompt(iMode, EXEC_MODE_MUTE) &&
    //             bErrCatch == false)
                        //{
-                       //      YaspWriteW(L"\n");
+                       //      scilabWriteW(L"\n");
                        //}
                }
         catch(ScilabMessage sm)
         {
             if(bErrCatch  == false && bMute == false)
             {
-                YaspErrorW(sm.GetErrorMessage().c_str());
+                scilabErrorW(sm.GetErrorMessage().c_str());
 
                 CallExp* pCall = dynamic_cast<CallExp*>(*j);
                 if(pCall != NULL)
@@ -325,8 +325,8 @@ Function::ReturnValue sci_execstr(types::typed_list &in, int _iRetCount, types::
                 //in case of error, change mode to 2 ( prompt )
                 ConfigVariable::setPromptMode(2);
                 //write error
-                YaspErrorW(se.GetErrorMessage().c_str());
-                YaspErrorW(L"\n");
+                scilabErrorW(se.GetErrorMessage().c_str());
+                scilabErrorW(L"\n");
 
                 //write positino
                 wchar_t szError[bsiz];
index 9352ace..4614406 100644 (file)
@@ -29,8 +29,8 @@ libscifunctions_manager_la_CXXFLAGS   =       -I$(top_builddir)/modules/types/includes/
                                                -I$(top_builddir)/modules/parse/includes/ \
                                                -I$(top_builddir)/modules/output_stream/includes/ \
                                                -I$(top_builddir)/modules/threads/includes/ \
+                                               -I$(top_builddir)/modules/console/includes/ \
                                                -Iincludes/ \
-                                               -Isrc/cpp \
                                                $(XML_FLAGS)
 
 libscifunctions_manager_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
index b2e947d..1fe61b6 100644 (file)
@@ -406,8 +406,8 @@ libscifunctions_manager_la_CXXFLAGS = -I$(top_builddir)/modules/types/includes/
                                                -I$(top_builddir)/modules/parse/includes/ \
                                                -I$(top_builddir)/modules/output_stream/includes/ \
                                                -I$(top_builddir)/modules/threads/includes/ \
+                                               -I$(top_builddir)/modules/console/includes/ \
                                                -Iincludes/ \
-                                               -Isrc/cpp \
                                                $(XML_FLAGS)
 
 libscifunctions_manager_la_LIBADD = $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
index 932e6c5..0278fa3 100644 (file)
       <Project>{09e6cf32-ef2f-4c63-a2b8-b04964768bd6}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="..\console\sci_gateway\cpp\console_gw.vcxproj">
+      <Project>{273b1f5c-c137-46d1-b516-ffe5764fabe5}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\core\src\cpp\core_gw.vcxproj">
       <Project>{3e933eb6-d427-4828-9b30-b6b9987491f6}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
index e8552b6..4744e48 100644 (file)
@@ -35,5 +35,6 @@
 #include "../../dynamic_link/includes/dynamic_link_gw.hxx"
 #include "../../action_binding/includes/action_binding_gw.hxx"
 #include "../../history_manager/includes/history_manager_gw.hxx"
+#include "../../console/includes/console_gw.hxx"
 
 #endif /* !__MODULE_DECLARATION_HXX__ */
index b81ad78..b1b0ecd 100644 (file)
@@ -303,6 +303,7 @@ bool FuncManager::CreateModuleList(void)
     m_ModuleMap.insert(pair<wstring, GW_MOD>(L"dynamic_link", &DynamicLinkModule::Load));
     m_ModuleMap.insert(pair<wstring, GW_MOD>(L"action_binding", &ActionBindingModule::Load));
     m_ModuleMap.insert(pair<wstring, GW_MOD>(L"history_manager", &HistoryManagerModule::Load));
+    m_ModuleMap.insert(pair<wstring, GW_MOD>(L"console", &ConsoleModule::Load));
     if (ConfigVariable::getScilabMode() != SCILAB_NWNI)
     {
         m_ModuleMap.insert(pair<wstring, GW_MOD>(L"jvm", &JvmModule::Load));
@@ -363,7 +364,7 @@ bool FuncManager::ExecuteStartFile(wstring _stModule)
     {
         std::wostringstream ostr;
         ostr << _W("Unable to execute : ") << stPath << endl;
-        YaspWriteW(ostr.str().c_str());
+        scilabWriteW(ostr.str().c_str());
         delete parser.getTree();
         return false;
     }
@@ -381,11 +382,11 @@ bool FuncManager::ExecuteStartFile(wstring _stModule)
     }
     catch(ast::ScilabMessage sm)
     {
-        YaspWriteW(sm.GetErrorMessage().c_str());
+        scilabWriteW(sm.GetErrorMessage().c_str());
     }
     catch(ast::ScilabError se)
     {
-        YaspWriteW(se.GetErrorMessage().c_str());
+        scilabWriteW(se.GetErrorMessage().c_str());
     }
 
     //restore previous prompt mode
index 87f4a7c..04870cf 100644 (file)
@@ -28,7 +28,7 @@
 #include "context.hxx"
 #include "io_gw.hxx"
 #include "setenvvar.hxx"
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 #include "expandPathVariable.h"
 #include "configvariable.hxx"
 #include "string.hxx"
@@ -123,7 +123,7 @@ Function::ReturnValue sci_genlib(types::typed_list &in, int _iRetCount, types::t
         int oldVal = ConfigVariable::getPromptMode();
         //set mode silent for errors
         ConfigVariable::setPromptMode(0);
-        YaspWriteW(pstVerbose);
+        scilabWriteW(pstVerbose);
         //restore previous prompt mode
         ConfigVariable::setPromptMode(oldVal);
     }
@@ -138,7 +138,7 @@ Function::ReturnValue sci_genlib(types::typed_list &in, int _iRetCount, types::t
     if(pWriter == NULL)
     {
         os_swprintf(pstVerbose, 65535, _W("%ls: Cannot open file ''%ls''.\n"), L"genlib", pstParseFile);
-        YaspWriteW(pstVerbose);
+        scilabWriteW(pstVerbose);
 
         out.push_back(new Bool(0));
         FREE(pstParsePath);
@@ -161,7 +161,7 @@ Function::ReturnValue sci_genlib(types::typed_list &in, int _iRetCount, types::t
             if(parser.getExitStatus() !=  Parser::Succeded)
             {
                 os_swprintf(pstVerbose, 65535, _W("%ls: Warning: Error in file %ls : %ls. File ignored\n"), L"genlib", pstPath[k], parser.getErrorMessage());
-                YaspWriteW(pstVerbose);
+                scilabWriteW(pstVerbose);
                 delete parser.getTree();
                 continue;
             }
@@ -177,7 +177,7 @@ Function::ReturnValue sci_genlib(types::typed_list &in, int _iRetCount, types::t
                                        if(AddMacroToXML(pWriter, pair<wstring, wstring>(pFD->name_get().name_get(), pstPath[k])) == false)
                     {
                         os_swprintf(pstVerbose, 65535, _W("%ls: Warning: %ls information cannot be added to file %ls. File ignored\n"), L"genlib", pFD->name_get().name_get().c_str(), pstPath[k]);
-                        YaspWriteW(pstVerbose);
+                        scilabWriteW(pstVerbose);
                     }
                                }
                        }
index c6e6bee..8ed1ace 100644 (file)
@@ -1,10 +1,6 @@
 /*
 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-<<<<<<< HEAD:scilab/modules/linear_algebra/sci_gateway/c/sci_eig.c
-* Copyright (C) 2009 - DIGITEO - Bernard HUGUENEY 
-=======
 * Copyright (C) 2009 - DIGITEO - Bernard HUGUENEY
->>>>>>> origin/sas:scilab/modules/linear_algebra/sci_gateway/c/sci_eig.c
 *
 * This file must be used under the terms of the CeCILL.
 * This source file is licensed as described in the file COPYING, which
@@ -131,8 +127,8 @@ int sci_eig(char *fname, int* _piKey)
                                                        double* pEigenVectorsReal= NULL;
                                                        double* pEigenVectorsImg= NULL;
                                                        int symmetric= 0; /* bool in fact */
-                                                       int const eigenValuesCols= (Lhs==1) ? 1 : iCols ;
-                                                       int const totalSize= iRows * iCols;
+                                                       int eigenValuesCols= (Lhs==1) ? 1 : iCols ;
+                                                       int totalSize= iRows * iCols;
                                                        if ( !(complexArg
                                                                ? C2F(vfiniteComplex)(&totalSize, pData)
                                                                : C2F(vfinite)(&totalSize, pDataReal)))
@@ -141,9 +137,7 @@ int sci_eig(char *fname, int* _piKey)
                                                                return 0;
                                                        }
 
-
-                                                       //if(symmetric=isSymmetric(&Rhs))
-                                                       if(1 /*replug previous test*/)
+                                                       if(symmetric = isSymmetric(pDataReal, pDataImg, complexArg, iRows, iCols))
                                                        {
                                                                allocMatrixOfDouble(_piKey, 2, iCols, eigenValuesCols, &pEigenValuesReal);
                                                                /* if matrix is symmetric, the eigenvectors can reuse Rhs because the matrix is of the same type & dimensions */
index 0efcb12..bd3473a 100644 (file)
@@ -53,9 +53,6 @@
     <ClCompile Include="invert_matrix.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="issymmetric.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="lsq.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="svd.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="issymmetric.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\sci_gateway\c\assembleEigenvectors.h">
index 9fb3397..be4ba2a 100644 (file)
@@ -52,7 +52,7 @@ Function::ReturnValue sci_gettext(typed_list &in, int _piRetCount, typed_list &o
     bool bConveted      = false;
     wchar_t* pwstCIn    = ScilabStringToCString(in[0]->getAs<types::String>()->get()[0], &bConveted);
     char* pstCIn        = wide_string_to_UTF8(pwstCIn);
-    wchar_t* pwstOut   = to_wide_string(gettext(pstCIn));
+    wchar_t* pwstOut    = _W(pstCIn);
     if(bConveted)
     {
         wchar_t* pwstTemp    = CStringToScilabString(pwstOut);
index 082a7ba..0a20b93 100644 (file)
@@ -49,7 +49,7 @@
 
 #include <limits>
 
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 #include "context.hxx"
 #include "symbol.hxx"
 #include "parser.hxx"
@@ -1337,15 +1337,15 @@ int mexPrintf(const char *format, ...)
     va_start(arg_ptr, format);
     vsnprintf(string, 1024, format, arg_ptr);
     va_end(arg_ptr);
-    YaspWrite(string);
+    scilabWrite(string);
     return 0;
 }
 
 void mexWarnMsgTxt(const char *error_msg)
 {
-    YaspError(_("Warning: "));
-    YaspError(error_msg);
-    YaspError("\n\n");
+    scilabError(_("Warning: "));
+    scilabError(error_msg);
+    scilabError("\n\n");
 }
 
 int mexCallSCILAB(int nlhs, mxArray **plhs, int nrhs, mxArray **prhs, const char *name)
@@ -1610,7 +1610,7 @@ int mexEvalString(const char *name)
                     ostr << L"ans = " << std::endl;
                     ostr << std::endl;
                     ostr << execMe.result_get()->toString(ConfigVariable::getFormat(), ConfigVariable::getConsoleWidth()) << std::endl;
-                    YaspWriteW(ostr.str().c_str());
+                    scilabWriteW(ostr.str().c_str());
                 }
             }
         }
@@ -1618,7 +1618,7 @@ int mexEvalString(const char *name)
         {
             if(bErrCatch  == false && bMute == false)
             {
-                YaspErrorW(sm.GetErrorMessage().c_str());
+                scilabErrorW(sm.GetErrorMessage().c_str());
 
                 CallExp* pCall = dynamic_cast<CallExp*>(*j);
                 if(pCall != NULL)
@@ -1676,8 +1676,8 @@ int mexEvalString(const char *name)
                 //in case of error, change mode to 2 ( prompt )
                 ConfigVariable::setPromptMode(2);
                 //write error
-                YaspErrorW(se.GetErrorMessage().c_str());
-                YaspErrorW(L"\n");
+                scilabErrorW(se.GetErrorMessage().c_str());
+                scilabErrorW(L"\n");
 
                 //write positino
                 wchar_t szError[bsiz];
@@ -2048,6 +2048,7 @@ mxLogical *mxGetLogicals(const mxArray *ptr)
 void mexInfo(char *str)
 {
     mexPrintf("mexInfo: %s", str);
+    // FIXME : Use scilabWrite
 }
 
 int mexCheck(char *str, int nbvars)
index 921cd96..ffc454a 100644 (file)
@@ -1,6 +1,7 @@
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 # Copyright (C) 2007 - INRIA - Bruno JOFRET
 # Copyright (C) 2010 - DIGITEO - Bruno JOFRET
+# Copyright (C) 2011 - DIGITEO - 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
 
 OUTPUT_STREAM_CPP_SOURCES = \
        src/cpp/Diary.cpp \
-       src/cpp/yaspio.cpp \
+       src/cpp/scilabWrite.cpp \
        src/cpp/DiaryList.cpp \
        src/cpp/diary_manager.cpp \
        src/cpp/getDiaryDate.cpp \
        src/cpp/getFullFilename.cpp \
        src/cpp/scilab_sprintf.cpp
 
-#
+
 GATEWAY_CPP_SOURCES = \
        sci_gateway/cpp/sci_diary.cpp \
        sci_gateway/cpp/sci_disp.cpp \
index 5f25d0c..2049d2d 100644 (file)
 @SET_MAKE@
 
 # Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-# Copyright (C) 2007 - INRIA - Bruno JOFRET
-# Copyright (C) 2010 - 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
-
-# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 # Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
 # Copyright (C) 2008      - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
 #
@@ -133,7 +123,7 @@ am__objects_1 = libscioutput_stream_algo_la-erro.lo \
        libscioutput_stream_algo_la-do_xxprintf.lo \
        libscioutput_stream_algo_la-set_xxprintf.lo
 am__objects_2 = libscioutput_stream_algo_la-Diary.lo \
-       libscioutput_stream_algo_la-yaspio.lo \
+       libscioutput_stream_algo_la-scilabWrite.lo \
        libscioutput_stream_algo_la-DiaryList.lo \
        libscioutput_stream_algo_la-diary_manager.lo \
        libscioutput_stream_algo_la-getDiaryDate.lo \
@@ -460,17 +450,24 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 yacc_present = @yacc_present@
+# Copyright (C) 2007 - INRIA - Bruno JOFRET
+# Copyright (C) 2010 - DIGITEO - Bruno JOFRET
+# Copyright (C) 2011 - DIGITEO - 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
 OUTPUT_STREAM_CPP_SOURCES = \
        src/cpp/Diary.cpp \
-       src/cpp/yaspio.cpp \
+       src/cpp/scilabWrite.cpp \
        src/cpp/DiaryList.cpp \
        src/cpp/diary_manager.cpp \
        src/cpp/getDiaryDate.cpp \
        src/cpp/getFullFilename.cpp \
        src/cpp/scilab_sprintf.cpp
 
-
-#
 GATEWAY_CPP_SOURCES = \
        sci_gateway/cpp/sci_diary.cpp \
        sci_gateway/cpp/sci_disp.cpp \
@@ -747,11 +744,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioutput_stream_algo_la-msgs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioutput_stream_algo_la-msgstore.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioutput_stream_algo_la-msgstxt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioutput_stream_algo_la-scilabWrite.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioutput_stream_algo_la-scilab_sprintf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioutput_stream_algo_la-sciprint.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioutput_stream_algo_la-sciprint_full.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioutput_stream_algo_la-set_xxprintf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioutput_stream_algo_la-yaspio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioutput_stream_la-gw_output_stream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioutput_stream_la-output_stream_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscioutput_stream_la-sci_diary.Plo@am__quote@
@@ -928,12 +925,12 @@ libscioutput_stream_algo_la-Diary.lo: src/cpp/Diary.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) $(libscioutput_stream_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscioutput_stream_algo_la-Diary.lo `test -f 'src/cpp/Diary.cpp' || echo '$(srcdir)/'`src/cpp/Diary.cpp
 
-libscioutput_stream_algo_la-yaspio.lo: src/cpp/yaspio.cpp
-@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscioutput_stream_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscioutput_stream_algo_la-yaspio.lo -MD -MP -MF $(DEPDIR)/libscioutput_stream_algo_la-yaspio.Tpo -c -o libscioutput_stream_algo_la-yaspio.lo `test -f 'src/cpp/yaspio.cpp' || echo '$(srcdir)/'`src/cpp/yaspio.cpp
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscioutput_stream_algo_la-yaspio.Tpo $(DEPDIR)/libscioutput_stream_algo_la-yaspio.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/yaspio.cpp' object='libscioutput_stream_algo_la-yaspio.lo' libtool=yes @AMDEPBACKSLASH@
+libscioutput_stream_algo_la-scilabWrite.lo: src/cpp/scilabWrite.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscioutput_stream_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscioutput_stream_algo_la-scilabWrite.lo -MD -MP -MF $(DEPDIR)/libscioutput_stream_algo_la-scilabWrite.Tpo -c -o libscioutput_stream_algo_la-scilabWrite.lo `test -f 'src/cpp/scilabWrite.cpp' || echo '$(srcdir)/'`src/cpp/scilabWrite.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscioutput_stream_algo_la-scilabWrite.Tpo $(DEPDIR)/libscioutput_stream_algo_la-scilabWrite.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/scilabWrite.cpp' object='libscioutput_stream_algo_la-scilabWrite.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) $(libscioutput_stream_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscioutput_stream_algo_la-yaspio.lo `test -f 'src/cpp/yaspio.cpp' || echo '$(srcdir)/'`src/cpp/yaspio.cpp
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscioutput_stream_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscioutput_stream_algo_la-scilabWrite.lo `test -f 'src/cpp/scilabWrite.cpp' || echo '$(srcdir)/'`src/cpp/scilabWrite.cpp
 
 libscioutput_stream_algo_la-DiaryList.lo: src/cpp/DiaryList.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscioutput_stream_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscioutput_stream_algo_la-DiaryList.lo -MD -MP -MF $(DEPDIR)/libscioutput_stream_algo_la-DiaryList.Tpo -c -o libscioutput_stream_algo_la-DiaryList.lo `test -f 'src/cpp/DiaryList.cpp' || echo '$(srcdir)/'`src/cpp/DiaryList.cpp
@@ -1366,6 +1363,7 @@ uninstall-am: uninstall-libscioutput_stream_la_etcDATA \
        uninstall-libscioutput_stream_la_sci_gatewayDATA \
        uninstall-pkglibLTLIBRARIES
 
+ Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 
 # This target enables tests for Scilab
 check-local: $(top_builddir)/scilab-bin test
@@ -20,26 +20,20 @@ extern "C"
 {
 #endif
 
+typedef void (*SCILAB_OUTPUT_METHOD)(char *text);
 
-typedef void (*YASP_OUTPUT)(char *text);
-typedef char *(*YASP_INPUT)(void);
+OUTPUT_STREAM_IMPEXP void setScilabOutputMethod(SCILAB_OUTPUT_METHOD writer);
 
-OUTPUT_STREAM_IMPEXP void setYaspOutputMethod(YASP_OUTPUT writer);
+OUTPUT_STREAM_IMPEXP void scilabWrite(const char* _pstText);
 
-OUTPUT_STREAM_IMPEXP void setYaspInputMethod(YASP_INPUT reader);
+OUTPUT_STREAM_IMPEXP void scilabWriteW(const wchar_t* _pwstText);
 
-OUTPUT_STREAM_IMPEXP char *YaspRead();
-
-OUTPUT_STREAM_IMPEXP void YaspWrite(const char* _pstText);
-
-OUTPUT_STREAM_IMPEXP void YaspWriteW(const wchar_t* _pwstText);
-
-OUTPUT_STREAM_IMPEXP void YaspError(const char* _pstText);
-OUTPUT_STREAM_IMPEXP void YaspErrorW(const wchar_t* _pwstText);
+OUTPUT_STREAM_IMPEXP void scilabError(const char* _pstText);
+OUTPUT_STREAM_IMPEXP void scilabErrorW(const wchar_t* _pwstText);
 
 /* functions write in "console" without take care of mode*/
-OUTPUT_STREAM_IMPEXP void YaspForcedWriteW(const wchar_t* _pwsText);
-OUTPUT_STREAM_IMPEXP void YaspForcedWrite(const char* _pstText);
+OUTPUT_STREAM_IMPEXP void scilabForcedWriteW(const wchar_t* _pwsText);
+OUTPUT_STREAM_IMPEXP void scilabForcedWrite(const char* _pstText);
 
 #ifdef __cplusplus
 }
index 3cf406a..f521e48 100644 (file)
@@ -12,7 +12,7 @@
 
 #include "function.hxx"
 #include "funcmanager.hxx"
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 #include "configvariable.hxx"
 #include "output_stream_gw.hxx"
 
@@ -36,10 +36,10 @@ Function::ReturnValue sci_disp(typed_list &in, int _piRetCount, typed_list &out)
 
        for(it = in.rbegin() ; it != in.rend() ; it++)
        {
-        YaspForcedWriteW(L"\n");
-               YaspForcedWriteW((*it)->toString(ConfigVariable::getFormat(), ConfigVariable::getConsoleWidth()).c_str());
+        scilabForcedWriteW(L"\n");
+               scilabForcedWriteW((*it)->toString(ConfigVariable::getFormat(), ConfigVariable::getConsoleWidth()).c_str());
        }
 
-       YaspForcedWriteW(L"\n");
+       scilabForcedWriteW(L"\n");
     return Function::OK;
 }
index 9242fa9..2becdfc 100644 (file)
@@ -14,7 +14,7 @@
 #include "funcmanager.hxx"
 #include "output_stream_gw.hxx"
 #include "scilab_sprintf.hxx"
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 #include "function.hxx"
 #include "string.hxx"
 #include "overload.hxx"
@@ -122,10 +122,10 @@ types::Callable::ReturnValue sci_mprintf(types::typed_list &in, int _iRetCount,
 
     for(int i = 0 ; i < iOutputRows ; i++)
     {
-        YaspForcedWriteW(pwstOutput[i]);
+        scilabForcedWriteW(pwstOutput[i]);
         if(iOutputRows != 1)
         {
-            //YaspWriteW(L"\n");
+            //scilabWriteW(L"\n");
         }
         fflush(NULL);
         FREE(pwstOutput[i]);
index feb0384..be9aa16 100644 (file)
@@ -16,7 +16,7 @@
 #include "Scierror.h"
 #include "MALLOC.h"
 #include "charEncoding.h"
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 #include "lasterror.h"
 
 /*--------------------------------------------------------------------------*/
@@ -50,9 +50,9 @@ int  Scierror(int iv,const char *fmt,...)
     pwstError = to_wide_string(s_buf);
     setLastError(iv, pwstError, 0, NULL);
 
-    YaspErrorW(L"Error: ");
-    YaspErrorW(pwstError);
-    YaspErrorW(L"\n");
+    scilabErrorW(L"Error: ");
+    scilabErrorW(pwstError);
+    scilabErrorW(L"\n");
     FREE(pwstError);
   return retval;
 }
@@ -78,9 +78,9 @@ int ScierrorW(int iv, const wchar_t *fmt,...)
 
 
     setLastError(iv, s_buf, 0, NULL);
-    YaspWriteW(L"Error: ");
-    YaspWriteW(s_buf);
-    YaspWriteW(L"\n");
+    scilabWriteW(L"Error: ");
+    scilabWriteW(s_buf);
+    scilabWriteW(L"\n");
 
   return retval;
 }
index d33f5c8..3ddc8f5 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -77,7 +77,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../console/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../console/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../console/includes;../../../console/src/c/windows;../../../threads/includes;../../../ast/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -124,7 +124,7 @@ lib /DEF:"$(ProjectDir)system_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../console/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../console/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../console/includes;../../../console/src/c/windows;../../../threads/includes;../../../ast/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -173,7 +173,7 @@ lib /DEF:"$(ProjectDir)system_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../console/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../console/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../console/includes;../../../console/src/c/windows;../../../threads/includes;../../../ast/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -228,7 +228,7 @@ lib /DEF:"$(ProjectDir)system_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../console/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../console/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../console/includes;../../../console/src/c/windows;../../../threads/includes;../../../ast/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -302,32 +302,7 @@ lib /DEF:"$(ProjectDir)system_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
     <ClCompile Include="sciprint.c" />
     <ClCompile Include="sciprint_full.c" />
     <ClCompile Include="set_xxprintf.c" />
-    <ClCompile Include="..\cpp\yaspio.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\includes\basout.h" />
-    <ClInclude Include="..\..\includes\cerro.h" />
-    <ClInclude Include="..\..\includes\diary.h" />
-    <ClInclude Include="..\cpp\Diary.hxx" />
-    <ClInclude Include="..\cpp\diary_manager.hxx" />
-    <ClInclude Include="..\cpp\DiaryList.hxx" />
-    <ClInclude Include="..\cpp\DiaryModesEnum.hxx" />
-    <ClInclude Include="..\..\includes\do_error_number.h" />
-    <ClInclude Include="..\..\includes\dynlib_output_stream.h" />
-    <ClInclude Include="..\..\includes\errmds.h" />
-    <ClInclude Include="..\..\includes\erro.h" />
-    <ClInclude Include="errorTable.h" />
-    <ClInclude Include="error_internal.h" />
-    <ClInclude Include="..\cpp\getDiaryDate.hxx" />
-    <ClInclude Include="..\cpp\getFullFilename.hxx" />
-    <ClInclude Include="..\..\includes\gw_output_stream.h" />
-    <ClInclude Include="msgout.h" />
-    <ClInclude Include="msgstore.h" />
-    <ClInclude Include="msgstxt.h" />
-    <ClInclude Include="..\..\includes\Scierror.h" />
-    <ClInclude Include="..\..\includes\sciprint.h" />
-    <ClInclude Include="..\..\includes\sciprint_full.h" />
-    <ClInclude Include="set_xxprintf.h" />
+    <ClCompile Include="..\cpp\scilabWrite.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\locales\output_stream.pot" />
@@ -358,6 +333,37 @@ lib /DEF:"$(ProjectDir)system_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\includes\basout.h" />
+    <ClInclude Include="..\..\includes\cerro.h" />
+    <ClInclude Include="..\..\includes\diary.h" />
+    <ClInclude Include="..\..\includes\do_error_number.h" />
+    <ClInclude Include="..\..\includes\do_xxprintf.h" />
+    <ClInclude Include="..\..\includes\dynlib_output_stream.h" />
+    <ClInclude Include="..\..\includes\dynlib_output_stream_gw.h" />
+    <ClInclude Include="..\..\includes\errmds.h" />
+    <ClInclude Include="..\..\includes\erro.h" />
+    <ClInclude Include="..\..\includes\gw_output_stream.h" />
+    <ClInclude Include="..\..\includes\msgs.h" />
+    <ClInclude Include="..\..\includes\output_stream_gw.hxx" />
+    <ClInclude Include="..\..\includes\Scierror.h" />
+    <ClInclude Include="..\..\includes\scilabWrite.hxx" />
+    <ClInclude Include="..\..\includes\scilab_sprintf.hxx" />
+    <ClInclude Include="..\..\includes\sciprint.h" />
+    <ClInclude Include="..\..\includes\sciprint_full.h" />
+    <ClInclude Include="..\cpp\Diary.hxx" />
+    <ClInclude Include="..\cpp\DiaryList.hxx" />
+    <ClInclude Include="..\cpp\DiaryModesEnum.hxx" />
+    <ClInclude Include="..\cpp\diary_manager.hxx" />
+    <ClInclude Include="..\cpp\getDiaryDate.hxx" />
+    <ClInclude Include="..\cpp\getFullFilename.hxx" />
+    <ClInclude Include="errorTable.h" />
+    <ClInclude Include="error_internal.h" />
+    <ClInclude Include="msgout.h" />
+    <ClInclude Include="msgstore.h" />
+    <ClInclude Include="msgstxt.h" />
+    <ClInclude Include="set_xxprintf.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
index b15241d..f5de85a 100644 (file)
     <ClCompile Include="set_xxprintf.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\cpp\yaspio.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>    
     <ClCompile Include="errorTable.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\cpp\scilabWrite.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="api_scilab_Import.def">
+      <Filter>Libraries Dependencies\Imports</Filter>
+    </None>
+    <None Include="Console_Import.def">
+      <Filter>Libraries Dependencies\Imports</Filter>
+    </None>
+    <None Include="fileio_Import.def">
+      <Filter>Libraries Dependencies\Imports</Filter>
+    </None>
+    <None Include="LibScilab_Import.def">
+      <Filter>Libraries Dependencies\Imports</Filter>
+    </None>
+    <None Include="Localization_Import.def">
+      <Filter>Libraries Dependencies\Imports</Filter>
+    </None>
+    <None Include="output_stream_f_Import.def">
+      <Filter>Libraries Dependencies\Imports</Filter>
+    </None>
+    <None Include="Scilab_Windows_Import.def">
+      <Filter>Libraries Dependencies\Imports</Filter>
+    </None>
+    <None Include="String_Import.def">
+      <Filter>Libraries Dependencies\Imports</Filter>
+    </None>
+    <None Include="System_env_Import.def">
+      <Filter>Libraries Dependencies\Imports</Filter>
+    </None>
+    <None Include="output_stream_export.def">
+      <Filter>Libraries Dependencies\Export</Filter>
+    </None>
+    <None Include="..\..\Makefile.am" />
+    <None Include="..\..\output_stream.iss" />
+    <None Include="..\..\sci_gateway\output_stream_gateway.xml" />
+    <None Include="..\..\locales\output_stream.pot">
+      <Filter>localization</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="output_stream.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\basout.h">
     <ClInclude Include="..\..\includes\diary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\Diary.hxx">
+    <ClInclude Include="..\..\includes\do_error_number.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\diary_manager.hxx">
+    <ClInclude Include="..\..\includes\do_xxprintf.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\DiaryList.hxx">
+    <ClInclude Include="..\..\includes\dynlib_output_stream.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\DiaryModesEnum.hxx">
+    <ClInclude Include="..\..\includes\dynlib_output_stream_gw.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\do_error_number.h">
+    <ClInclude Include="..\..\includes\errmds.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\dynlib_output_stream.h">
+    <ClInclude Include="..\..\includes\erro.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\errmds.h">
+    <ClInclude Include="..\..\includes\gw_output_stream.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\erro.h">
+    <ClInclude Include="..\..\includes\msgs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="error_internal.h">
+    <ClInclude Include="..\..\includes\output_stream_gw.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\getDiaryDate.hxx">
+    <ClInclude Include="..\..\includes\Scierror.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cpp\getFullFilename.hxx">
+    <ClInclude Include="..\..\includes\scilab_sprintf.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\gw_output_stream.h">
+    <ClInclude Include="..\..\includes\scilabWrite.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\sciprint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\sciprint_full.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="error_internal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="errorTable.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="msgout.h">
     <ClInclude Include="msgstxt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\Scierror.h">
+    <ClInclude Include="set_xxprintf.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\sciprint.h">
+    <ClInclude Include="..\cpp\Diary.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\includes\sciprint_full.h">
+    <ClInclude Include="..\cpp\diary_manager.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="set_xxprintf.h">
+    <ClInclude Include="..\cpp\DiaryList.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="errorTable.h">
+    <ClInclude Include="..\cpp\DiaryModesEnum.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\cpp\getDiaryDate.hxx">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\cpp\getFullFilename.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="api_scilab_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
-    <None Include="Console_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
-    <None Include="fileio_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
-    <None Include="LibScilab_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
-    <None Include="Localization_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
-    <None Include="output_stream_f_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
-    <None Include="Scilab_Windows_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
-    <None Include="String_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
-    <None Include="System_env_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
-    <None Include="output_stream_export.def">
-      <Filter>Libraries Dependencies\Export</Filter>
-    </None>
-    <None Include="..\..\Makefile.am" />
-    <None Include="..\..\output_stream.iss" />
-    <None Include="..\..\sci_gateway\output_stream_gateway.xml" />
-    <None Include="..\..\locales\output_stream.pot">
-      <Filter>localization</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="output_stream.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
index c27c47c..68fa522 100644 (file)
@@ -21,7 +21,7 @@
 #endif
 #include "MALLOC.h"
 #include "charEncoding.h"
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 /*--------------------------------------------------------------------------*/
 #ifdef _MSC_VER
   #define vsnprintf _vsnprintf
@@ -75,7 +75,7 @@ int scivprintW(wchar_t* fmt,va_list args)
         s_buf[MAXPRINTF - 1]= L'\0';
     }
 
-       YaspWriteW(s_buf);
+       scilabWriteW(s_buf);
 
        va_end(savedargs);
 
@@ -98,7 +98,7 @@ int scivprint(char *fmt,va_list args)
 
        if (count == -1) s_buf[MAXPRINTF-1]='\0';
 
-       YaspWrite(s_buf);
+       scilabWrite(s_buf);
 
        va_end(savedargs);
 
diff --git a/scilab/modules/output_stream/src/cpp/scilabWrite.cpp b/scilab/modules/output_stream/src/cpp/scilabWrite.cpp
new file mode 100644 (file)
index 0000000..298ccf3
--- /dev/null
@@ -0,0 +1,88 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2009-2009 - 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
+ * 
+ */
+
+
+#include "scilabWrite.hxx"
+#include "configvariable.hxx"
+
+extern "C"
+{
+#include "promptmode.h"
+#include <stdio.h>
+#include "charEncoding.h"
+#include "MALLOC.h"
+#include "diary.h"
+#include "sci_mode.h"
+}
+
+static SCILAB_OUTPUT_METHOD _writer;
+
+void setScilabOutputMethod(SCILAB_OUTPUT_METHOD writer)
+{
+    _writer = writer;
+}
+
+static void scilabPrint(const char* _pstText)
+{
+    wchar_t* pwstTemp = to_wide_string(_pstText);
+    diaryWrite(pwstTemp, FALSE);
+    FREE(pwstTemp);
+   (*_writer)(const_cast<char*>(_pstText));
+}
+
+void scilabWrite(const char* _pstText)
+{
+    if(isPromptShow())
+    {
+        scilabPrint(const_cast<char*>(_pstText));
+    }
+}
+
+void scilabForcedWrite(const char* _pstText)
+{
+    scilabPrint(const_cast<char*>(_pstText));
+}
+
+void scilabWriteW(const wchar_t* _pwsText)
+{
+    if(isPromptShow())
+    {
+        char* pstTemp = wide_string_to_UTF8(_pwsText);
+        scilabWrite(pstTemp);
+        FREE(pstTemp);
+    }
+}
+
+void scilabForcedWriteW(const wchar_t* _pwsText)
+{
+    char* pstTemp = wide_string_to_UTF8(_pwsText);
+    scilabForcedWrite(pstTemp);
+    FREE(pstTemp);
+}
+
+void scilabError(const char* _pstText)
+{
+    if(getSilentError() == VERBOSE_ERROR)
+    {
+        scilabPrint(const_cast<char*>(_pstText));
+    }
+}
+
+void scilabErrorW(const wchar_t* _pwsText)
+{
+    if(getSilentError() == VERBOSE_ERROR)
+    {
+        char* pstTemp = wide_string_to_UTF8(_pwsText);
+        scilabPrint(pstTemp);
+        FREE(pstTemp);
+    }
+}
\ No newline at end of file
diff --git a/scilab/modules/output_stream/src/cpp/yaspio.cpp b/scilab/modules/output_stream/src/cpp/yaspio.cpp
deleted file mode 100644 (file)
index 594a5a8..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2009-2009 - 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
- * 
- */
-
-
-#include "yaspio.hxx"
-
-extern "C"
-{
-#include "promptmode.h"
-#include <stdio.h>
-#include "charEncoding.h"
-#include "MALLOC.h"
-#include "diary.h"
-#include "prompt.h"
-}
-
-static YASP_OUTPUT _writer;
-static YASP_INPUT _reader;
-
-void setYaspOutputMethod(YASP_OUTPUT writer)
-{
-    _writer = writer;
-}
-
-void setYaspInputMethod(YASP_INPUT reader)
-{
-    _reader = reader;
-}
-
-static void YaspPrint(const char* _pstText)
-{
-    wchar_t* pwstTemp = to_wide_string(_pstText);
-    diaryWrite(pwstTemp, FALSE);
-    FREE(pwstTemp);
-    (*_writer)(const_cast<char*>(_pstText));
-}
-
-char *YaspRead()
-{
-    //call reader
-    char* pstTemp = (*_reader)();
-
-    //add prompt to diary
-    static char pstPrompt[PROMPT_SIZE_MAX];
-    GetCurrentPrompt(pstPrompt);
-    wchar_t* pwstPrompt = to_wide_string(pstPrompt);
-    diaryWrite(pwstPrompt, TRUE);
-    FREE(pwstPrompt);
-
-    //add input to diary
-    wchar_t* pwstIn = to_wide_string(pstTemp);
-    diaryWriteln(pwstIn, TRUE);
-    FREE(pwstIn);
-
-    return pstTemp;
-}
-
-void YaspWrite(const char* _pstText)
-{
-    if(isPromptShow())
-    {
-        YaspPrint(const_cast<char*>(_pstText));
-    }
-}
-
-void YaspForcedWrite(const char* _pstText)
-{
-    YaspPrint(const_cast<char*>(_pstText));
-}
-
-void YaspWriteW(const wchar_t* _pwsText)
-{
-    if(isPromptShow())
-    {
-        char* pstTemp = wide_string_to_UTF8(_pwsText);
-        YaspWrite(pstTemp);
-        FREE(pstTemp);
-    }
-}
-
-void YaspForcedWriteW(const wchar_t* _pwsText)
-{
-    char* pstTemp = wide_string_to_UTF8(_pwsText);
-    YaspForcedWrite(pstTemp);
-    FREE(pstTemp);
-}
-
-void YaspError(const char* _pstText)
-{
-    if(getSilentError() == VERBOSE_ERROR)
-    {
-        YaspPrint(const_cast<char*>(_pstText));
-    }
-}
-
-void YaspErrorW(const wchar_t* _pwsText)
-{
-    if(getSilentError() == VERBOSE_ERROR)
-    {
-        char* pstTemp = wide_string_to_UTF8(_pwsText);
-        YaspPrint(pstTemp);
-        FREE(pstTemp);
-    }
-}
\ No newline at end of file
diff --git a/scilab/modules/shell/src/c/System_env_Import.def b/scilab/modules/shell/src/c/System_env_Import.def
deleted file mode 100644 (file)
index 1123b10..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-       LIBRARY    system_env.dll
-
-EXPORTS 
-getScilabMode
-getWarningMode
index f2ef627..e02c6c4 100644 (file)
@@ -93,6 +93,14 @@ public :
     static void setConsoleWidth(int _iConsoleWidth);
     static int getConsoleWidth(void);
 
+    // Screen console lines
+private :
+    static int m_iConsoleLines;
+
+public :
+    static void setConsoleLines(int _iConsoleLines);
+    static int getConsoleLines(void);
+
     // Scilab mode
 private :
     static int m_iScilabMode;
@@ -263,6 +271,19 @@ public :
     static void setCommandLineArgs(int _iArgs, char** _pstArgs);
     static wchar_t** getCommandLineArgs(int* _piCount);
 
+//    //input function
+//private :
+//    static SCILAB_INPUT_METHOD m_pInputMethod;
+//public :
+//    static void setInputMethod(SCILAB_INPUT_METHOD _pInputMethod);
+//    static SCILAB_INPUT_METHOD getInputMethod(void);
+//
+//    //output function
+//private :
+//    static SCILAB_OUTPUT_METHOD m_pOutputMethod;
+//public :
+//    static void setOutputMethod(SCILAB_OUTPUT_METHOD _pOutputMethod);
+//    static SCILAB_OUTPUT_METHOD getOutputMethod(void);
 
 
 };
index 5965bd1..58dbf6b 100644 (file)
@@ -189,6 +189,26 @@ int ConfigVariable::getConsoleWidth(void)
 */
 
 /*
+** Screen console lines
+** \{
+*/
+
+int ConfigVariable::m_iConsoleLines = 28; //console lines default value
+
+void ConfigVariable::setConsoleLines(int _iConsoleLines)
+{
+    m_iConsoleLines = _iConsoleLines;
+}
+
+int ConfigVariable::getConsoleLines(void)
+{
+    return m_iConsoleLines;
+}
+/*
+** \}
+*/
+
+/*
 ** Scilab mode
 ** \{
 */
@@ -610,7 +630,7 @@ int ConfigVariable::addDynamicLibrary(ConfigVariable::DynamicLibraryStr* _pDynam
     }
 
     m_DynLibList.push_back(_pDynamicLibrary);
-    return m_DynLibList.size() - 1;
+    return (int)m_DynLibList.size() - 1;
 }
 
 void ConfigVariable::removeDynamicLibrary(int _iDynamicLibraryIndex)
@@ -729,10 +749,53 @@ wchar_t** ConfigVariable::getCommandLineArgs(int* _piCount)
         pwstArgs[i] = os_wcsdup(m_Args[i].c_str());
     }
 
-    *_piCount = m_Args.size();
+    *_piCount = (int)m_Args.size();
     return pwstArgs;
 }
 
 /*
 ** \}
 */
+
+
+///*
+//** Input Method
+//** \{
+//*/
+//
+//SCILAB_INPUT_METHOD ConfigVariable::m_pInputMethod = NULL;
+//
+//void ConfigVariable::setInputMethod(SCILAB_INPUT_METHOD _pInputMethod)
+//{
+//    m_pInputMethod = _pInputMethod;
+//}
+//
+//SCILAB_INPUT_METHOD ConfigVariable::getInputMethod(void)
+//{
+//    return m_pInputMethod;
+//}
+//
+///*
+//** \}
+//*/
+//
+///*
+//** Output Method
+//** \{
+//*/
+//
+//SCILAB_OUTPUT_METHOD ConfigVariable::m_pOutputMethod = NULL;
+//
+//void ConfigVariable::setOutputMethod(SCILAB_OUTPUT_METHOD _pOutputMethod)
+//{
+//    m_pOutputMethod = _pOutputMethod;
+//}
+//
+//SCILAB_OUTPUT_METHOD ConfigVariable::getOutputMethod(void)
+//{
+//    return m_pOutputMethod;
+//}
+//
+///*
+//** \}
+//*/
index e85f500..cabfa2a 100644 (file)
@@ -18,7 +18,7 @@
 #include "context.hxx"
 #include "symbol.hxx"
 #include "localization.h"
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 #include "scilabexception.hxx"
 #include "configvariable.hxx"
 #include "mutevisitor.hxx"
index d363a0f..4ed7e2b 100644 (file)
@@ -15,7 +15,7 @@
 #include "macrofile.hxx"
 #include "context.hxx"
 #include "localization.h"
-#include "yaspio.hxx"
+#include "scilabWrite.hxx"
 #include "parser.hxx"
 #include "configvariable.hxx"
 
@@ -89,10 +89,10 @@ namespace types
             parser.parseFile(m_stPath, L"parse macro file");
             if(parser.getExitStatus() !=  Parser::Succeded)
             {
-                YaspWriteW(L"Unable to parse ");
-                YaspWriteW(m_stPath.c_str());
-                YaspWriteW(L"\n\n");
-                YaspWriteW(parser.getErrorMessage());
+                scilabWriteW(L"Unable to parse ");
+                scilabWriteW(m_stPath.c_str());
+                scilabWriteW(L"\n\n");
+                scilabWriteW(parser.getErrorMessage());
                 return false;
             }