bug fix 14901: WScilex.exe stops immediately when launched from Java 91/19491/6
Antoine ELIAS [Wed, 11 Oct 2017 11:35:53 +0000 (13:35 +0200)]
Change-Id: Ica6d7d8262770c8b02f7e44b52c16ff93d5c8d17

18 files changed:
scilab/CHANGES.md
scilab/Scilab.sln
scilab/bin/bin.iss
scilab/bin/scilab.bat [new file with mode: 0644]
scilab/modules/core/help/en_US/scilab.xml
scilab/modules/core/help/fr_FR/scilab.xml
scilab/modules/core/help/ja_JP/scilab.xml
scilab/modules/core/help/pt_BR/scilab.xml
scilab/modules/core/help/ru_RU/scilab.xml
scilab/modules/core/tests/nonreg_tests/bug_14901.dia.ref [new file with mode: 0644]
scilab/modules/core/tests/nonreg_tests/bug_14901.tst [new file with mode: 0644]
scilab/modules/development_tools/macros/scitest.sci
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/startup/src/cpp/scilab.cpp
scilab/modules/windows_tools/src/c/WScilex/WScilex-cli.vcxproj [new file with mode: 0644]
scilab/modules/windows_tools/src/c/WScilex/WScilex-cli.vcxproj.filters [new file with mode: 0644]
scilab/modules/windows_tools/src/c/WScilex/WScilex.vcxproj
scilab/modules/xcos/tests/nonreg_tests/xcos_nonreg.sci

index e32b8ab..c79f153 100644 (file)
@@ -395,6 +395,7 @@ the [development mailing list](dev@lists.scilab.org) for a particular toolbox.
 * [#13592](http://bugzilla.scilab.org/show_bug.cgi?id=13592): In an axes in a uicontrol frame, setting a `legend` interactively might not follow the mouse accurately.
 * [#13900](http://bugzilla.scilab.org/show_bug.cgi?id=13900): `nanmin` and `nanmax` were useless duplicates of `min` and `max`
 * [#13979](http://bugzilla.scilab.org/show_bug.cgi?id=13979): A variable whose name is longer than 24 characters could not be cleared.
+* [#14901](http://bugzilla.scilab.org/show_bug.cgi?id=14901): WScilex.exe was stopped immediately when launched from Java.
 * [#14254](http://bugzilla.scilab.org/show_bug.cgi?id=14254): When installing an ATOMS module that is not locally registered and available, the error message was unclear.
 * [#14376](http://bugzilla.scilab.org/show_bug.cgi?id=14376): `input()` was broken: \n was introduced before prompting; multiple prompts occurred; the output value could be missing; "%" "\n" "\t" were no longer supported in messages...
 * [#14399](http://bugzilla.scilab.org/show_bug.cgi?id=14399): `whereami`: wrong information (line numbers).
index d9f6d2f..82ea830 100644 (file)
@@ -518,6 +518,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coverage", "modules\coverag
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "scicos_blocks-cli_f", "modules\scicos_blocks\src\fortran\cli\scicos_blocks-cli_f.vfproj", "{3E0FF981-B5FB-4FC2-B6D8-8C1091FBB23A}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WScilex-cli", "modules\windows_tools\src\c\WScilex\WScilex-cli.vcxproj", "{1633D502-8B08-442B-923F-F83F3213EEF3}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -1694,6 +1696,14 @@ Global
                {3E0FF981-B5FB-4FC2-B6D8-8C1091FBB23A}.Release|Win32.Build.0 = Release|Win32
                {3E0FF981-B5FB-4FC2-B6D8-8C1091FBB23A}.Release|x64.ActiveCfg = Release|x64
                {3E0FF981-B5FB-4FC2-B6D8-8C1091FBB23A}.Release|x64.Build.0 = Release|x64
+               {1633D502-8B08-442B-923F-F83F3213EEF3}.Debug|Win32.ActiveCfg = Debug|Win32
+               {1633D502-8B08-442B-923F-F83F3213EEF3}.Debug|Win32.Build.0 = Debug|Win32
+               {1633D502-8B08-442B-923F-F83F3213EEF3}.Debug|x64.ActiveCfg = Debug|x64
+               {1633D502-8B08-442B-923F-F83F3213EEF3}.Debug|x64.Build.0 = Debug|x64
+               {1633D502-8B08-442B-923F-F83F3213EEF3}.Release|Win32.ActiveCfg = Release|Win32
+               {1633D502-8B08-442B-923F-F83F3213EEF3}.Release|Win32.Build.0 = Release|Win32
+               {1633D502-8B08-442B-923F-F83F3213EEF3}.Release|x64.ActiveCfg = Release|x64
+               {1633D502-8B08-442B-923F-F83F3213EEF3}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 9caa47c..5204ef9 100644 (file)
@@ -67,6 +67,7 @@ Source: bin\lapack.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
 Source: bin\Scilex.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\WScilex.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: bin\WScilex-cli.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: bin\Dumpexts.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\f2c.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
@@ -80,3 +81,4 @@ Source: bin\hdf5_hldll.dll ; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ; batch files
 Source: bin\scinotes.bat; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\xcos.bat; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\scilab.bat; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
diff --git a/scilab/bin/scilab.bat b/scilab/bin/scilab.bat
new file mode 100644 (file)
index 0000000..c972f24
--- /dev/null
@@ -0,0 +1,45 @@
+@echo off
+SETLOCAL ENABLEEXTENSIONS
+SET PARENT=%~dp0
+SET "START_CALL=start "Scilab" "
+set BIN=WScilex.exe
+
+:Argloop
+SET CURRENT_ARG=%~1
+rem echo arg %CURRENT_ARG%
+
+IF "%CURRENT_ARG%"=="-nw" (
+       SET BIN=WScilex-cli.exe
+    SET START_CALL=
+       goto next
+)
+
+IF "%CURRENT_ARG%"=="-nwni" (
+       SET BIN=Scilex.exe
+    SET START_CALL=
+       goto next
+)
+
+IF "%CURRENT_ARG%"=="-nogui" (
+       SET BIN=Scilex.exe
+    SET START_CALL=
+       goto next
+)
+
+IF "%CURRENT_ARG%"=="--help" (
+    %PARENT%Scilex.exe --help
+    goto quit
+)
+
+set ArgsExceptFirst=%ArgsExceptFirst% %1%
+
+:next
+shift
+
+if not "%CURRENT_ARG%"=="" goto Argloop
+
+rem echo.%START_CALL%"%PARENT%%BIN%"%ArgsExceptFirst%
+%START_CALL%"%PARENT%%BIN%"%ArgsExceptFirst%
+
+:quit
+EXIT /B
index 61b7665..bcbeb49 100644 (file)
@@ -17,7 +17,7 @@
         <synopsis>
 #      MS Windows          |  # Linux / Unix / Mac OS X
 wscilex     &lt;Options&gt;     |  scilab         &lt;Options&gt;
-wscilex -nw &lt;Options&gt; |  scilab-adv-cli &lt;Options&gt;
+wscilex-cli &lt;Options&gt; |  scilab-adv-cli &lt;Options&gt;
 scilex      &lt;Options&gt;      |  scilab-cli     &lt;Options&gt;
         </synopsis>
     </refsynopsisdiv>
index 4666f67..5f173e1 100644 (file)
@@ -17,7 +17,7 @@
         <synopsis>
 #      MS Windows          |  # Linux / Unix / Mac OS X
 wscilex     &lt;Options&gt;     |  scilab         &lt;Options&gt;
-wscilex -nw &lt;Options&gt; |  scilab-adv-cli &lt;Options&gt;
+wscilex-cli &lt;Options&gt; |  scilab-adv-cli &lt;Options&gt;
 scilex      &lt;Options&gt;      |  scilab-cli     &lt;Options&gt;
         </synopsis>
     </refsynopsisdiv>
index 09a87ca..ce31694 100644 (file)
@@ -18,7 +18,7 @@
         <synopsis>
 #      MS Windows          |  # Linux / Unix / Mac OS X
 wscilex     &lt;Options&gt;     |  scilab         &lt;Options&gt;
-wscilex -nw &lt;Options&gt; |  scilab-adv-cli &lt;Options&gt;
+wscilex-cli &lt;Options&gt; |  scilab-adv-cli &lt;Options&gt;
 scilex      &lt;Options&gt;      |  scilab-cli     &lt;Options&gt;
         </synopsis>
     </refsynopsisdiv>
index fe30105..90d3cef 100644 (file)
@@ -17,7 +17,7 @@
         <synopsis>
 #      MS Windows          |  # Linux / Unix / Mac OS X
 wscilex     &lt;Options&gt;     |  scilab         &lt;Options&gt;
-wscilex -nw &lt;Options&gt; |  scilab-adv-cli &lt;Options&gt;
+wscilex-cli &lt;Options&gt; |  scilab-adv-cli &lt;Options&gt;
 scilex      &lt;Options&gt;      |  scilab-cli     &lt;Options&gt;
         </synopsis>
     </refsynopsisdiv>
index 9f9d1dd..392011f 100644 (file)
@@ -18,7 +18,7 @@
         <synopsis>
 #      MS Windows          |  # Linux / Unix / Mac OS X
 wscilex     &lt;Options&gt;     |  scilab         &lt;Options&gt;
-wscilex -nw &lt;Options&gt; |  scilab-adv-cli &lt;Options&gt;
+wscilex-cli &lt;Options&gt; |  scilab-adv-cli &lt;Options&gt;
 scilex      &lt;Options&gt;      |  scilab-cli     &lt;Options&gt;
         </synopsis>
     </refsynopsisdiv>
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_14901.dia.ref b/scilab/modules/core/tests/nonreg_tests/bug_14901.dia.ref
new file mode 100644 (file)
index 0000000..e825e29
--- /dev/null
@@ -0,0 +1,32 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2017 - ESI - Antoine ELIAS
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- Non-regression test for bug 14901 -->
+// <-- TEST WITH GRAPHIC -->
+// <-- WINDOWS ONLY -->
+//
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=14901
+//
+// <-- Short Description -->
+txt = [...
+"import java.io.IOException;"
+"import java.lang.InterruptedException;"
+""
+"public class Test_Exec_Scilab {"
+"    public static void main(String[] args) throws IOException, InterruptedException {"
+"    String[] cmd = {""" + SCI + "/bin/WScilex"", ""-e"", ""a=string(1:10);mputl(a, \\\"""" + args[0] + ""\\\"");"", ""-quit""};"
+"    Process p = Runtime.getRuntime().exec(cmd, null, null);"
+"    p.waitFor();"
+"    }"
+"}"];
+f = fullfile(TMPDIR, "/scilab.out");
+j = jcompile("Test_Exec_Scilab", txt);
+j.main(f);
+v = mgetl(f);
+assert_checkequal(v, string(1:10)');
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_14901.tst b/scilab/modules/core/tests/nonreg_tests/bug_14901.tst
new file mode 100644 (file)
index 0000000..4266a3c
--- /dev/null
@@ -0,0 +1,38 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2017 - ESI - Antoine ELIAS
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- Non-regression test for bug 14901 -->
+// <-- TEST WITH GRAPHIC -->
+// <-- WINDOWS ONLY -->
+//
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=14901
+//
+// <-- Short Description -->
+
+
+txt = [...
+"import java.io.IOException;"
+"import java.lang.InterruptedException;"
+""
+"public class Test_Exec_Scilab {"
+"    public static void main(String[] args) throws IOException, InterruptedException {"
+"    String[] cmd = {""" + SCI + "/bin/WScilex"", ""-e"", ""a=string(1:10);mputl(a, \\\"""" + args[0] + ""\\\"");"", ""-quit""};"
+"    Process p = Runtime.getRuntime().exec(cmd, null, null);"
+"    p.waitFor();"
+"    }"
+"}"];
+
+f = fullfile(TMPDIR, "/scilab.out");
+
+j = jcompile("Test_Exec_Scilab", txt);
+j.main(f);
+
+v = mgetl(f);
+assert_checkequal(v, string(1:10)');
+
index 0f41d19..824341a 100644 (file)
@@ -166,7 +166,7 @@ function myexec()
         if fileinfo(tmpfiles+"dia")<>[] then
             deletefile(tmpfiles+"dia")
         end
-        dos(""""+SCI+"\bin\scilex.exe"+""""+" -nwni -args -nouserstartup -f "+tmpfiles+"tst 1>NUL");
+        dos(""""+SCI+"\bin\scilab"+""""+" -nwni -args -nouserstartup -f "+tmpfiles+"tst 1>NUL");
     else
         if fileinfo(tmpfiles+"dia")<>[] then
             deletefile(tmpfiles+"dia")
index 431f3e5..de972d3 100644 (file)
@@ -813,18 +813,15 @@ function status = test_single(_module, _testPath, _testName)
 
     //mode
     valgrind_opt = "";
-    winbin = "wscilex.exe";
     if _module.wanted_mode == "NW" then
         mode_arg = "-nw";
     elseif _module.wanted_mode == "NWNI" then
-        winbin = "scilex.exe";
         mode_arg = "-nwni";
     elseif _module.wanted_mode == ["NWNI" "PROFILING"] && getos() == "Linux" then
         mode_arg = "-nwni -profiling";
         valgrind_opt = "SCILAB_VALGRIND_OPT=""--log-file=" + tmp_prof + " """;
     else
         if execMode == "NWNI" then
-            winbin = "scilex.exe";
             mode_arg = "-nwni";
         elseif execMode == "NW" then
             mode_arg = "-nw";
@@ -857,9 +854,9 @@ function status = test_single(_module, _testPath, _testName)
     // Build final command
     if getos() == "Windows" then
         if (isdir(_module.moduleName) & isfile(loader_path)) // external module not in Scilab
-            test_cmd = "( """ + SCI_BIN + "\bin\" + winbin + """" + " " + mode_arg + " " + language_arg + SCI_ARGS + "-e ""exec(""""" + loader_path + """"");exec(""""" + tmp_tst + """"", -1);"" > """ + tmp_res + """ ) 2> """ + tmp_err + """";
+            test_cmd = "( """ + SCI_BIN + "\bin\scilab"" " + mode_arg + " " + language_arg + SCI_ARGS + "-e ""exec(""""" + loader_path + """"");exec(""""" + tmp_tst + """"", -1);"" > """ + tmp_res + """ ) 2> """ + tmp_err + """";
         else // standard module
-            test_cmd = "( """ + SCI_BIN + "\bin\" + winbin + """" + " " + mode_arg + " " + language_arg + SCI_ARGS + "-e ""exec(""""" + tmp_tst + """"", -1);"" > """ + tmp_res + """ ) 2> """ + tmp_err + """";
+            test_cmd = "( """ + SCI_BIN + "\bin\scilab"" " + mode_arg + " " + language_arg + SCI_ARGS + "-e ""exec(""""" + tmp_tst + """"", -1);"" > """ + tmp_res + """ ) 2> """ + tmp_err + """";
         end
     else
         if (isdir(_module.moduleName) & isfile(loader_path))
index 99ce599..73a1837 100644 (file)
@@ -30,6 +30,7 @@ extern "C"
 #include "initMacOSXEnv.h"
 #endif
 #include "InitScilab.h"
+#include "charEncoding.h"
 #include "configvariable_interface.h"
 #include "scilabRead.h"
 #include "ConsoleRead.h"
@@ -44,6 +45,7 @@ extern "C"
 #include "FilesAssociations.h"
 #include "PATH_MAX.h"
     jmp_buf ScilabJmpEnv;
+#include "WindowShow.h"
 #else
 #include "cliDisplayManagement.h"
     extern jmp_buf ScilabJmpEnv;
@@ -72,12 +74,12 @@ extern "C"
 static void usage(void)
 {
     std::cerr << "Usage: Scilab <options>" << std::endl;
-    std::cerr << "      -e Instruction   : execute the scilab instruction given in Instruction argument.";
-    std::cerr << "                         -e and -f arguments are mutually exclusive.";
-    std::cerr << "      -f File          : execute the scilab script given in File argument.";
-    std::cerr << "                         -e and -f arguments are mutually exclusive.";
-    std::cerr << "      -quit            : force scilab exit after execution of script from -e or -f argument.";
-    std::cerr << "                         this flag is ignored if it is not used with -e or -f argument.";
+    std::cerr << "      -e Instruction   : execute the scilab instruction given in Instruction argument." << std::endl;
+    std::cerr << "                         -e and -f arguments are mutually exclusive." << std::endl;
+    std::cerr << "      -f File          : execute the scilab script given in File argument." << std::endl;
+    std::cerr << "                         -e and -f arguments are mutually exclusive." << std::endl;
+    std::cerr << "      -quit            : force scilab exit after execution of script from -e or -f argument." << std::endl;
+    std::cerr << "                         this flag is ignored if it is not used with -e or -f argument." << std::endl;
     std::cerr << "      -l lang          : Change the language of scilab ( default : en_US )." << std::endl;
     std::cerr << "      -nw              : Enable console mode." << std::endl;
     std::cerr << "      -nwni            : Enable terminal mode." << std::endl;
@@ -335,12 +337,24 @@ static void TermPrintf(const char *text)
 /*
 ** -*- MAIN -*-
 */
-//#if defined(_WIN32) && !defined(WITHOUT_GUI)
-//int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLine, int iCmdShow)
-//#else
+#if defined(_WIN32) && !defined(WITHOUT_GUI) && defined(WITH_CONSOLE_JAVA)
+int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLine, int iCmdShow)
+{
+    LPWSTR *szArglist = NULL;
+    int argc = 0;
+    szArglist = CommandLineToArgvW(GetCommandLineW(), &argc);
+    char** argv = new char*[argc];
+    for (int i = 0; i < argc; ++i)
+    {
+        argv[i] = wide_string_to_UTF8(szArglist[i]);
+    }
+
+    setWindowShowMode(iCmdShow);
+
+#else
 int main(int argc, char *argv[])
-//#endif
 {
+#endif
     int iRet = 0;
 
 #ifdef ENABLE_MPI
@@ -384,6 +398,11 @@ int main(int argc, char *argv[])
     //                      | [-nwni]       -> Terminal IO + StartScilabEngine
     //                      | [-nw]         -> Terminal IO + InitMacOSXEnv
 #ifndef WITHOUT_GUI
+#ifdef WITH_CONSOLE_JAVA
+    //pSEI->iConsoleMode = SCILAB_STD;
+#else
+    pSEI->iConsoleMode = SCILAB_NW;
+#endif
     if (pSEI->iConsoleMode)
     {
         setScilabMode(SCILAB_NW);
@@ -434,7 +453,8 @@ int main(int argc, char *argv[])
 #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))
+
+    if (!isatty(_fileno(stdin)) && (_fileno(stdin) != -2) && getScilabMode() != SCILAB_STD)
 #else
     if (!isatty(fileno(stdin)))
 #endif
@@ -468,5 +488,9 @@ int main(int argc, char *argv[])
         std::wcerr << getLastErrorMessage() << std::endl;
         return val;
     }
+
+#if defined(_WIN32) && !defined(WITHOUT_GUI) && defined(WITH_CONSOLE_JAVA)
+    LocalFree(szArglist); 
+#endif
 }
 
diff --git a/scilab/modules/windows_tools/src/c/WScilex/WScilex-cli.vcxproj b/scilab/modules/windows_tools/src/c/WScilex/WScilex-cli.vcxproj
new file mode 100644 (file)
index 0000000..78cdd80
--- /dev/null
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{1633D502-8B08-442B-923F-F83F3213EEF3}</ProjectGuid>
+    <RootNamespace>WScilex-cli</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </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)cli\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)cli\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)cli\$(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)cli\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <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;../../../../ast/includes/parse;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ObjectFileName>cli/$(Configuration)/</ObjectFileName>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)WScilex-cli.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <StackReserveSize>8000000</StackReserveSize>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </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;../../../../ast/includes/parse;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ObjectFileName>cli/$(Configuration)/</ObjectFileName>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)WScilex-cli.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <StackReserveSize>32000000</StackReserveSize>
+    </Link>
+  </ItemDefinitionGroup>
+  <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;../../../../ast/includes/parse;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <ObjectFileName>cli/$(Configuration)/</ObjectFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <StackReserveSize>8000000</StackReserveSize>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </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;../../../../ast/includes/parse;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <ObjectFileName>cli/$(Configuration)/</ObjectFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <StackReserveSize>32000000</StackReserveSize>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\resources\BIN.ICO" />
+    <None Include="..\resources\COS.ICO" />
+    <None Include="..\resources\COSF.ICO" />
+    <None Include="..\resources\DEM.ICO" />
+    <None Include="..\resources\Graph.ICO" />
+    <None Include="..\resources\SAV.ICO" />
+    <None Include="..\resources\SCE.ICO" />
+    <None Include="..\resources\SCI.ICO" />
+    <None Include="..\resources\scilab.ico" />
+    <None Include="..\resources\sod.ico" />
+    <None Include="..\resources\TST.ICO" />
+    <None Include="..\resources\xcos.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="WScilex.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\ast\ast.vcxproj">
+      <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\console\src\c\console.vcxproj">
+      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\core\src\c\core.vcxproj">
+      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\localization\src\localization.vcxproj">
+      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\output_stream\src\c\output_stream.vcxproj">
+      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\scilab_windows\scilab_windows.vcxproj">
+      <Project>{8028f371-6a94-4a26-8804-6e7f05f1d1aa}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\startup\src\cpp\scilab.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/scilab/modules/windows_tools/src/c/WScilex/WScilex-cli.vcxproj.filters b/scilab/modules/windows_tools/src/c/WScilex/WScilex-cli.vcxproj.filters
new file mode 100644 (file)
index 0000000..f91419c
--- /dev/null
@@ -0,0 +1,70 @@
+<?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;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</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\resources\BIN.ICO">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\resources\COS.ICO">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\resources\COSF.ICO">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\resources\DEM.ICO">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\resources\Graph.ICO">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\resources\SAV.ICO">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\resources\SCE.ICO">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\resources\SCI.ICO">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\resources\scilab.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\resources\TST.ICO">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\resources\xcos.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="..\resources\sod.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="WScilex.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\startup\src\cpp\scilab.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
index 229ffd8..d0768ab 100644 (file)
@@ -79,7 +79,7 @@
     <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;../../../../ast/includes/parse;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;WITH_CONSOLE_JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
       <WarningLevel>Level3</WarningLevel>
@@ -89,7 +89,7 @@
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(IntDir)WScilex.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
       <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     <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;../../../../ast/includes/parse;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_DEPRECATE;WITH_CONSOLE_JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
       <WarningLevel>Level3</WarningLevel>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)WScilex.pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
       <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     <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;../../../../ast/includes/parse;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;WITH_CONSOLE_JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
       <WarningLevel>Level3</WarningLevel>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
     <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;../../../../ast/includes/parse;../../../../windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;WITH_CONSOLE_JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <ObjectFileName>$(Configuration)/</ObjectFileName>
       <WarningLevel>Level3</WarningLevel>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX64</TargetMachine>
index 191f63b..30b0b9a 100644 (file)
@@ -305,7 +305,7 @@ function status = launch_nonreg(baseDir, testName)
     end
     // Launch previous script inside a NW Scilab and redirect both standard and error output to files
     if getos() == "Windows" then
-        cmd = "(""" + SCI_BIN + "\bin\scilex.exe"" -nw -nb -args -nouserstartup -f """ + testFilename + """ > """ + logFilename + """) 2> """ + errFilename + """"
+        cmd = "(""" + SCI_BIN + "\bin\scilab"" -nw -nb -args -nouserstartup -f """ + testFilename + """ > """ + logFilename + """) 2> """ + errFilename + """"
     else
         cmd = "(''" + SCI_BIN + "/bin/scilab'' -nw -nb -args -nouserstartup -f ''" + testFilename + "'' > ''" + logFilename + "'') 2> ''" + errFilename + "''"
     end