[bug_14337] crash fixed at Scilab exit when it is called after a pipe. 49/17749/8
Cedric Delamarre [Mon, 1 Feb 2016 13:46:38 +0000 (14:46 +0100)]
test_run core bug_14337

// in one console
tail -f file | bin/scilab-cli
// in one other console
echo "disp(%pi)" >> file
echo "1+1" >> file

Change-Id: I9736b58ac5adc148e25b1de6e81f488a018f99ff

15 files changed:
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/includes/getpipeline.h [new file with mode: 0644]
scilab/modules/console/src/c/cmdLine/charactersManagement.c
scilab/modules/console/src/c/cmdLine/getKey.c
scilab/modules/console/src/c/console.vcxproj
scilab/modules/console/src/c/console.vcxproj.filters
scilab/modules/console/src/c/getpipeline.c [new file with mode: 0644]
scilab/modules/console/src/c/windows/TermReadAndProcess.c
scilab/modules/core/tests/nonreg_tests/bug_14337.dia.ref [new file with mode: 0644]
scilab/modules/core/tests/nonreg_tests/bug_14337.tst [new file with mode: 0644]
scilab/modules/core/tests/nonreg_tests/out_bug_14437.txt.ref [new file with mode: 0644]
scilab/modules/startup/src/cpp/scilab.cpp
scilab/modules/windows_tools/src/c/CScilex/CScilex.vcxproj
scilab/modules/windows_tools/src/c/WScilex/WScilex.vcxproj

index bfbd61b..e03d436 100644 (file)
@@ -85,6 +85,7 @@ libsciconsole_minimal_la_SOURCES = \
     src/c/others/clrscr_nw.c \
     src/c/prompt.c \
     src/c/promptecho.c \
+    src/c/getpipeline.c \
     src/c/cmdLine/autoCompletionCli.c \
     src/c/cmdLine/charactersManagement.c \
     src/c/cmdLine/cliDisplayManagement.c \
index 78841ae..9c1e00a 100644 (file)
@@ -214,6 +214,7 @@ am_libsciconsole_minimal_la_OBJECTS =  \
        src/c/others/libsciconsole_minimal_la-clrscr_nw.lo \
        src/c/libsciconsole_minimal_la-prompt.lo \
        src/c/libsciconsole_minimal_la-promptecho.lo \
+       src/c/libsciconsole_minimal_la-getpipeline.lo \
        src/c/cmdLine/libsciconsole_minimal_la-autoCompletionCli.lo \
        src/c/cmdLine/libsciconsole_minimal_la-charactersManagement.lo \
        src/c/cmdLine/libsciconsole_minimal_la-cliDisplayManagement.lo \
@@ -694,6 +695,7 @@ libsciconsole_minimal_la_SOURCES = \
     src/c/others/clrscr_nw.c \
     src/c/prompt.c \
     src/c/promptecho.c \
+    src/c/getpipeline.c \
     src/c/cmdLine/autoCompletionCli.c \
     src/c/cmdLine/charactersManagement.c \
     src/c/cmdLine/cliDisplayManagement.c \
@@ -1018,6 +1020,8 @@ src/c/libsciconsole_minimal_la-prompt.lo: src/c/$(am__dirstamp) \
        src/c/$(DEPDIR)/$(am__dirstamp)
 src/c/libsciconsole_minimal_la-promptecho.lo: src/c/$(am__dirstamp) \
        src/c/$(DEPDIR)/$(am__dirstamp)
+src/c/libsciconsole_minimal_la-getpipeline.lo: src/c/$(am__dirstamp) \
+       src/c/$(DEPDIR)/$(am__dirstamp)
 src/c/cmdLine/$(am__dirstamp):
        @$(MKDIR_P) src/c/cmdLine
        @: > src/c/cmdLine/$(am__dirstamp)
@@ -1138,6 +1142,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciconsole_la-GuiManagement.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciconsole_la-dropFiles.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciconsole_minimal_la-clc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciconsole_minimal_la-getpipeline.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciconsole_minimal_la-more.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciconsole_minimal_la-prompt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciconsole_minimal_la-promptecho.Plo@am__quote@
@@ -1258,6 +1263,13 @@ src/c/libsciconsole_minimal_la-promptecho.lo: src/c/promptecho.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_minimal_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/libsciconsole_minimal_la-promptecho.lo `test -f 'src/c/promptecho.c' || echo '$(srcdir)/'`src/c/promptecho.c
 
+src/c/libsciconsole_minimal_la-getpipeline.lo: src/c/getpipeline.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_minimal_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/libsciconsole_minimal_la-getpipeline.lo -MD -MP -MF src/c/$(DEPDIR)/libsciconsole_minimal_la-getpipeline.Tpo -c -o src/c/libsciconsole_minimal_la-getpipeline.lo `test -f 'src/c/getpipeline.c' || echo '$(srcdir)/'`src/c/getpipeline.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/$(DEPDIR)/libsciconsole_minimal_la-getpipeline.Tpo src/c/$(DEPDIR)/libsciconsole_minimal_la-getpipeline.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getpipeline.c' object='src/c/libsciconsole_minimal_la-getpipeline.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_minimal_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/libsciconsole_minimal_la-getpipeline.lo `test -f 'src/c/getpipeline.c' || echo '$(srcdir)/'`src/c/getpipeline.c
+
 src/c/cmdLine/libsciconsole_minimal_la-autoCompletionCli.lo: src/c/cmdLine/autoCompletionCli.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciconsole_minimal_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/cmdLine/libsciconsole_minimal_la-autoCompletionCli.lo -MD -MP -MF src/c/cmdLine/$(DEPDIR)/libsciconsole_minimal_la-autoCompletionCli.Tpo -c -o src/c/cmdLine/libsciconsole_minimal_la-autoCompletionCli.lo `test -f 'src/c/cmdLine/autoCompletionCli.c' || echo '$(srcdir)/'`src/c/cmdLine/autoCompletionCli.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/cmdLine/$(DEPDIR)/libsciconsole_minimal_la-autoCompletionCli.Tpo src/c/cmdLine/$(DEPDIR)/libsciconsole_minimal_la-autoCompletionCli.Plo
diff --git a/scilab/modules/console/includes/getpipeline.h b/scilab/modules/console/includes/getpipeline.h
new file mode 100644 (file)
index 0000000..5489ac4
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2016 - Scilab Enterprises - Cedric Delamarre
+ *
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ * === LICENSE_END ===
+ *
+ */
+
+#ifndef _GETPIPELINE_H_
+#define _GETPIPELINE_H_
+
+#include "dynlib_console.h"
+/**
+* getPipeLine function
+* @return characters read from stdin when stdin is not a tty
+* ie: echo "1+1" | bin/scilab -nwni
+*/
+CONSOLE_IMPEXP char* getPipeLine(void);
+
+#endif /* _GETPIPELINE_H_ */
index e97eb1b..6211dbf 100644 (file)
@@ -57,11 +57,9 @@ int addChar(wchar_t ** CommandLine, int key, unsigned int *cursorLocation)
         }
         /* Add the new character to the command line. */
         (*CommandLine)[*cursorLocation] = (wchar_t) key;
-        if (isatty(fileno(stdin)))
-        {
-            /* We are not in a pipe */
-            printf("%lc", (*CommandLine)[*cursorLocation]);
-        }
+
+        printf("%lc", (*CommandLine)[*cursorLocation]);
+
         sizeOfCmd++;
         (*CommandLine)[sizeOfCmd] = L'\0';
         (*cursorLocation)++;
index cad4932..0aa11f0 100644 (file)
@@ -318,12 +318,8 @@ char *getCmdLine(void)
 
     static int nextLineLocationInWideString = 0;
 
-    if (isatty(fileno(stdin)))
-    {
-        /* We are not in a pipe */
-        printPrompt(WRITE_PROMPT);
-        setCharDisplay(DISP_BRIGHT);
-    }
+    printPrompt(WRITE_PROMPT);
+    setCharDisplay(DISP_BRIGHT);
     setTokenInteruptExecution(RESET_TOKEN);
 
     if (commandLine == NULL || commandLine[nextLineLocationInWideString] == L'\0')
index eeb59c6..c3f119f 100644 (file)
     <ClCompile Include="dropFiles.c" />
     <ClCompile Include="..\jni\DropFiles_wrap.c" />
     <ClCompile Include="..\cpp\GetCharWithoutOutput.cpp" />
+    <ClCompile Include="getpipeline.c" />
     <ClCompile Include="GuiManagement.c" />
     <ClCompile Include="..\jni\GuiManagement_wrap.c" />
     <ClCompile Include="InitializeConsole.c" />
     <ClInclude Include="..\..\includes\ConsolePrintf.h" />
     <ClInclude Include="..\..\includes\ConsoleRead.h" />
     <ClInclude Include="..\..\includes\dynlib_console.h" />
+    <ClInclude Include="..\..\includes\getpipeline.h" />
     <ClInclude Include="..\..\includes\gw_console.h" />
     <ClInclude Include="..\..\includes\InitializeConsole.h" />
     <ClInclude Include="..\..\includes\more.h" />
index 3065351..e63acfe 100644 (file)
     <ClCompile Include="..\cpp\scilabRead.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="getpipeline.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\jni\DropFiles.i">
     <ClInclude Include="windows\TermLine.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\includes\getpipeline.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="console.rc" />
diff --git a/scilab/modules/console/src/c/getpipeline.c b/scilab/modules/console/src/c/getpipeline.c
new file mode 100644 (file)
index 0000000..8f2d329
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2016 - Scilab Enterprises - Cedric Delamarre
+* Copyright (C) 2012 - 2016 - Scilab Enterprises
+*
+* This file is hereby licensed under the terms of the GNU GPL v2.0,
+* pursuant to article 5.3.4 of the CeCILL v.2.1.
+* This file was originally licensed under the terms of the CeCILL v2.1,
+* and continues to be available under such terms.
+* For more information, see the COPYING file which you should have received
+* along with this program.
+* === LICENSE_END ===
+*
+*/
+#include <stdio.h>
+#include "isatty.hxx"
+#include "os_string.h"
+#include "machine.h" // bsiz
+#include "getpipeline.h"
+
+char* getPipeLine(void)
+{
+    int len_line = 0;
+    char buffer[bsiz];
+
+    //read from stdin
+    int eof = (fgets(buffer, bsiz, stdin) == NULL);
+    if (eof)
+    {
+        //send command to quit to Scilab
+        return os_strdup("quit");
+    }
+
+    //remove trailing \n
+    len_line = (int)strlen(buffer);
+    if (buffer[len_line - 1] == '\n')
+    {
+        buffer[len_line - 1] = '\0';
+    }
+
+    return os_strdup(buffer);
+}
index 998f3af..1c15300 100644 (file)
 #include "sci_malloc.h"
 #include "prompt.h"
 #include "TermConsole.h"
-#include "isatty.hxx"
-#include "os_string.h"
 /*--------------------------------------------------------------------------*/
 char * getCmdLine(void)
 {
-#ifdef _MSC_VER
-    /* if file descriptor returned is -2 stdin is not associated with an input stream */
-    /* example : echo plot3d | scilex -nw -e */
-    if (!isatty(_fileno(stdin)) && (_fileno(stdin) != -2))
-#else
-    if (!isatty(fileno(stdin)))
-#endif
-    {
-        char buffer[bsiz];
-        //read from stdin
-        int eof = (fgets(buffer, bsiz, stdin) == NULL);
-        if (eof)
-        {
-            //send command to quit to Scilab
-            return os_strdup("quit");
-        }
-
-        //remove trailing \n
-        int len_line = (int)strlen(buffer);
-        if (buffer[len_line - 1] == '\n')
-        {
-            buffer[len_line - 1] = '\0';
-        }
+    char *line = NULL;
+    static char save_prompt[PROMPT_SIZE_MAX];
 
-        return os_strdup(buffer);
+    if (GetTemporaryPrompt() != NULL) /* Input function is used */
+    {
+        line = TerminalGetString(GetTemporaryPrompt());
     }
     else
     {
-        char *line = NULL;
-        static char save_prompt[PROMPT_SIZE_MAX];
-
-        if (GetTemporaryPrompt() != NULL) /* Input function is used */
-        {
-            line = TerminalGetString(GetTemporaryPrompt());
-        }
-        else
-        {
-            GetCurrentPrompt(save_prompt);
-            line = TerminalGetString(save_prompt);
-        }
-        strcpy(save_prompt, "");
-        return line;
+        GetCurrentPrompt(save_prompt);
+        line = TerminalGetString(save_prompt);
     }
+    strcpy(save_prompt, "");
+    return line;
 }
 /*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_14337.dia.ref b/scilab/modules/core/tests/nonreg_tests/bug_14337.dia.ref
new file mode 100644 (file)
index 0000000..4d6396b
--- /dev/null
@@ -0,0 +1,26 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Cedric Delamarre
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- Non-regression test for bug 14337 -->
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/14337
+//
+// <-- Short Description -->
+// piping one command using a shell pipepine ( "|" ) works, but scilab segfaults at exit
+cmd = """(1 + 1)""";
+if getos() == "Windows"
+    ierr = host("echo " + cmd + " | start " + WSCI + "\bin\scilex -ns -quit > " + TMPDIR + "/out_bug_14337.txt");
+else
+    ierr = host("echo " + cmd + " | nohup " + SCI + "/bin/scilab-cli -ns -quit > " + TMPDIR + "/out_bug_14337.txt 2>&1 &");
+end
+sleep(500); // wait for scilab to close
+out_bug_14337_ref = mgetl(SCI + "/modules/core/tests/nonreg_tests/out_bug_14437.txt.ref");
+out_bug_14337 = mgetl(TMPDIR + "/out_bug_14337.txt");
+assert_checkequal(out_bug_14337, out_bug_14337_ref);
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_14337.tst b/scilab/modules/core/tests/nonreg_tests/bug_14337.tst
new file mode 100644 (file)
index 0000000..c80bd4d
--- /dev/null
@@ -0,0 +1,30 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Cedric Delamarre
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- Non-regression test for bug 14337 -->
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/14337
+//
+// <-- Short Description -->
+// piping one command using a shell pipepine ( "|" ) works, but scilab segfaults at exit
+
+cmd = """(1 + 1)""";
+
+if getos() == "Windows"
+    ierr = host("echo " + cmd + " | start " + WSCI + "\bin\scilex -ns -quit > " + TMPDIR + "/out_bug_14337.txt");
+else
+    ierr = host("echo " + cmd + " | nohup " + SCI + "/bin/scilab-cli -ns -quit > " + TMPDIR + "/out_bug_14337.txt 2>&1 &");
+end
+
+sleep(500); // wait for scilab to close
+out_bug_14337_ref = mgetl(SCI + "/modules/core/tests/nonreg_tests/out_bug_14437.txt.ref");
+out_bug_14337 = mgetl(TMPDIR + "/out_bug_14337.txt");
+
+assert_checkequal(out_bug_14337, out_bug_14337_ref);
diff --git a/scilab/modules/core/tests/nonreg_tests/out_bug_14437.txt.ref b/scilab/modules/core/tests/nonreg_tests/out_bug_14437.txt.ref
new file mode 100644 (file)
index 0000000..3bcdba1
--- /dev/null
@@ -0,0 +1,6 @@
+
+ ans  =
+
+   2.
+
+
index e424c53..95fe7df 100644 (file)
@@ -36,8 +36,10 @@ extern "C"
 #include "version.h"
 #include "sci_malloc.h"
 #include "lasterror.h"
+#include "getpipeline.h"
 
     extern char *getCmdLine(void);
+
 #ifdef _MSC_VER
 #include "FilesAssociations.h"
 #include "PATH_MAX.h"
@@ -45,6 +47,7 @@ extern "C"
 #else
     extern jmp_buf ScilabJmpEnv;
 #endif
+#include "isatty.hxx"
 }
 
 #include "configvariable.hxx"
@@ -366,6 +369,18 @@ int main(int argc, char *argv[])
     setScilabOutputMethod(&TermPrintf);
 #endif // defined(WITHOUT_GUI)
 
+#ifdef _MSC_VER
+    /* if file descriptor returned is -2 stdin is not associated with an input stream */
+    /* example : echo plot3d | scilex -nw -e */
+    if (!isatty(_fileno(stdin)) && (_fileno(stdin) != -2))
+#else
+    if (!isatty(fileno(stdin)))
+#endif
+    {
+        // We are in a pipe
+        setScilabInputMethod(&getPipeLine);
+    }
+
     if (pSEI->iShowVersion == 1)
     {
         disp_scilab_version();
index 639fb99..2f9c142 100644 (file)
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../../core/src/c;../../../../../libs/intl;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../startup/src/c;../../../../windows_tools/src/c/scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../core/src/c;../../../../../libs/intl;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../ast/includes/parse;../../../../startup/src/c;../../../../windows_tools/src/c/scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WITHOUT_GUI;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>../../../../core/src/c;../../../../../libs/intl;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../startup/src/c;../../../../windows_tools/src/c/scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../core/src/c;../../../../../libs/intl;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../ast/includes/parse;../../../../startup/src/c;../../../../windows_tools/src/c/scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WITHOUT_GUI;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
     </Midl>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>../../../../core/src/c;../../../../../libs/intl;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../startup/src/c;../../../../windows_tools/src/c/scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../core/src/c;../../../../../libs/intl;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../ast/includes/parse;../../../../startup/src/c;../../../../windows_tools/src/c/scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WITHOUT_GUI;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
index 69696a9..a2b1810 100644 (file)
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../../../libs/intl;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../core/src/c;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../../libs/intl;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../core/src/c;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../ast/includes/parse;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../../../libs/intl;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../core/src/c;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../../libs/intl;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../core/src/c;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../ast/includes/parse;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>../../../../../libs/intl;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../core/src/c;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../../libs/intl;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../core/src/c;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../ast/includes/parse;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
     </Midl>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>../../../../../libs/intl;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../core/src/c;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../../libs/intl;../../../../functions_manager/includes;../../../../console/includes;../../../../elementary_functions/includes;../../../../localization/includes;../../../../shell/includes;../../../../history_manager/includes;../../../../fileio/includes;../../../../output_stream/includes;../../../../string/includes;../../../../api_scilab/includes;../../../../threads/includes;../../../../core/src/c;../../../../dynamic_link/includes;../../../../tclsci/includes;../../../../jvm/includes;../../../../gui/includes;../../../../graphics/includes;../../../../core/includes;../../../../ast/includes/types;../../../../ast/includes/ast;../../../../ast/includes/analysis;../../../../ast/includes/exps;../../../../ast/includes/operations;../../../../ast/includes/symbol;../../../../ast/includes/system_env;../../../../ast/includes/parse;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>