* [#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).
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
{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
;
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}
;
; 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}
--- /dev/null
+@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
<synopsis>
# MS Windows | # Linux / Unix / Mac OS X
wscilex <Options> | scilab <Options>
-wscilex -nw <Options> | scilab-adv-cli <Options>
+wscilex-cli <Options> | scilab-adv-cli <Options>
scilex <Options> | scilab-cli <Options>
</synopsis>
</refsynopsisdiv>
<synopsis>
# MS Windows | # Linux / Unix / Mac OS X
wscilex <Options> | scilab <Options>
-wscilex -nw <Options> | scilab-adv-cli <Options>
+wscilex-cli <Options> | scilab-adv-cli <Options>
scilex <Options> | scilab-cli <Options>
</synopsis>
</refsynopsisdiv>
<synopsis>
# MS Windows | # Linux / Unix / Mac OS X
wscilex <Options> | scilab <Options>
-wscilex -nw <Options> | scilab-adv-cli <Options>
+wscilex-cli <Options> | scilab-adv-cli <Options>
scilex <Options> | scilab-cli <Options>
</synopsis>
</refsynopsisdiv>
<synopsis>
# MS Windows | # Linux / Unix / Mac OS X
wscilex <Options> | scilab <Options>
-wscilex -nw <Options> | scilab-adv-cli <Options>
+wscilex-cli <Options> | scilab-adv-cli <Options>
scilex <Options> | scilab-cli <Options>
</synopsis>
</refsynopsisdiv>
<synopsis>
# MS Windows | # Linux / Unix / Mac OS X
wscilex <Options> | scilab <Options>
-wscilex -nw <Options> | scilab-adv-cli <Options>
+wscilex-cli <Options> | scilab-adv-cli <Options>
scilex <Options> | scilab-cli <Options>
</synopsis>
</refsynopsisdiv>
--- /dev/null
+// =============================================================================
+// 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)');
--- /dev/null
+// =============================================================================
+// 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)');
+
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")
//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";
// 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))
#include "initMacOSXEnv.h"
#endif
#include "InitScilab.h"
+#include "charEncoding.h"
#include "configvariable_interface.h"
#include "scilabRead.h"
#include "ConsoleRead.h"
#include "FilesAssociations.h"
#include "PATH_MAX.h"
jmp_buf ScilabJmpEnv;
+#include "WindowShow.h"
#else
#include "cliDisplayManagement.h"
extern jmp_buf ScilabJmpEnv;
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;
/*
** -*- 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
// | [-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);
#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
std::wcerr << getLastErrorMessage() << std::endl;
return val;
}
+
+#if defined(_WIN32) && !defined(WITHOUT_GUI) && defined(WITH_CONSOLE_JAVA)
+ LocalFree(szArglist);
+#endif
}
--- /dev/null
+<?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
--- /dev/null
+<?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
<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>$(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>
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
projects / scilab.git / commitdiff