From be62dfc7e7edc35c41e6dd540409471961f8169c Mon Sep 17 00:00:00 2001 From: Samuel GOUGEON Date: Thu, 31 Oct 2019 19:30:23 +0100 Subject: [PATCH] * Bug 16230 fixed: scilab --help list was incomplete http://bugzilla.scilab.org/16230 Change-Id: I2f8fd1c352d368f8cb65cfbdb6e6fa5ac5873a57 --- scilab/CHANGES.md | 1 + scilab/modules/startup/src/cpp/scilab.cpp | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md index d827672..fb04c62 100644 --- a/scilab/CHANGES.md +++ b/scilab/CHANGES.md @@ -302,6 +302,7 @@ Bug Fixes * [#16209](http://bugzilla.scilab.org/show_bug.cgi?id=16209): `grand` causes a freeze after several consecutive calls when using default base generator. * [#16210](http://bugzilla.scilab.org/show_bug.cgi?id=16210): The uicontrol.units = "normalized" property was not described. * [#16227](http://bugzilla.scilab.org/show_bug.cgi?id=16227): `WSCI` was not defined as environment variable and could not be used as `%WSCI%` in commands sent with `host()` or `unix_*()`. +* [#16230](http://bugzilla.scilab.org/show_bug.cgi?id=16230): `MSWin>scilab --help` missed displaying some options like `-args..`, `-noatomsautoload`, etc. * [#16242](http://bugzilla.scilab.org/show_bug.cgi?id=16242): `loadmatfile()` could not read Octave native text data files. * [#16245](http://bugzilla.scilab.org/show_bug.cgi?id=16245): `gsort` could not sort booleans. * [#16257](http://bugzilla.scilab.org/show_bug.cgi?id=16257): `blockdiag()` implemented to replace `sysdiag()`, improved and extended to strings. diff --git a/scilab/modules/startup/src/cpp/scilab.cpp b/scilab/modules/startup/src/cpp/scilab.cpp index 0eeb98b..be1eb7a 100644 --- a/scilab/modules/startup/src/cpp/scilab.cpp +++ b/scilab/modules/startup/src/cpp/scilab.cpp @@ -74,18 +74,28 @@ extern "C" static void usage(void) { std::cerr << "Usage: Scilab " << std::endl; - std::cerr << " -e Instruction : execute the scilab instruction given in Instruction argument." << std::endl; + std::cerr << " -args arg1 arg2..: Send directly some arg1 arg2 .. data to the session." << std::endl; + std::cerr << " arg1 arg2 .. values can then be read through sciargs()." << std::endl; + 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 << " -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 << " -quit : Force scilab exit after execution of script from -e or -f argument." << std::endl; + std::cerr << " Flag 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; - std::cerr << " -ns : Don't execute etc/scilab.start." << std::endl; - std::cerr << " --help : Display this help." << std::endl; + std::cerr << " -ns : Do not execute etc/scilab.start." << std::endl; + std::cerr << " -nouserstartup : Do not execute user startup files (SCIHOME/scilab.ini|.scilab)." << std::endl; + std::cerr << " -noatomsautoload : Do not autoload eligible ATOMS modules." << std::endl; + std::cerr << " -nb : Do not display the banner (no banner)." << std::endl; std::cerr << " -scihome : Force SCIHOME to ." << std::endl; + std::cerr << " -texmacs : Option to use Scilab from documents through http://texmacs.org." << std::endl; + std::cerr << " -version : Display the Scilab version (no session opened)." << std::endl; + std::cerr << " -display Display : Set the display to the X server Display (XWindow systems only)." << std::endl; + std::cerr << " unix:0.0 is the default." << std::endl; + std::cerr << " --help : Display this help." << std::endl; + std::cerr << " " << std::endl; std::cerr << "Developer Trace arguments:" << std::endl; std::cerr << " --parse-trace : Display bison state machine evolution." << std::endl; std::cerr << " --AST-trace : Display ASCII-art AST to be human readable." << std::endl; @@ -515,4 +525,3 @@ int main(int argc, char *argv[]) LocalFree(szArglist); #endif } - -- 1.7.9.5