summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-08-04 14:40:31 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-08-04 14:40:31 +0200
commit82f2688a181c0dd4859dc905480ddce8354f9bb3 (patch)
treedb21ff3fc508d766de66e516dc34837f36925c45 /scilab/modules
parent83812b5608f63fa05949910388eaa3b1bc78e54a (diff)
downloadscilab-82f2688a181c0dd4859dc905480ddce8354f9bb3.zip
scilab-82f2688a181c0dd4859dc905480ddce8354f9bb3.tar.gz
Windows Installer: Add CLI configuration (minimal install)
Change-Id: Ia0614a473a2f9134c2b05c508d8986db7201f87c
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/action_binding/action_binding.iss38
-rw-r--r--scilab/modules/atoms/atoms.iss2
-rw-r--r--scilab/modules/completion/completion.iss2
-rw-r--r--scilab/modules/console/console.iss48
-rw-r--r--scilab/modules/console/src/noconsole/noconsole.c19
-rw-r--r--scilab/modules/graph/graph.iss24
-rw-r--r--scilab/modules/gui/gui.iss52
-rw-r--r--scilab/modules/gui/src/nogui/nogui.c158
-rw-r--r--scilab/modules/gui/src/nogui/nogui.h150
-rw-r--r--scilab/modules/gui/src/nogui/nogui.rc97
-rw-r--r--scilab/modules/gui/src/nogui/nogui.vcproj399
-rw-r--r--scilab/modules/hdf5/hdf5.iss4
-rw-r--r--scilab/modules/helptools/helptools.iss114
-rw-r--r--scilab/modules/history_browser/history_browser.iss25
-rw-r--r--scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.c162
-rw-r--r--scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.rc8
-rw-r--r--scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.vcproj4
-rw-r--r--scilab/modules/intersci/intersci.iss3
-rw-r--r--scilab/modules/jvm/jvm.iss60
-rw-r--r--scilab/modules/jvm/src/nojvm/nojvm.c65
-rw-r--r--scilab/modules/jvm/src/nojvm/nojvm.rc97
-rw-r--r--scilab/modules/jvm/src/nojvm/nojvm.vcproj399
-rw-r--r--scilab/modules/scicos_blocks/scicos_blocks.iss2
-rw-r--r--scilab/modules/types/types.iss22
-rw-r--r--scilab/modules/ui_data/ui_data.iss28
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/console_main.c13
26 files changed, 1469 insertions, 526 deletions
diff --git a/scilab/modules/action_binding/action_binding.iss b/scilab/modules/action_binding/action_binding.iss
index 70ac930..88598a9 100644
--- a/scilab/modules/action_binding/action_binding.iss
+++ b/scilab/modules/action_binding/action_binding.iss
@@ -19,33 +19,33 @@
19; 19;
20#define ACTION_BINDING "action_binding" 20#define ACTION_BINDING "action_binding"
21; 21;
22Source: bin\sciaction_binding.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 22Source: bin\sciaction_binding.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
23; 23;
24Source: modules\{#ACTION_BINDING}\jar\org.scilab.modules.{#ACTION_BINDING}.jar;DestDir: {app}\modules\{#ACTION_BINDING}\jar; Components: {#COMPN_SCILAB} 24Source: modules\{#ACTION_BINDING}\jar\org.scilab.modules.{#ACTION_BINDING}.jar;DestDir: {app}\modules\{#ACTION_BINDING}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
25; 25;
26;Source: bin\no{#ACTION_BINDING}.dll; DestDir: {app}\bin; DestName: sci{#ACTION_BINDING}.dll; Components: not ({#COMPN_ACTION_BINDING}) 26;Source: bin\no{#ACTION_BINDING}.dll; DestDir: {app}\bin; DestName: sci{#ACTION_BINDING}.dll; Components: not ({#COMPN_ACTION_BINDING})
27; 27;
28Source: modules\{#ACTION_BINDING}\changelog.txt; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB}; 28Source: modules\{#ACTION_BINDING}\changelog.txt; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
29Source: modules\{#ACTION_BINDING}\license.txt; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB} 29Source: modules\{#ACTION_BINDING}\license.txt; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
30Source: modules\{#ACTION_BINDING}\readme.txt; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB} 30Source: modules\{#ACTION_BINDING}\readme.txt; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
31Source: modules\{#ACTION_BINDING}\version.xml; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB} 31Source: modules\{#ACTION_BINDING}\version.xml; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
32; 32;
33Source: modules\{#ACTION_BINDING}\sci_gateway\{#ACTION_BINDING}_gateway.xml; DestDir: {app}\modules\{#ACTION_BINDING}\sci_gateway; Components: {#COMPN_SCILAB} 33Source: modules\{#ACTION_BINDING}\sci_gateway\{#ACTION_BINDING}_gateway.xml; DestDir: {app}\modules\{#ACTION_BINDING}\sci_gateway; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
34; 34;
35;Source: modules\{#ACTION_BINDING}\includes\*.h; DestDir: {app}\modules\{#ACTION_BINDING}\includes; Components: {#COMPN_SCILAB} 35;Source: modules\{#ACTION_BINDING}\includes\*.h; DestDir: {app}\modules\{#ACTION_BINDING}\includes; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
36; 36;
37Source: modules\{#ACTION_BINDING}\etc\{#ACTION_BINDING}.quit; DestDir: {app}\modules\{#ACTION_BINDING}\etc; Components: {#COMPN_SCILAB} 37Source: modules\{#ACTION_BINDING}\etc\{#ACTION_BINDING}.quit; DestDir: {app}\modules\{#ACTION_BINDING}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
38Source: modules\{#ACTION_BINDING}\etc\{#ACTION_BINDING}.start; DestDir: {app}\modules\{#ACTION_BINDING}\etc; Components: {#COMPN_SCILAB} 38Source: modules\{#ACTION_BINDING}\etc\{#ACTION_BINDING}.start; DestDir: {app}\modules\{#ACTION_BINDING}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
39; 39;
40Source: modules\{#ACTION_BINDING}\macros\buildmacros.sce; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} 40Source: modules\{#ACTION_BINDING}\macros\buildmacros.sce; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
41Source: modules\{#ACTION_BINDING}\macros\buildmacros.bat; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} 41Source: modules\{#ACTION_BINDING}\macros\buildmacros.bat; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
42Source: modules\{#ACTION_BINDING}\macros\cleanmacros.bat; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} 42Source: modules\{#ACTION_BINDING}\macros\cleanmacros.bat; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
43;Source: modules\{#ACTION_BINDING}\macros\*.bin; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} 43;Source: modules\{#ACTION_BINDING}\macros\*.bin; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
44;Source: modules\{#ACTION_BINDING}\macros\*.sci; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} 44;Source: modules\{#ACTION_BINDING}\macros\*.sci; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
45;Source: modules\{#ACTION_BINDING}\macros\lib; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} 45;Source: modules\{#ACTION_BINDING}\macros\lib; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
46;Source: modules\{#ACTION_BINDING}\macros\names; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} 46;Source: modules\{#ACTION_BINDING}\macros\names; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
47; 47;
48;Source: modules\{#ACTION_BINDING}\demos\*.*; DestDir: {app}\modules\{#ACTION_BINDING}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 48;Source: modules\{#ACTION_BINDING}\demos\*.*; DestDir: {app}\modules\{#ACTION_BINDING}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
49; 49;
50Source: modules\{#ACTION_BINDING}\tests\*.*; DestDir: {app}\modules\{#ACTION_BINDING}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} 50Source: modules\{#ACTION_BINDING}\tests\*.*; DestDir: {app}\modules\{#ACTION_BINDING}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
51;-------------------------------------------------------------------------------------------------------------- 51;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/modules/atoms/atoms.iss b/scilab/modules/atoms/atoms.iss
index 68e224a..30d5829 100644
--- a/scilab/modules/atoms/atoms.iss
+++ b/scilab/modules/atoms/atoms.iss
@@ -27,7 +27,7 @@ Source: modules\{#ATOMS}\changelog.txt; DestDir: {app}\modules\{#ATOMS}; Compone
27Source: modules\{#ATOMS}\etc\{#ATOMS}.quit; DestDir: {app}\modules\{#ATOMS}\etc; Components: {#COMPN_ATOMS} 27Source: modules\{#ATOMS}\etc\{#ATOMS}.quit; DestDir: {app}\modules\{#ATOMS}\etc; Components: {#COMPN_ATOMS}
28Source: modules\{#ATOMS}\etc\{#ATOMS}.start; DestDir: {app}\modules\{#ATOMS}\etc; Components: {#COMPN_ATOMS} 28Source: modules\{#ATOMS}\etc\{#ATOMS}.start; DestDir: {app}\modules\{#ATOMS}\etc; Components: {#COMPN_ATOMS}
29Source: modules\{#ATOMS}\etc\repositories; DestDir: {app}\modules\{#ATOMS}\etc; Components: {#COMPN_ATOMS} 29Source: modules\{#ATOMS}\etc\repositories; DestDir: {app}\modules\{#ATOMS}\etc; Components: {#COMPN_ATOMS}
30Source: modules\{#ATOMS}\images\icons\*.png; DestDir: {app}\modules\{#ATOMS}\images\icons; Components: {#COMPN_SCILAB} 30Source: modules\{#ATOMS}\images\icons\*.png; DestDir: {app}\modules\{#ATOMS}\images\icons; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
31; 31;
32Source: modules\{#ATOMS}\macros\lib; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_ATOMS} 32Source: modules\{#ATOMS}\macros\lib; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_ATOMS}
33Source: modules\{#ATOMS}\macros\names; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_ATOMS} 33Source: modules\{#ATOMS}\macros\names; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_ATOMS}
diff --git a/scilab/modules/completion/completion.iss b/scilab/modules/completion/completion.iss
index 75091f4..6b9689b 100644
--- a/scilab/modules/completion/completion.iss
+++ b/scilab/modules/completion/completion.iss
@@ -21,7 +21,7 @@
21Source: bin\sci{#COMPLETION}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 21Source: bin\sci{#COMPLETION}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
22Source: bin\sci{#COMPLETION}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 22Source: bin\sci{#COMPLETION}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
23; 23;
24Source: modules\{#COMPLETION}\jar\org.scilab.modules.{#COMPLETION}.jar;DestDir: {app}\modules\{#COMPLETION}\jar; Components: {#COMPN_SCILAB} 24Source: modules\{#COMPLETION}\jar\org.scilab.modules.{#COMPLETION}.jar;DestDir: {app}\modules\{#COMPLETION}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
25; 25;
26;Source: bin\nosci{#COMPLETION}.dll; DestDir: {app}\bin; DestName: sci{#COMPLETION}.dll; Components: not ({#COMPN_SCILAB}) 26;Source: bin\nosci{#COMPLETION}.dll; DestDir: {app}\bin; DestName: sci{#COMPLETION}.dll; Components: not ({#COMPN_SCILAB})
27; 27;
diff --git a/scilab/modules/console/console.iss b/scilab/modules/console/console.iss
index 40997dc..deda4ec 100644
--- a/scilab/modules/console/console.iss
+++ b/scilab/modules/console/console.iss
@@ -19,39 +19,39 @@
19; 19;
20#define CONSOLE "console" 20#define CONSOLE "console"
21; 21;
22Source: bin\sci{#CONSOLE}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 22Source: bin\sci{#CONSOLE}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
23; 23;
24Source: modules\{#CONSOLE}\jar\org.scilab.modules.{#CONSOLE}.jar;DestDir: {app}\modules\{#CONSOLE}\jar; Components: {#COMPN_SCILAB} 24Source: modules\{#CONSOLE}\jar\org.scilab.modules.{#CONSOLE}.jar;DestDir: {app}\modules\{#CONSOLE}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
25Source: thirdparty\jrosetta-engine.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 25Source: thirdparty\jrosetta-engine.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
26Source: thirdparty\jrosetta-API.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 26Source: thirdparty\jrosetta-API.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
27Source: modules\{#CONSOLE}\etc\configuration.xml; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB}; 27Source: modules\{#CONSOLE}\etc\configuration.xml; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
28; 28;
29;Source: bin\no{#CONSOLE}.dll; DestDir: {app}\bin; DestName: sci{#CONSOLE}.dll; Components: not ({#COMPN_CONSOLE}) 29Source: bin\no{#CONSOLE}.dll; DestDir: {app}\bin; DestName: sci{#CONSOLE}.dll; Components: not ({#COMPN_JVM_MODULE})
30; 30;
31Source: modules\{#CONSOLE}\changelog.txt; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB}; 31Source: modules\{#CONSOLE}\changelog.txt; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
32Source: modules\{#CONSOLE}\license.txt; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB} 32Source: modules\{#CONSOLE}\license.txt; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
33Source: modules\{#CONSOLE}\readme.txt; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB} 33Source: modules\{#CONSOLE}\readme.txt; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
34Source: modules\{#CONSOLE}\version.xml; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB} 34Source: modules\{#CONSOLE}\version.xml; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
35; 35;
36;Source: modules\{#CONSOLE}\sci_gateway\{#CONSOLE}_gateway.xml; DestDir: {app}\modules\{#CONSOLE}\sci_gateway; Components: {#COMPN_SCILAB} 36;Source: modules\{#CONSOLE}\sci_gateway\{#CONSOLE}_gateway.xml; DestDir: {app}\modules\{#CONSOLE}\sci_gateway; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
37; 37;
38;Source: modules\{#CONSOLE}\includes\*.h; DestDir: {app}\modules\{#CONSOLE}\includes; Components: {#COMPN_SCILAB} 38;Source: modules\{#CONSOLE}\includes\*.h; DestDir: {app}\modules\{#CONSOLE}\includes; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
39; 39;
40Source: modules\{#CONSOLE}\etc\{#CONSOLE}.quit; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB} 40Source: modules\{#CONSOLE}\etc\{#CONSOLE}.quit; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
41Source: modules\{#CONSOLE}\etc\{#CONSOLE}.start; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB} 41Source: modules\{#CONSOLE}\etc\{#CONSOLE}.start; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
42; 42;
43Source: modules\{#CONSOLE}\etc\configuration.xml; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB} 43Source: modules\{#CONSOLE}\etc\configuration.xml; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
44; 44;
45Source: modules\{#CONSOLE}\macros\buildmacros.sce; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} 45Source: modules\{#CONSOLE}\macros\buildmacros.sce; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
46Source: modules\{#CONSOLE}\macros\buildmacros.bat; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} 46Source: modules\{#CONSOLE}\macros\buildmacros.bat; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
47Source: modules\{#CONSOLE}\macros\cleanmacros.bat; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} 47Source: modules\{#CONSOLE}\macros\cleanmacros.bat; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
48;Source: modules\{#CONSOLE}\macros\*.bin; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} 48;Source: modules\{#CONSOLE}\macros\*.bin; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
49;Source: modules\{#CONSOLE}\macros\*.sci; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} 49;Source: modules\{#CONSOLE}\macros\*.sci; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
50;Source: modules\{#CONSOLE}\macros\lib; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} 50;Source: modules\{#CONSOLE}\macros\lib; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
51;Source: modules\{#CONSOLE}\macros\names; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} 51;Source: modules\{#CONSOLE}\macros\names; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
52; 52;
53;Source: modules\{#CONSOLE}\demos\*.*; DestDir: {app}\modules\{#CONSOLE}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 53;Source: modules\{#CONSOLE}\demos\*.*; DestDir: {app}\modules\{#CONSOLE}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
54; 54;
55;Source: modules\{#CONSOLE}\tests\*.*; DestDir: {app}\modules\{#CONSOLE}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} 55Source: modules\{#CONSOLE}\tests\*.*; DestDir: {app}\modules\{#CONSOLE}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
56; 56;
57;-------------------------------------------------------------------------------------------------------------- 57;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/modules/console/src/noconsole/noconsole.c b/scilab/modules/console/src/noconsole/noconsole.c
index f5e7cd9..719a1526 100644
--- a/scilab/modules/console/src/noconsole/noconsole.c
+++ b/scilab/modules/console/src/noconsole/noconsole.c
@@ -22,26 +22,27 @@
22#include "PromptToHome.h" 22#include "PromptToHome.h"
23#include "MALLOC.h" 23#include "MALLOC.h"
24#include "GetCharWithoutOutput.h" 24#include "GetCharWithoutOutput.h"
25#include "ConsoleIsWaitingForInput.h"
25/*--------------------------------------------------------------------------*/ 26/*--------------------------------------------------------------------------*/
26char *ConsoleRead(void) 27char *ConsoleRead(void)
27{ 28{
28 return NULL; 29 return NULL;
29} 30}
30/*--------------------------------------------------------------------------*/ 31/*--------------------------------------------------------------------------*/
31int ConsolePrintf(char *line) 32int ConsolePrintf(char *line)
32{ 33{
33 int len = 0; 34 int len = 0;
34 return len; 35 return len;
35} 36}
36/*--------------------------------------------------------------------------*/ 37/*--------------------------------------------------------------------------*/
37BOOL ClearConsolePart(int nbLines) 38BOOL ClearConsolePart(int nbLines)
38{ 39{
39 return FALSE; 40 return FALSE;
40} 41}
41/*--------------------------------------------------------------------------*/ 42/*--------------------------------------------------------------------------*/
42BOOL ClearConsole(void) 43BOOL ClearConsole(void)
43{ 44{
44 return FALSE; 45 return FALSE;
45} 46}
46/*--------------------------------------------------------------------------*/ 47/*--------------------------------------------------------------------------*/
47int GetCharWithoutOutput() 48int GetCharWithoutOutput()
@@ -51,21 +52,21 @@ int GetCharWithoutOutput()
51/*--------------------------------------------------------------------------*/ 52/*--------------------------------------------------------------------------*/
52BOOL PromptToHome(void) 53BOOL PromptToHome(void)
53{ 54{
54 return FALSE; 55 return FALSE;
55} 56}
56/*--------------------------------------------------------------------------*/ 57/*--------------------------------------------------------------------------*/
57BOOL SetConsolePrompt(char *Sci_prompt) 58BOOL SetConsolePrompt(char *Sci_prompt)
58{ 59{
59 return FALSE; 60 return FALSE;
60} 61}
61/*--------------------------------------------------------------------------*/ 62/*--------------------------------------------------------------------------*/
62BOOL InitializeConsole(void) 63BOOL InitializeConsole(void)
63{ 64{
64 return FALSE; 65 return FALSE;
65} 66}
66/*--------------------------------------------------------------------------*/ 67/*--------------------------------------------------------------------------*/
67BOOL ConsoleIsWaitingForInput(void) 68BOOL ConsoleIsWaitingForInput(void)
68{ 69{
69 return FALSE; 70 return FALSE;
70} 71}
71/*--------------------------------------------------------------------------*/ 72/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/graph/graph.iss b/scilab/modules/graph/graph.iss
index 599cb67..ab2d86b 100644
--- a/scilab/modules/graph/graph.iss
+++ b/scilab/modules/graph/graph.iss
@@ -17,23 +17,23 @@
17; 17;
18#define GRAPH "graph" 18#define GRAPH "graph"
19; 19;
20Source: thirdparty\jgraphx.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 20Source: thirdparty\jgraphx.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
21; 21;
22Source: modules\{#GRAPH}\jar\org.scilab.modules.{#GRAPH}.jar;DestDir: {app}\modules\{#GRAPH}\jar; Components: {#COMPN_SCILAB} 22Source: modules\{#GRAPH}\jar\org.scilab.modules.{#GRAPH}.jar;DestDir: {app}\modules\{#GRAPH}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
23; 23;
24Source: modules\{#GRAPH}\VERSION.xml; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB} 24Source: modules\{#GRAPH}\VERSION.xml; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
25Source: modules\{#GRAPH}\readme.txt; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB} 25Source: modules\{#GRAPH}\readme.txt; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
26Source: modules\{#GRAPH}\license.txt; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB} 26Source: modules\{#GRAPH}\license.txt; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
27Source: modules\{#GRAPH}\changelog.txt; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB} 27Source: modules\{#GRAPH}\changelog.txt; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
28; 28;
29Source: modules\{#GRAPH}\etc\{#GRAPH}.quit; DestDir: {app}\modules\{#GRAPH}\etc; Components: {#COMPN_SCILAB} 29Source: modules\{#GRAPH}\etc\{#GRAPH}.quit; DestDir: {app}\modules\{#GRAPH}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
30Source: modules\{#GRAPH}\etc\{#GRAPH}.start; DestDir: {app}\modules\{#GRAPH}\etc; Components: {#COMPN_SCILAB} 30Source: modules\{#GRAPH}\etc\{#GRAPH}.start; DestDir: {app}\modules\{#GRAPH}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
31; 31;
32Source: modules\{#GRAPH}\macros\buildmacros.sce; DestDir: {app}\modules\{#GRAPH}\macros; Components: {#COMPN_SCILAB} 32Source: modules\{#GRAPH}\macros\buildmacros.sce; DestDir: {app}\modules\{#GRAPH}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
33Source: modules\{#GRAPH}\macros\buildmacros.bat; DestDir: {app}\modules\{#GRAPH}\macros; Components: {#COMPN_SCILAB} 33Source: modules\{#GRAPH}\macros\buildmacros.bat; DestDir: {app}\modules\{#GRAPH}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
34Source: modules\{#GRAPH}\macros\cleanmacros.bat; DestDir: {app}\modules\{#GRAPH}\macros; Components: {#COMPN_SCILAB} 34Source: modules\{#GRAPH}\macros\cleanmacros.bat; DestDir: {app}\modules\{#GRAPH}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
35; 35;
36;Source: modules\{#GRAPH}\tests\*.*; DestDir: {app}\modules\{#GRAPH}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} 36;Source: modules\{#GRAPH}\tests\*.*; DestDir: {app}\modules\{#GRAPH}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
37; 37;
38; 38;
39;-------------------------------------------------------------------------------------------------------------- 39;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/modules/gui/gui.iss b/scilab/modules/gui/gui.iss
index d5e4d6b..22eee11 100644
--- a/scilab/modules/gui/gui.iss
+++ b/scilab/modules/gui/gui.iss
@@ -18,40 +18,42 @@
18; 18;
19#define GUI "gui" 19#define GUI "gui"
20; 20;
21Source: bin\sci{#GUI}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 21Source: bin\sci{#GUI}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
22Source: bin\no{#GUI}.dll; DestDir: {app}\bin; DestName: sci{#GUI}.dll; Components: not( {#COMPN_JVM_MODULE} )
22; 23;
23Source: modules\{#GUI}\jar\org.scilab.modules.{#GUI}.jar; DestDir: {app}\modules\{#GUI}\jar; Components: {#COMPN_SCILAB} 24
25Source: modules\{#GUI}\jar\org.scilab.modules.{#GUI}.jar; DestDir: {app}\modules\{#GUI}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
24; 26;
25Source: thirdparty\flexdock-0.5.1.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 27Source: thirdparty\flexdock-0.5.1.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
26Source: thirdparty\commons-logging-1.1.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 28Source: thirdparty\commons-logging-1.1.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
27Source: thirdparty\looks-2.1.1.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 29Source: thirdparty\looks-2.1.1.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
28Source: thirdparty\skinlf.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 30Source: thirdparty\skinlf.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
29; 31;
30Source: modules\{#GUI}\VERSION.xml; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB} 32Source: modules\{#GUI}\VERSION.xml; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
31Source: modules\{#GUI}\readme.txt; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB} 33Source: modules\{#GUI}\readme.txt; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
32Source: modules\{#GUI}\license.txt; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB} 34Source: modules\{#GUI}\license.txt; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
33Source: modules\{#GUI}\changelog.txt; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB} 35Source: modules\{#GUI}\changelog.txt; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
34; 36;
35Source: modules\{#GUI}\sci_gateway\{#GUI}_gateway.xml; DestDir: {app}\modules\{#GUI}\sci_gateway; Components: {#COMPN_SCILAB} 37Source: modules\{#GUI}\sci_gateway\{#GUI}_gateway.xml; DestDir: {app}\modules\{#GUI}\sci_gateway; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
36; 38;
37Source: modules\{#GUI}\etc\{#GUI}.quit; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB} 39Source: modules\{#GUI}\etc\{#GUI}.quit; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
38Source: modules\{#GUI}\etc\{#GUI}.start; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB} 40Source: modules\{#GUI}\etc\{#GUI}.start; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
39; 41;
40Source: modules\{#GUI}\etc\*.xml; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB} 42Source: modules\{#GUI}\etc\*.xml; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
41Source: modules\{#GUI}\images\icons\*.png; DestDir: {app}\modules\{#GUI}\images\icons; Components: {#COMPN_SCILAB} 43Source: modules\{#GUI}\images\icons\*.png; DestDir: {app}\modules\{#GUI}\images\icons; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
42; 44;
43;Source: modules\{#GUI}\includes\*.h; DestDir: {app}\modules\{#GUI}\includes; Components: {#COMPN_SCILAB} 45;Source: modules\{#GUI}\includes\*.h; DestDir: {app}\modules\{#GUI}\includes; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
44; 46;
45Source: modules\{#GUI}\macros\lib; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 47Source: modules\{#GUI}\macros\lib; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
46Source: modules\{#GUI}\macros\names; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 48Source: modules\{#GUI}\macros\names; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
47Source: modules\{#GUI}\macros\*.bin; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 49Source: modules\{#GUI}\macros\*.bin; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
48Source: modules\{#GUI}\macros\*.sci; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 50Source: modules\{#GUI}\macros\*.sci; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
49Source: modules\{#GUI}\macros\buildmacros.sce; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 51Source: modules\{#GUI}\macros\buildmacros.sce; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
50Source: modules\{#GUI}\macros\buildmacros.bat; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 52Source: modules\{#GUI}\macros\buildmacros.bat; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
51Source: modules\{#GUI}\macros\cleanmacros.bat; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 53Source: modules\{#GUI}\macros\cleanmacros.bat; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
52; 54;
53Source: modules\{#GUI}\demos\*.*; DestDir: {app}\modules\{#GUI}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 55Source: modules\{#GUI}\demos\*.*; DestDir: {app}\modules\{#GUI}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
54; 56;
55Source: modules\{#GUI}\tests\*.*; DestDir: {app}\modules\{#GUI}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} 57Source: modules\{#GUI}\tests\*.*; DestDir: {app}\modules\{#GUI}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
56; 58;
57;-------------------------------------------------------------------------------------------------------------- 59;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/modules/gui/src/nogui/nogui.c b/scilab/modules/gui/src/nogui/nogui.c
index 218e657..5e0e767 100644
--- a/scilab/modules/gui/src/nogui/nogui.c
+++ b/scilab/modules/gui/src/nogui/nogui.c
@@ -2,6 +2,7 @@
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2006 - INRIA - Allan CORNET 3 * Copyright (C) 2006 - INRIA - Allan CORNET
4 * Copyright (C) 2007 - INRIA - Sylvestre LEDRU 4 * Copyright (C) 2007 - INRIA - Sylvestre LEDRU
5 * Copyright (C) 2010 - DIGITEO - Sylvestre LEDRU
5 * 6 *
6 * This file must be used under the terms of the CeCILL. 7 * This file must be used under the terms of the CeCILL.
7 * This source file is licensed as described in the file COPYING, which 8 * This source file is licensed as described in the file COPYING, which
@@ -11,30 +12,54 @@
11 * 12 *
12 */ 13 */
13 14
15#ifndef _MSC_VER
14#include <errno.h> 16#include <errno.h>
15#include <stdio.h> /* fileno */ 17#include <stdio.h> /* fileno */
16#include <sys/select.h> /* fd_set */ 18#include <sys/select.h> /* fd_set */
17#include "Scierror.h" 19#include "core_math.h" /* Max */
18#include "sciprint.h" 20#include "sciprint.h"
21#endif
19#include "nogui.h" 22#include "nogui.h"
23#include "Scierror.h"
20#include "localization.h" 24#include "localization.h"
21#include "core_math.h" /* Max */ 25/*--------------------------------------------------------------------------*/
26BOOL InitializeGUI(void)
27{
28 return TRUE;
29}
22/*--------------------------------------------------------------------------*/ 30/*--------------------------------------------------------------------------*/
23int gw_gui() 31int gw_gui()
24{ 32{
25 Scierror(999,_("Scilab '%s' module not installed.\n"), "GUI"); 33 Scierror(999,_("Scilab '%s' module not installed.\n"), "GUI");
26 return 0; 34 return 0;
27} 35}
28/*--------------------------------------------------------------------------*/ 36/*--------------------------------------------------------------------------*/
29BOOL TerminateGUI(void) 37BOOL TerminateGUI(void)
30{ 38{
31 return TRUE; 39 return TRUE;
40}
41/*--------------------------------------------------------------------------*/
42#ifdef _MSC_VER
43void setVisibleMainWindow(BOOL newVisibleState) {}
44/*--------------------------------------------------------------------------*/
45BOOL isVisibleMainWindow(void)
46{
47 return TRUE;
32} 48}
33/*--------------------------------------------------------------------------*/ 49/*--------------------------------------------------------------------------*/
50void deiconifyMainWindow(void) {}
51/*--------------------------------------------------------------------------*/
52void iconifyMainWindow(void) {}
53/*--------------------------------------------------------------------------*/
54void maximizeMainWindow(void) {}
55/*--------------------------------------------------------------------------*/
56void normalMainWindow(void) {}
57/*--------------------------------------------------------------------------*/
58#else
34int XClearScreenConsole(char *fname) 59int XClearScreenConsole(char *fname)
35{ 60{
36 sciprint(_("%s: Only available under 'STANDARD' mode.\n"), fname); 61 sciprint(_("%s: Only available under 'STANDARD' mode.\n"), fname);
37 return 0; 62 return 0;
38} 63}
39/*--------------------------------------------------------------------------*/ 64/*--------------------------------------------------------------------------*/
40void str_to_xterm ( register char * string, int nbytes){ 65void str_to_xterm ( register char * string, int nbytes){
@@ -46,7 +71,7 @@ void Click_menu(int n){
46} 71}
47/*--------------------------------------------------------------------------*/ 72/*--------------------------------------------------------------------------*/
48int GetScreenProperty(char *prop, char *value){ 73int GetScreenProperty(char *prop, char *value){
49 return 0; 74 return 0;
50} 75}
51/*--------------------------------------------------------------------------*/ 76/*--------------------------------------------------------------------------*/
52#define LF 0x000a 77#define LF 0x000a
@@ -54,85 +79,82 @@ int GetScreenProperty(char *prop, char *value){
54with some stuff removed (TCL/TK and a few other things) 79with some stuff removed (TCL/TK and a few other things)
55*/ 80*/
56int Xorgetchar(int interrupt){ 81int Xorgetchar(int interrupt){
57 int i; 82 int i;
58 int inter_max_plus1 = 0; 83 int inter_max_plus1 = 0;
59 static fd_set Select_mask_ref; 84 static fd_set Select_mask_ref;
60 static fd_set select_mask; 85 static fd_set select_mask;
61 static fd_set Write_mask_ref; 86 static fd_set Write_mask_ref;
62 static fd_set write_mask; 87 static fd_set write_mask;
63 static struct timeval select_timeout; 88 static struct timeval select_timeout;
64 static int fd_in=0,fd_out=0,fd_err=0 ; 89 static int fd_in=0,fd_out=0,fd_err=0 ;
65 static int state = 0; 90 static int state = 0;
66 fd_in = fileno(stdin) ; 91 fd_in = fileno(stdin) ;
67 fd_out = fileno(stdout); 92 fd_out = fileno(stdout);
68 fd_err = fileno(stderr); 93 fd_err = fileno(stderr);
69 94
70 FD_ZERO(&Select_mask_ref); 95 FD_ZERO(&Select_mask_ref);
71 FD_SET(fd_in , &Select_mask_ref); 96 FD_SET(fd_in , &Select_mask_ref);
72 FD_ZERO(&Write_mask_ref); 97 FD_ZERO(&Write_mask_ref);
73 98
74 inter_max_plus1 = fd_in; 99 inter_max_plus1 = fd_in;
75 100
76 inter_max_plus1 = Max(fd_out,inter_max_plus1); 101 inter_max_plus1 = Max(fd_out,inter_max_plus1);
77 inter_max_plus1 = Max(fd_err,inter_max_plus1); 102 inter_max_plus1 = Max(fd_err,inter_max_plus1);
78 inter_max_plus1++; 103 inter_max_plus1++;
79 104
80 for( ; ; ) { 105 for( ; ; ) {
81 fflush(stdout); 106 fflush(stdout);
82 fflush(stderr); 107 fflush(stderr);
83 108
84 /* Initialize masks */ 109 /* Initialize masks */
85 select_mask = Select_mask_ref; 110 select_mask = Select_mask_ref;
86 write_mask = Write_mask_ref; 111 write_mask = Write_mask_ref;
87 112
88 select_timeout.tv_sec = 0; 113 select_timeout.tv_sec = 0;
89 select_timeout.tv_usec = 10; 114 select_timeout.tv_usec = 10;
90 i = select(inter_max_plus1, &select_mask, &write_mask, (fd_set *)NULL, &select_timeout); 115 i = select(inter_max_plus1, &select_mask, &write_mask, (fd_set *)NULL, &select_timeout);
91 if (i < 0) { 116 if (i < 0) {
92 if (errno != EINTR) /* EINTR A signal was caught. */ 117 if (errno != EINTR) /* EINTR A signal was caught. */
93 { 118 {
94 sciprint(_("Error. A signal has been caught.\n")); 119 sciprint(_("Error. A signal has been caught.\n"));
95 exit(0); 120 exit(0);
96 continue; 121 continue;
97 } 122 }
98 } 123 }
99 124
100 /* if there's something to output */ 125 /* if there's something to output */
101 if ( FD_ISSET(fd_out,&write_mask)) { 126 if ( FD_ISSET(fd_out,&write_mask)) {
102 fflush(stdout); 127 fflush(stdout);
103 } 128 }
104 if ( FD_ISSET(fd_err,&write_mask)) { 129 if ( FD_ISSET(fd_err,&write_mask)) {
105 fflush(stderr); 130 fflush(stderr);
106 } 131 }
107 132
108 /* if there's something to read */ 133 /* if there's something to read */
109 if (FD_ISSET(fd_in,&select_mask)) 134 if (FD_ISSET(fd_in,&select_mask))
110 state=1; 135 state=1;
111 136
112 if (state) { 137 if (state) {
113 i=getchar(); 138 i=getchar();
114 if (i==LF) state=0; 139 if (i==LF) state=0;
115 return(i); 140 return(i);
116 } 141 }
117 142
118 if (interrupt&&(ismenu()==1)) return(-1); 143 if (interrupt&&(ismenu()==1)) return(-1);
119 144
120 } 145 }
121} 146}
122/*--------------------------------------------------------------------------*/ 147/*--------------------------------------------------------------------------*/
123int XEvorgetchar(int interrupt){ 148int XEvorgetchar(int interrupt){
124 return 0; 149 return 0;
125} 150}
126/*--------------------------------------------------------------------------*/ 151/*--------------------------------------------------------------------------*/
127void main_sci (char *startup, int lstartup,int memory){ 152void main_sci (char *startup, int lstartup,int memory){
128 Scierror(999,_("Scilab '%s' module not installed.\n"), "GUI"); 153 Scierror(999,_("Scilab '%s' module not installed.\n"), "GUI");
129} 154}
130/*--------------------------------------------------------------------------*/ 155/*--------------------------------------------------------------------------*/
131void InitXsession(void){ 156void InitXsession(void){
132 Scierror(999,_("Scilab '%s' module not installed.\n"), "GUI"); 157 Scierror(999,_("Scilab '%s' module not installed.\n"), "GUI");
133} 158}
134/*--------------------------------------------------------------------------*/ 159/*--------------------------------------------------------------------------*/
135BOOL InitializeGUI(void) 160#endif /* not _MSC_VER */
136{
137 return TRUE;
138}
diff --git a/scilab/modules/gui/src/nogui/nogui.h b/scilab/modules/gui/src/nogui/nogui.h
index 0af1834..9e7f368 100644
--- a/scilab/modules/gui/src/nogui/nogui.h
+++ b/scilab/modules/gui/src/nogui/nogui.h
@@ -1,6 +1,7 @@
1/* 1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2007 - INRIA - Sylvestre Ledru 3 * Copyright (C) 2007 - INRIA - Sylvestre Ledru
4 * Copyright (C) 2010 - DIGITEO - Allan CORNET
4 * 5 *
5 * This file must be used under the terms of the CeCILL. 6 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which 7 * This source file is licensed as described in the file COPYING, which
@@ -10,85 +11,136 @@
10 * 11 *
11 */ 12 */
12 13
14#ifndef __NOGUI_H__
15#define __NOGUI_H__
16
17#ifdef _MSC_VER
18#include "dynlib_gui.h"
19#include "BOOL.h"
20
21GUI_IMPEXP BOOL InitializeGUI(void);
22
23GUI_IMPEXP int gw_gui(void);
24
25GUI_IMPEXP BOOL TerminateGUI(void);
26
13/** 27/**
14 * This function is a wrapper / fake when Scilab is compiled without thegraphic 28* set Main Window visibility
15 * graphic Interface 29* @param[in] new state
16 * 30*/
17 * @return 0 31GUI_IMPEXP void setVisibleMainWindow(BOOL newVisibleState);
18 */ 32
33/**
34* isVisibleMainWindow
35* @return current state
36*/
37GUI_IMPEXP BOOL isVisibleMainWindow(void);
38
39GUI_IMPEXP void deiconifyMainWindow(void);
40
41/**
42* Iconify Main Window
43*/
44GUI_IMPEXP void iconifyMainWindow(void);
45
46/**
47* Maximize Main Window
48*/
49GUI_IMPEXP void maximizeMainWindow(void);
50
51/**
52* Main Window is in the "normal" state.
53*/
54GUI_IMPEXP void normalMainWindow(void);
55
56#else
57
58BOOL InitializeGUI(void);
59
60/**
61* This function is a wrapper / fake when Scilab is compiled without thegraphic
62* graphic Interface
63*
64* @return 0
65*/
19int gw_gui(void); 66int gw_gui(void);
20 67
21/** 68/**
22 * This function is a wrapper when /fake Scilab is compiled without the 69* This function is a wrapper when /fake Scilab is compiled without the
23 * graphic Interface 70* graphic Interface
24 * 71*
25 * @return TRUE 72* @return TRUE
26 */ 73*/
27BOOL TerminateGUI(void); 74BOOL TerminateGUI(void);
28 75
29/** 76/**
30 * This function is a wrapper when /fake Scilab is compiled without the 77* This function is a wrapper when /fake Scilab is compiled without the
31 * graphic Interface 78* graphic Interface
32 * @param fname unused (just reproduce the profile) 79* @param fname unused (just reproduce the profile)
33 * @return 0 80* @return 0
34 */ 81*/
82
35int XClearScreenConsole(char *fname); 83int XClearScreenConsole(char *fname);
36 84
37/** 85/**
38 * This function is a wrapper when /fake Scilab is compiled without the 86* This function is a wrapper when /fake Scilab is compiled without the
39 * graphic Interface 87* graphic Interface
40 * @param string unused (just reproduce the profile) 88* @param string unused (just reproduce the profile)
41 * @param nbytes unused (just reproduce the profile) 89* @param nbytes unused (just reproduce the profile)
42 */ 90*/
43void str_to_xterm ( register char * string, int nbytes); 91void str_to_xterm ( register char * string, int nbytes);
44 92
45 93
46/** 94/**
47 * This function is a wrapper when /fake Scilab is compiled without the 95* This function is a wrapper when /fake Scilab is compiled without the
48 * graphic Interface 96* graphic Interface
49 * @param n unused (just reproduce the profile) 97* @param n unused (just reproduce the profile)
50 */ 98*/
51void Click_menu(int n); 99void Click_menu(int n);
52 100
53 101
54/** 102/**
55 * This function is a wrapper when /fake Scilab is compiled without the 103* This function is a wrapper when /fake Scilab is compiled without the
56 * graphic Interface 104* graphic Interface
57 * @param prop unused (just reproduce the profile) 105* @param prop unused (just reproduce the profile)
58 * @param value unused (just reproduce the profile) 106* @param value unused (just reproduce the profile)
59 * @return 0 107* @return 0
60 */ 108*/
61int GetScreenProperty(char *prop, char *value); 109int GetScreenProperty(char *prop, char *value);
62 110
63 111
64/** 112/**
65 * Read the next character 113* Read the next character
66 * This function is really used here ! 114* This function is really used here !
67 * @param interrupt unused (just reproduce the profile) 115* @param interrupt unused (just reproduce the profile)
68 * @return the result of getchar 116* @return the result of getchar
69 */ 117*/
70int Xorgetchar(int interrupt); 118int Xorgetchar(int interrupt);
71 119
72 120
73/** 121/**
74 * This function is a wrapper when /fake Scilab is compiled without the 122* This function is a wrapper when /fake Scilab is compiled without the
75 * graphic Interface 123* graphic Interface
76 * @param interrupt unused (just reproduce the profile) 124* @param interrupt unused (just reproduce the profile)
77 * @return 0 125* @return 0
78 */ 126*/
79int XEvorgetchar(int interrupt); 127int XEvorgetchar(int interrupt);
80 128
81/** 129/**
82 * This function is a wrapper when /fake Scilab is compiled without the 130* This function is a wrapper when /fake Scilab is compiled without the
83 * graphic Interface 131* graphic Interface
84 * @param startup unused (just reproduce the profile) 132* @param startup unused (just reproduce the profile)
85 * @param lstartup unused (just reproduce the profile) 133* @param lstartup unused (just reproduce the profile)
86 * @param memory unused (just reproduce the profile) 134* @param memory unused (just reproduce the profile)
87 */ 135*/
88void main_sci (char *startup, int lstartup,int memory); 136void main_sci (char *startup, int lstartup,int memory);
89 137
90/** 138/**
91 * This function is a wrapper when /fake Scilab is compiled without the 139* This function is a wrapper when /fake Scilab is compiled without the
92 * graphic Interface 140* graphic Interface
93 */ 141*/
94void InitXsession(void); 142void InitXsession(void);
143
144#endif /* #ifndef _MSC_VER */
145
146#endif /* __NOGUI_H__ */
diff --git a/scilab/modules/gui/src/nogui/nogui.rc b/scilab/modules/gui/src/nogui/nogui.rc
new file mode 100644
index 0000000..12c2f59
--- /dev/null
+++ b/scilab/modules/gui/src/nogui/nogui.rc
@@ -0,0 +1,97 @@
1// Microsoft Visual C++ generated resource script.
2//
3
4
5#define APSTUDIO_READONLY_SYMBOLS
6/////////////////////////////////////////////////////////////////////////////
7//
8// Generated from the TEXTINCLUDE 2 resource.
9//
10//#include "afxres.h"
11#define APSTUDIO_HIDDEN_SYMBOLS
12#include "windows.h"
13/////////////////////////////////////////////////////////////////////////////
14#undef APSTUDIO_READONLY_SYMBOLS
15
16/////////////////////////////////////////////////////////////////////////////
17// French (France) resources
18
19#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
20#ifdef _WIN32
21LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
22#pragma code_page(1252)
23#endif //_WIN32
24
25#ifdef APSTUDIO_INVOKED
26/////////////////////////////////////////////////////////////////////////////
27//
28// TEXTINCLUDE
29//
30
311 TEXTINCLUDE
32BEGIN
33 "resource.h\0"
34END
35
36
373 TEXTINCLUDE
38BEGIN
39 "\r\n"
40 "\0"
41END
42
43#endif // APSTUDIO_INVOKED
44
45
46/////////////////////////////////////////////////////////////////////////////
47//
48// Version
49//
50
51VS_VERSION_INFO VERSIONINFO
52 FILEVERSION 5,3,0,0
53 PRODUCTVERSION 5,3,0,0
54 FILEFLAGSMASK 0x17L
55#ifdef _DEBUG
56 FILEFLAGS 0x1L
57#else
58 FILEFLAGS 0x0L
59#endif
60 FILEOS 0x4L
61 FILETYPE 0x0L
62 FILESUBTYPE 0x0L
63BEGIN
64 BLOCK "StringFileInfo"
65 BEGIN
66 BLOCK "040c04b0"
67 BEGIN
68 VALUE "FileDescription", "nogui module"
69 VALUE "FileVersion", "5, 3, 0, 0"
70 VALUE "InternalName", "nogui module"
71 VALUE "LegalCopyright", "Copyright (C) 2010"
72 VALUE "OriginalFilename", "noscigui.dll"
73 VALUE "ProductName", " nogui"
74 VALUE "ProductVersion", "5, 3, 0, 0"
75 END
76 END
77 BLOCK "VarFileInfo"
78 BEGIN
79 VALUE "Translation", 0x40c, 1200
80 END
81END
82
83#endif // French (France) resources
84/////////////////////////////////////////////////////////////////////////////
85
86
87
88#ifndef APSTUDIO_INVOKED
89/////////////////////////////////////////////////////////////////////////////
90//
91// Generated from the TEXTINCLUDE 3 resource.
92//
93
94
95/////////////////////////////////////////////////////////////////////////////
96#endif // not APSTUDIO_INVOKED
97
diff --git a/scilab/modules/gui/src/nogui/nogui.vcproj b/scilab/modules/gui/src/nogui/nogui.vcproj
new file mode 100644
index 0000000..f9586ff
--- /dev/null
+++ b/scilab/modules/gui/src/nogui/nogui.vcproj
@@ -0,0 +1,399 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="9,00"
5 Name="nogui"
6 ProjectGUID="{58A50B97-FA8D-4700-9E4A-C4993638EB7A}"
7 RootNamespace="nogui"
8 Keyword="Win32Proj"
9 TargetFrameworkVersion="0"
10 >
11 <Platforms>
12 <Platform
13 Name="Win32"
14 />
15 <Platform
16 Name="x64"
17 />
18 </Platforms>
19 <ToolFiles>
20 </ToolFiles>
21 <Configurations>
22 <Configuration
23 Name="Debug|Win32"
24 OutputDirectory="$(SolutionDir)bin\"
25 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
26 ConfigurationType="2"
27 CharacterSet="2"
28 >
29 <Tool
30 Name="VCPreBuildEventTool"
31 />
32 <Tool
33 Name="VCCustomBuildTool"
34 />
35 <Tool
36 Name="VCXMLDataGeneratorTool"
37 />
38 <Tool
39 Name="VCWebServiceProxyGeneratorTool"
40 />
41 <Tool
42 Name="VCMIDLTool"
43 />
44 <Tool
45 Name="VCCLCompilerTool"
46 AdditionalOptions=""
47 Optimization="0"
48 AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
50 MinimalRebuild="true"
51 BasicRuntimeChecks="0"
52 RuntimeLibrary="3"
53 UsePrecompiledHeader="0"
54 WarningLevel="3"
55 DebugInformationFormat="3"
56 />
57 <Tool
58 Name="VCManagedResourceCompilerTool"
59 />
60 <Tool
61 Name="VCResourceCompilerTool"
62 />
63 <Tool
64 Name="VCPreLinkEventTool"
65 Description="Make dependencies"
66 CommandLine=""
67 />
68 <Tool
69 Name="VCLinkerTool"
70 AdditionalDependencies="../../../../bin/libintl.lib"
71 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
72 LinkIncremental="1"
73 ModuleDefinitionFile=""
74 GenerateDebugInformation="true"
75 SubSystem="2"
76 RandomizedBaseAddress="1"
77 DataExecutionPrevention="0"
78 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
79 TargetMachine="1"
80 CLRUnmanagedCodeCheck="true"
81 />
82 <Tool
83 Name="VCALinkTool"
84 />
85 <Tool
86 Name="VCManifestTool"
87 />
88 <Tool
89 Name="VCXDCMakeTool"
90 />
91 <Tool
92 Name="VCBscMakeTool"
93 />
94 <Tool
95 Name="VCFxCopTool"
96 />
97 <Tool
98 Name="VCAppVerifierTool"
99 />
100 <Tool
101 Name="VCPostBuildEventTool"
102 />
103 </Configuration>
104 <Configuration
105 Name="Debug|x64"
106 OutputDirectory="$(SolutionDir)bin\"
107 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
108 ConfigurationType="2"
109 CharacterSet="2"
110 >
111 <Tool
112 Name="VCPreBuildEventTool"
113 />
114 <Tool
115 Name="VCCustomBuildTool"
116 />
117 <Tool
118 Name="VCXMLDataGeneratorTool"
119 />
120 <Tool
121 Name="VCWebServiceProxyGeneratorTool"
122 />
123 <Tool
124 Name="VCMIDLTool"
125 TargetEnvironment="3"
126 />
127 <Tool
128 Name="VCCLCompilerTool"
129 Optimization="0"
130 AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
131 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
132 MinimalRebuild="true"
133 BasicRuntimeChecks="0"
134 RuntimeLibrary="3"
135 UsePrecompiledHeader="0"
136 WarningLevel="3"
137 DebugInformationFormat="3"
138 />
139 <Tool
140 Name="VCManagedResourceCompilerTool"
141 />
142 <Tool
143 Name="VCResourceCompilerTool"
144 />
145 <Tool
146 Name="VCPreLinkEventTool"
147 Description="Make dependencies"
148 CommandLine=""
149 />
150 <Tool
151 Name="VCLinkerTool"
152 AdditionalDependencies="../../../../bin/libintl.lib"
153 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
154 LinkIncremental="1"
155 ModuleDefinitionFile=""
156 GenerateDebugInformation="true"
157 SubSystem="2"
158 RandomizedBaseAddress="1"
159 DataExecutionPrevention="0"
160 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
161 TargetMachine="17"
162 CLRUnmanagedCodeCheck="true"
163 />
164 <Tool
165 Name="VCALinkTool"
166 />
167 <Tool
168 Name="VCManifestTool"
169 />
170 <Tool
171 Name="VCXDCMakeTool"
172 />
173 <Tool
174 Name="VCBscMakeTool"
175 />
176 <Tool
177 Name="VCFxCopTool"
178 />
179 <Tool
180 Name="VCAppVerifierTool"
181 />
182 <Tool
183 Name="VCPostBuildEventTool"
184 />
185 </Configuration>
186 <Configuration
187 Name="Release|Win32"
188 OutputDirectory="$(SolutionDir)bin\"
189 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
190 ConfigurationType="2"
191 CharacterSet="2"
192 WholeProgramOptimization="0"
193 >
194 <Tool
195 Name="VCPreBuildEventTool"
196 />
197 <Tool
198 Name="VCCustomBuildTool"
199 />
200 <Tool
201 Name="VCXMLDataGeneratorTool"
202 />
203 <Tool
204 Name="VCWebServiceProxyGeneratorTool"
205 />
206 <Tool
207 Name="VCMIDLTool"
208 />
209 <Tool
210 Name="VCCLCompilerTool"
211 AdditionalOptions=""
212 InlineFunctionExpansion="1"
213 FavorSizeOrSpeed="1"
214 WholeProgramOptimization="false"
215 AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
216 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
217 StringPooling="true"
218 RuntimeLibrary="2"
219 EnableEnhancedInstructionSet="0"
220 UsePrecompiledHeader="0"
221 WarningLevel="3"
222 DebugInformationFormat="3"
223 />
224 <Tool
225 Name="VCManagedResourceCompilerTool"
226 />
227 <Tool
228 Name="VCResourceCompilerTool"
229 />
230 <Tool
231 Name="VCPreLinkEventTool"
232 Description="Make dependencies"
233 CommandLine=""
234 />
235 <Tool
236 Name="VCLinkerTool"
237 AdditionalDependencies="../../../../bin/libintl.lib"
238 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
239 LinkIncremental="1"
240 ModuleDefinitionFile=""
241 GenerateDebugInformation="false"
242 SubSystem="2"
243 OptimizeReferences="2"
244 EnableCOMDATFolding="2"
245 LinkTimeCodeGeneration="0"
246 RandomizedBaseAddress="1"
247 DataExecutionPrevention="0"
248 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
249 TargetMachine="1"
250 CLRUnmanagedCodeCheck="true"
251 />
252 <Tool
253 Name="VCALinkTool"
254 />
255 <Tool
256 Name="VCManifestTool"
257 />
258 <Tool
259 Name="VCXDCMakeTool"
260 />
261 <Tool
262 Name="VCBscMakeTool"
263 />
264 <Tool
265 Name="VCFxCopTool"
266 />
267 <Tool
268 Name="VCAppVerifierTool"
269 />
270 <Tool
271 Name="VCPostBuildEventTool"
272 />
273 </Configuration>
274 <Configuration
275 Name="Release|x64"
276 OutputDirectory="$(SolutionDir)bin\"
277 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
278 ConfigurationType="2"
279 CharacterSet="2"
280 WholeProgramOptimization="0"
281 >
282 <Tool
283 Name="VCPreBuildEventTool"
284 />
285 <Tool
286 Name="VCCustomBuildTool"
287 />
288 <Tool
289 Name="VCXMLDataGeneratorTool"
290 />
291 <Tool
292 Name="VCWebServiceProxyGeneratorTool"
293 />
294 <Tool
295 Name="VCMIDLTool"
296 TargetEnvironment="3"
297 />
298 <Tool
299 Name="VCCLCompilerTool"
300 InlineFunctionExpansion="1"
301 FavorSizeOrSpeed="1"
302 WholeProgramOptimization="false"
303 AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
304 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
305 StringPooling="true"
306 RuntimeLibrary="2"
307 EnableEnhancedInstructionSet="0"
308 UsePrecompiledHeader="0"
309 WarningLevel="3"
310 DebugInformationFormat="3"
311 />
312 <Tool
313 Name="VCManagedResourceCompilerTool"
314 />
315 <Tool
316 Name="VCResourceCompilerTool"
317 />
318 <Tool
319 Name="VCPreLinkEventTool"
320 Description="Make dependencies"
321 CommandLine=""
322 />
323 <Tool
324 Name="VCLinkerTool"
325 AdditionalDependencies="../../../../bin/libintl.lib"
326 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
327 LinkIncremental="1"
328 ModuleDefinitionFile=""
329 GenerateDebugInformation="false"
330 SubSystem="2"
331 OptimizeReferences="2"
332 EnableCOMDATFolding="2"
333 LinkTimeCodeGeneration="0"
334 RandomizedBaseAddress="1"
335 DataExecutionPrevention="0"
336 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
337 TargetMachine="17"
338 CLRUnmanagedCodeCheck="true"
339 />
340 <Tool
341 Name="VCALinkTool"
342 />
343 <Tool
344 Name="VCManifestTool"
345 />
346 <Tool
347 Name="VCXDCMakeTool"
348 />
349 <Tool
350 Name="VCBscMakeTool"
351 />
352 <Tool
353 Name="VCFxCopTool"
354 />
355 <Tool
356 Name="VCAppVerifierTool"
357 />
358 <Tool
359 Name="VCPostBuildEventTool"
360 />
361 </Configuration>
362 </Configurations>
363 <References>
364 </References>
365 <Files>
366 <Filter
367 Name="Source Files"
368 Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
369 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
370 >
371 <File
372 RelativePath=".\nogui.c"
373 >
374 </File>
375 </Filter>
376 <Filter
377 Name="Header Files"
378 Filter="h;hpp;hxx;hm;inl;inc;xsd"
379 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
380 >
381 </Filter>
382 <Filter
383 Name="Resource Files"
384 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
385 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
386 >
387 <File
388 RelativePath=".\nogui.rc"
389 >
390 </File>
391 </Filter>
392 <Filter
393 Name="Libraries Dependencies"
394 >
395 </Filter>
396 </Files>
397 <Globals>
398 </Globals>
399</VisualStudioProject>
diff --git a/scilab/modules/hdf5/hdf5.iss b/scilab/modules/hdf5/hdf5.iss
index 6d8736d..cece572 100644
--- a/scilab/modules/hdf5/hdf5.iss
+++ b/scilab/modules/hdf5/hdf5.iss
@@ -19,7 +19,7 @@
19; 19;
20Source: bin\{#HDF5}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 20Source: bin\{#HDF5}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
21; 21;
22Source: modules\{#HDF5}\jar\org.scilab.modules.{#HDF5}.jar;DestDir: {app}\modules\{#HDF5}\jar; Components: {#COMPN_SCILAB} 22Source: modules\{#HDF5}\jar\org.scilab.modules.{#HDF5}.jar;DestDir: {app}\modules\{#HDF5}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
23; 23;
24;Source: bin\nohdf5.dll; DestDir: {app}\bin; DestName: scihdf5.dll; Components: not ({#COMPN_SCILAB}) 24;Source: bin\nohdf5.dll; DestDir: {app}\bin; DestName: scihdf5.dll; Components: not ({#COMPN_SCILAB})
25; 25;
@@ -35,7 +35,7 @@ Source: modules\{#HDF5}\sci_gateway\{#HDF5}_gateway.xml; DestDir: {app}\modules\
35Source: modules\{#HDF5}\etc\{#HDF5}.quit; DestDir: {app}\modules\{#HDF5}\etc; Components: {#COMPN_SCILAB} 35Source: modules\{#HDF5}\etc\{#HDF5}.quit; DestDir: {app}\modules\{#HDF5}\etc; Components: {#COMPN_SCILAB}
36Source: modules\{#HDF5}\etc\{#HDF5}.start; DestDir: {app}\modules\{#HDF5}\etc; Components: {#COMPN_SCILAB} 36Source: modules\{#HDF5}\etc\{#HDF5}.start; DestDir: {app}\modules\{#HDF5}\etc; Components: {#COMPN_SCILAB}
37; 37;
38Source: thirdparty\j{#HDF5}.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 38Source: thirdparty\j{#HDF5}.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
39; 39;
40;Source: modules\{#HDF5}\macros\buildmacros.sce; DestDir: {app}\modules\{#HDF5}\macros; Components: {#COMPN_SCILAB} 40;Source: modules\{#HDF5}\macros\buildmacros.sce; DestDir: {app}\modules\{#HDF5}\macros; Components: {#COMPN_SCILAB}
41;Source: modules\{#HDF5}\macros\buildmacros.bat; DestDir: {app}\modules\{#HDF5}\macros; Components: {#COMPN_SCILAB} 41;Source: modules\{#HDF5}\macros\buildmacros.bat; DestDir: {app}\modules\{#HDF5}\macros; Components: {#COMPN_SCILAB}
diff --git a/scilab/modules/helptools/helptools.iss b/scilab/modules/helptools/helptools.iss
index 01b28c2..175f0d3 100644
--- a/scilab/modules/helptools/helptools.iss
+++ b/scilab/modules/helptools/helptools.iss
@@ -18,76 +18,76 @@
18; 18;
19#define HELPTOOLS "helptools" 19#define HELPTOOLS "helptools"
20 20
21Source: bin\{#HELPTOOLS}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 21Source: bin\{#HELPTOOLS}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
22Source: modules\{#HELPTOOLS}\jar\*.jar; DestDir: {app}\modules\{#HELPTOOLS}\jar; Components: {#COMPN_SCILAB} 22Source: modules\{#HELPTOOLS}\jar\*.jar; DestDir: {app}\modules\{#HELPTOOLS}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
23 23
24#ifdef WITH_CHM 24#ifdef WITH_CHM
25Source: modules\{#HELPTOOLS}\chm\*.chm; DestDir: {app}\modules\{#HELPTOOLS}\chm; Components: {#COMPN_SCILAB} 25Source: modules\{#HELPTOOLS}\chm\*.chm; DestDir: {app}\modules\{#HELPTOOLS}\chm; Components: {#COMPN_SCILAB}
26#endif 26#endif
27 27
28Source: modules\{#HELPTOOLS}\sci_gateway\{#HELPTOOLS}_gateway.xml; DestDir: {app}\modules\{#HELPTOOLS}\sci_gateway; Components: {#COMPN_SCILAB} 28Source: modules\{#HELPTOOLS}\sci_gateway\{#HELPTOOLS}_gateway.xml; DestDir: {app}\modules\{#HELPTOOLS}\sci_gateway; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
29; 29;
30Source: thirdparty\docbook\*.*;DestDir: {app}\thirdparty\docbook; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 30Source: thirdparty\docbook\*.*;DestDir: {app}\thirdparty\docbook; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
31; 31;
32Source: thirdparty\jhall.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 32Source: thirdparty\jhall.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
33Source: thirdparty\avalon-framework.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 33Source: thirdparty\avalon-framework.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
34Source: thirdparty\avalon-framework.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 34Source: thirdparty\avalon-framework.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
35Source: thirdparty\avalon-framework.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 35Source: thirdparty\avalon-framework.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
36Source: thirdparty\batik.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 36Source: thirdparty\batik.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
37Source: thirdparty\batik.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 37Source: thirdparty\batik.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
38Source: thirdparty\commons-io.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 38Source: thirdparty\commons-io.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
39Source: thirdparty\commons-io.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 39Source: thirdparty\commons-io.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
40Source: thirdparty\commons-io.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 40Source: thirdparty\commons-io.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
41Source: thirdparty\commons-logging.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 41Source: thirdparty\commons-logging.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
42Source: thirdparty\commons-logging.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 42Source: thirdparty\commons-logging.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
43Source: thirdparty\commons-logging.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 43Source: thirdparty\commons-logging.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
44Source: thirdparty\docbook-xsl-saxon.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 44Source: thirdparty\docbook-xsl-saxon.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
45Source: thirdparty\fop-hyph.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 45Source: thirdparty\fop-hyph.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
46Source: thirdparty\fop-hyph.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 46Source: thirdparty\fop-hyph.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
47Source: thirdparty\fop-hyph.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 47Source: thirdparty\fop-hyph.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
48Source: thirdparty\fop.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 48Source: thirdparty\fop.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
49Source: thirdparty\fop.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 49Source: thirdparty\fop.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
50Source: thirdparty\fop.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 50Source: thirdparty\fop.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
51Source: thirdparty\jeuclid-core.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 51Source: thirdparty\jeuclid-core.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
52Source: thirdparty\jeuclid.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 52Source: thirdparty\jeuclid.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
53Source: thirdparty\jeuclid.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 53Source: thirdparty\jeuclid.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
54Source: thirdparty\saxon.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 54Source: thirdparty\saxon.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
55Source: thirdparty\saxon.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 55Source: thirdparty\saxon.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
56Source: thirdparty\saxon.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 56Source: thirdparty\saxon.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
57Source: thirdparty\xml-apis.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 57Source: thirdparty\xml-apis.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
58Source: thirdparty\xml-apis-ext.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 58Source: thirdparty\xml-apis-ext.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
59Source: thirdparty\xmlgraphics-commons-1.3.1.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 59Source: thirdparty\xmlgraphics-commons-1.3.1.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
60Source: thirdparty\xmlgraphics-commons.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 60Source: thirdparty\xmlgraphics-commons.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
61Source: thirdparty\xmlgraphics-commons.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 61Source: thirdparty\xmlgraphics-commons.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
62Source: thirdparty\xalan.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 62Source: thirdparty\xalan.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
63Source: thirdparty\batik-all-1.7.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 63Source: thirdparty\batik-all-1.7.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
64; 64;
65Source: modules\{#HELPTOOLS}\VERSION.xml; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} 65Source: modules\{#HELPTOOLS}\VERSION.xml; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
66Source: modules\{#HELPTOOLS}\readme.txt; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} 66Source: modules\{#HELPTOOLS}\readme.txt; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
67Source: modules\{#HELPTOOLS}\license.txt; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} 67Source: modules\{#HELPTOOLS}\license.txt; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
68Source: modules\{#HELPTOOLS}\changelog.txt; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} 68Source: modules\{#HELPTOOLS}\changelog.txt; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
69; 69;
70;Source: modules\{#HELPTOOLS}\*.xsl; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} 70;Source: modules\{#HELPTOOLS}\*.xsl; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
71;Source: modules\{#HELPTOOLS}\help.dtd; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} 71;Source: modules\{#HELPTOOLS}\help.dtd; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
72; 72;
73Source: modules\{#HELPTOOLS}\css\*.*; DestDir: {app}\modules\{#HELPTOOLS}\css; Components: {#COMPN_SCILAB} 73Source: modules\{#HELPTOOLS}\css\*.*; DestDir: {app}\modules\{#HELPTOOLS}\css; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
74Source: modules\{#HELPTOOLS}\doc\*.*; DestDir: {app}\modules\{#HELPTOOLS}\doc; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 74Source: modules\{#HELPTOOLS}\doc\*.*; DestDir: {app}\modules\{#HELPTOOLS}\doc; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
75Source: modules\{#HELPTOOLS}\schema\*.*; DestDir: {app}\modules\{#HELPTOOLS}\schema; Components: {#COMPN_SCILAB} 75Source: modules\{#HELPTOOLS}\schema\*.*; DestDir: {app}\modules\{#HELPTOOLS}\schema; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
76Source: modules\{#HELPTOOLS}\xsl\*.*; DestDir: {app}\modules\{#HELPTOOLS}\xsl; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 76Source: modules\{#HELPTOOLS}\xsl\*.*; DestDir: {app}\modules\{#HELPTOOLS}\xsl; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
77; 77;
78Source: modules\{#HELPTOOLS}\etc\{#HELPTOOLS}.quit; DestDir: {app}\modules\{#HELPTOOLS}\etc; Components: {#COMPN_SCILAB} 78Source: modules\{#HELPTOOLS}\etc\{#HELPTOOLS}.quit; DestDir: {app}\modules\{#HELPTOOLS}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
79Source: modules\{#HELPTOOLS}\etc\{#HELPTOOLS}.start; DestDir: {app}\modules\{#HELPTOOLS}\etc; Components: {#COMPN_SCILAB} 79Source: modules\{#HELPTOOLS}\etc\{#HELPTOOLS}.start; DestDir: {app}\modules\{#HELPTOOLS}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
80; 80;
81Source: modules\{#HELPTOOLS}\macros\buildmacros.sce; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} 81Source: modules\{#HELPTOOLS}\macros\buildmacros.sce; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
82Source: modules\{#HELPTOOLS}\macros\buildmacros.bat; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} 82Source: modules\{#HELPTOOLS}\macros\buildmacros.bat; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
83Source: modules\{#HELPTOOLS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} 83Source: modules\{#HELPTOOLS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
84Source: modules\{#HELPTOOLS}\macros\lib; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} 84Source: modules\{#HELPTOOLS}\macros\lib; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
85Source: modules\{#HELPTOOLS}\macros\names; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} 85Source: modules\{#HELPTOOLS}\macros\names; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
86Source: modules\{#HELPTOOLS}\macros\*.bin; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} 86Source: modules\{#HELPTOOLS}\macros\*.bin; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
87Source: modules\{#HELPTOOLS}\macros\*.sci; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} 87Source: modules\{#HELPTOOLS}\macros\*.sci; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
88; 88;
89Source: modules\{#HELPTOOLS}\examples\*.*; DestDir: {app}\modules\{#HELPTOOLS}\examples; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 89Source: modules\{#HELPTOOLS}\examples\*.*; DestDir: {app}\modules\{#HELPTOOLS}\examples; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
90; 90;
91Source: modules\{#HELPTOOLS}\tests\*.*; DestDir: {app}\modules\{#HELPTOOLS}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} 91Source: modules\{#HELPTOOLS}\tests\*.*; DestDir: {app}\modules\{#HELPTOOLS}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
92; 92;
93;-------------------------------------------------------------------------------------------------------------- 93;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/modules/history_browser/history_browser.iss b/scilab/modules/history_browser/history_browser.iss
index 4de6215..e000fc1 100644
--- a/scilab/modules/history_browser/history_browser.iss
+++ b/scilab/modules/history_browser/history_browser.iss
@@ -17,23 +17,24 @@
17; 17;
18#define HISTORY_BROWSER "history_browser" 18#define HISTORY_BROWSER "history_browser"
19; 19;
20Source: bin\{#HISTORY_BROWSER}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 20Source: bin\{#HISTORY_BROWSER}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
21Source: bin\no{#HISTORY_BROWSER}.dll; DestDir: {app}\bin; DestName: {#HISTORY_BROWSER}.dll; Components: not ({#COMPN_JVM_MODULE})
21; 22;
22Source: modules\{#HISTORY_BROWSER}\jar\org.scilab.modules.{#HISTORY_BROWSER}.jar;DestDir: {app}\modules\{#HISTORY_BROWSER}\jar; Components: {#COMPN_SCILAB} 23Source: modules\{#HISTORY_BROWSER}\jar\org.scilab.modules.{#HISTORY_BROWSER}.jar;DestDir: {app}\modules\{#HISTORY_BROWSER}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
23; 24;
24Source: modules\{#HISTORY_BROWSER}\VERSION.xml; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB} 25Source: modules\{#HISTORY_BROWSER}\VERSION.xml; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
25Source: modules\{#HISTORY_BROWSER}\readme.txt; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB} 26Source: modules\{#HISTORY_BROWSER}\readme.txt; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
26Source: modules\{#HISTORY_BROWSER}\license.txt; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB} 27Source: modules\{#HISTORY_BROWSER}\license.txt; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
27Source: modules\{#HISTORY_BROWSER}\changelog.txt; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB} 28Source: modules\{#HISTORY_BROWSER}\changelog.txt; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
28; 29;
29Source: modules\{#HISTORY_BROWSER}\etc\{#HISTORY_BROWSER}.quit; DestDir: {app}\modules\{#HISTORY_BROWSER}\etc; Components: {#COMPN_SCILAB} 30Source: modules\{#HISTORY_BROWSER}\etc\{#HISTORY_BROWSER}.quit; DestDir: {app}\modules\{#HISTORY_BROWSER}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
30Source: modules\{#HISTORY_BROWSER}\etc\{#HISTORY_BROWSER}.start; DestDir: {app}\modules\{#HISTORY_BROWSER}\etc; Components: {#COMPN_SCILAB} 31Source: modules\{#HISTORY_BROWSER}\etc\{#HISTORY_BROWSER}.start; DestDir: {app}\modules\{#HISTORY_BROWSER}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
31; 32;
32Source: modules\{#HISTORY_BROWSER}\macros\buildmacros.sce; DestDir: {app}\modules\{#HISTORY_BROWSER}\macros; Components: {#COMPN_SCILAB} 33Source: modules\{#HISTORY_BROWSER}\macros\buildmacros.sce; DestDir: {app}\modules\{#HISTORY_BROWSER}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
33Source: modules\{#HISTORY_BROWSER}\macros\buildmacros.bat; DestDir: {app}\modules\{#HISTORY_BROWSER}\macros; Components: {#COMPN_SCILAB} 34Source: modules\{#HISTORY_BROWSER}\macros\buildmacros.bat; DestDir: {app}\modules\{#HISTORY_BROWSER}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
34Source: modules\{#HISTORY_BROWSER}\macros\cleanmacros.bat; DestDir: {app}\modules\{#HISTORY_BROWSER}\macros; Components: {#COMPN_SCILAB} 35Source: modules\{#HISTORY_BROWSER}\macros\cleanmacros.bat; DestDir: {app}\modules\{#HISTORY_BROWSER}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
35; 36;
36Source: modules\{#HISTORY_BROWSER}\tests\*.*; DestDir: {app}\modules\{#HISTORY_BROWSER}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} 37Source: modules\{#HISTORY_BROWSER}\tests\*.*; DestDir: {app}\modules\{#HISTORY_BROWSER}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
37; 38;
38; 39;
39;-------------------------------------------------------------------------------------------------------------- 40;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.c b/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.c
deleted file mode 100644
index 28fb4e4..0000000
--- a/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.c
+++ /dev/null
@@ -1,162 +0,0 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2007-2008 - INRIA - Allan CORNET
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 *
11 */
12
13/*--------------------------------------------------------------------------*/
14#include "gw_history_manager.h"
15#include "HistoryManager.h"
16#include "InitializeHistoryManager.h"
17#include "TerminateHistoryManager.h"
18#include "MALLOC.h"
19#include "Scierror.h"
20#include "localization.h"
21/*--------------------------------------------------------------------------*/
22int gw_history_manager(void)
23{
24 Scierror(999,_("Scilab history_manager module not installed.\n"));
25 return 0;
26}
27/*--------------------------------------------------------------------------*/
28BOOL historyIsEnabled(void)
29{
30 return FALSE;
31}
32/*--------------------------------------------------------------------------*/
33BOOL InitializeHistoryManager(void)
34{
35 return TRUE;
36}
37/*--------------------------------------------------------------------------*/
38BOOL TerminateHistoryManager(void)
39{
40 return TRUE;
41}
42/*--------------------------------------------------------------------------*/
43BOOL appendLineToScilabHistory(char *line)
44{
45 return FALSE;
46}
47/*--------------------------------------------------------------------------*/
48BOOL appendLinesToScilabHistory(char **lines,int numberoflines)
49{
50 return FALSE;
51}
52/*--------------------------------------------------------------------------*/
53void displayScilabHistory(void)
54{
55
56}
57/*--------------------------------------------------------------------------*/
58BOOL writeScilabHistoryToFile(char *filename)
59{
60 return FALSE;
61}
62/*--------------------------------------------------------------------------*/
63BOOL loadScilabHistoryFromFile(char *filename)
64{
65 return FALSE;
66}
67/*--------------------------------------------------------------------------*/
68BOOL setFilenameScilabHistory(char *filename)
69{
70 return FALSE;
71}
72/*--------------------------------------------------------------------------*/
73char *getFilenameScilabHistory(void)
74{
75 return NULL;
76}
77/*--------------------------------------------------------------------------*/
78BOOL setDefaultFilenameScilabHistory(void)
79{
80 return FALSE;
81}
82/*--------------------------------------------------------------------------*/
83void resetScilabHistory(void)
84{
85
86}
87/*--------------------------------------------------------------------------*/
88char **getAllLinesOfScilabHistory(void)
89{
90 return FALSE;
91}
92/*--------------------------------------------------------------------------*/
93int getSizeAllLinesOfScilabHistory(void)
94{
95 return 0;
96}
97/*--------------------------------------------------------------------------*/
98BOOL setSearchedTokenInScilabHistory(char *token)
99{
100 return FALSE;
101}
102/*--------------------------------------------------------------------------*/
103BOOL resetSearchedTokenInScilabHistory(void)
104{
105 return FALSE;
106}
107/*--------------------------------------------------------------------------*/
108char *getSearchedTokenInScilabHistory(void)
109{
110 return NULL;
111}
112/*--------------------------------------------------------------------------*/
113char *getPreviousLineInScilabHistory(void)
114{
115 return NULL;
116}
117/*--------------------------------------------------------------------------*/
118char *getNextLineInScilabHistory(void)
119{
120 return NULL;
121}
122/*--------------------------------------------------------------------------*/
123int getNumberOfLinesInScilabHistory(void)
124{
125 return 0;
126}
127/*--------------------------------------------------------------------------*/
128void setSaveConsecutiveDuplicateLinesInScilabHistory(BOOL doit)
129{
130
131}
132/*--------------------------------------------------------------------------*/
133BOOL getSaveConsecutiveDuplicateLinesInScilabHistory(void)
134{
135 return FALSE;
136}
137/*--------------------------------------------------------------------------*/
138void setAfterHowManyLinesScilabHistoryIsSaved(int num)
139{
140
141}
142/*--------------------------------------------------------------------------*/
143int getAfterHowManyLinesScilabHistoryIsSaved(void)
144{
145 return 0;
146}
147/*--------------------------------------------------------------------------*/
148char *getNthLineInScilabHistory(int N)
149{
150 return NULL;
151}
152/*--------------------------------------------------------------------------*/
153BOOL deleteNthLineScilabHistory(int N)
154{
155 return FALSE;
156}
157/*--------------------------------------------------------------------------*/
158int getSizeScilabHistory(void)
159{
160 return 0;
161}
162/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.rc b/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.rc
index 56fe00b..8138122 100644
--- a/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.rc
+++ b/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.rc
@@ -65,12 +65,12 @@ BEGIN
65 BEGIN 65 BEGIN
66 BLOCK "040c04b0" 66 BLOCK "040c04b0"
67 BEGIN 67 BEGIN
68 VALUE "FileDescription", "nohistory_manager module" 68 VALUE "FileDescription", "nohistory_browser module"
69 VALUE "FileVersion", "5, 3, 0, 0" 69 VALUE "FileVersion", "5, 3, 0, 0"
70 VALUE "InternalName", "nohistory_manager module" 70 VALUE "InternalName", "nohistory_browser module"
71 VALUE "LegalCopyright", "Copyright (C) 2010" 71 VALUE "LegalCopyright", "Copyright (C) 2010"
72 VALUE "OriginalFilename", "nohistory_manager.dll" 72 VALUE "OriginalFilename", "nohistory_browser.dll"
73 VALUE "ProductName", " nohistory_manager" 73 VALUE "ProductName", " nohistory_browser"
74 VALUE "ProductVersion", "5, 3, 0, 0" 74 VALUE "ProductVersion", "5, 3, 0, 0"
75 END 75 END
76 END 76 END
diff --git a/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.vcproj b/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.vcproj
index b39dabd..3abbfa2 100644
--- a/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.vcproj
+++ b/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.vcproj
@@ -3,7 +3,7 @@
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
5 Name="nohistory_browser" 5 Name="nohistory_browser"
6 ProjectGUID="{68F65DC6-AF8B-442F-A21A-108E1E501BE6}" 6 ProjectGUID="{6EA99B1F-99B4-4528-8195-7508EF70CFED}"
7 RootNamespace="nohistory_browser" 7 RootNamespace="nohistory_browser"
8 Keyword="Win32Proj" 8 Keyword="Win32Proj"
9 TargetFrameworkVersion="0" 9 TargetFrameworkVersion="0"
@@ -357,7 +357,7 @@
357 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" 357 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
358 > 358 >
359 <File 359 <File
360 RelativePath=".\nohistory_browser.c" 360 RelativePath=".\CommandHistory_Wrap_Fake.c"
361 > 361 >
362 </File> 362 </File>
363 </Filter> 363 </Filter>
diff --git a/scilab/modules/intersci/intersci.iss b/scilab/modules/intersci/intersci.iss
index 3b7559d..77ce495 100644
--- a/scilab/modules/intersci/intersci.iss
+++ b/scilab/modules/intersci/intersci.iss
@@ -18,6 +18,9 @@
18; 18;
19#define INTERSCI "intersci" 19#define INTERSCI "intersci"
20; 20;
21Source: bin\{#INTERSCI}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
22Source: bin\{#INTERSCI}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
23;
21Source: modules\{#INTERSCI}\VERSION.xml; DestDir: {app}\modules\{#INTERSCI}; Components: {#COMPN_INTERSCI} 24Source: modules\{#INTERSCI}\VERSION.xml; DestDir: {app}\modules\{#INTERSCI}; Components: {#COMPN_INTERSCI}
22Source: modules\{#INTERSCI}\readme.txt; DestDir: {app}\modules\{#INTERSCI}; Components: {#COMPN_INTERSCI} 25Source: modules\{#INTERSCI}\readme.txt; DestDir: {app}\modules\{#INTERSCI}; Components: {#COMPN_INTERSCI}
23Source: modules\{#INTERSCI}\license.txt; DestDir: {app}\modules\{#INTERSCI}; Components: {#COMPN_INTERSCI} 26Source: modules\{#INTERSCI}\license.txt; DestDir: {app}\modules\{#INTERSCI}; Components: {#COMPN_INTERSCI}
diff --git a/scilab/modules/jvm/jvm.iss b/scilab/modules/jvm/jvm.iss
index 7e848bd..935f703 100644
--- a/scilab/modules/jvm/jvm.iss
+++ b/scilab/modules/jvm/jvm.iss
@@ -18,43 +18,45 @@
18; 18;
19#DEFINE JVM "jvm" 19#DEFINE JVM "jvm"
20; 20;
21Source: bin\lib{#JVM}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 21Source: bin\lib{#JVM}.lib; DestDir: {app}\bin; Components: {#COMPN_JVM_MODULE}
22Source: bin\lib{#JVM}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
23; 22;
24Source: etc\classpath.xml; DestDir: {app}\etc; Components: {#COMPN_SCILAB} 23Source: bin\lib{#JVM}.dll; DestDir: {app}\bin; Components: {#COMPN_JVM_MODULE}
25Source: etc\librarypath.xml; DestDir: {app}\etc; Components: {#COMPN_SCILAB} 24Source: bin\nolib{#JVM}.dll; DestDir: {app}\bin; DestName: lib{#JVM}.dll; Components: not ({#COMPN_JVM_MODULE})
26Source: etc\{#JVM}_options.xml; DestDir: {app}\etc; Components: {#COMPN_SCILAB}
27; 25;
28Source: modules\{#JVM}\xml\*.dtd; DestDir: {app}\modules\{#JVM}\xml; Components: {#COMPN_SCILAB} 26Source: etc\classpath.xml; DestDir: {app}\etc; Components: {#COMPN_JVM_MODULE}
27Source: etc\librarypath.xml; DestDir: {app}\etc; Components: {#COMPN_JVM_MODULE}
28Source: etc\{#JVM}_options.xml; DestDir: {app}\etc; Components: {#COMPN_JVM_MODULE}
29; 29;
30Source: modules\{#JVM}\jar\org.scilab.modules.{#JVM}.jar;DestDir: {app}\modules\{#JVM}\jar; Components: {#COMPN_SCILAB} 30Source: modules\{#JVM}\xml\*.dtd; DestDir: {app}\modules\{#JVM}\xml; Components: {#COMPN_JVM_MODULE}
31; 31;
32Source: modules\{#JVM}\license.txt; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_SCILAB} 32Source: modules\{#JVM}\jar\org.scilab.modules.{#JVM}.jar;DestDir: {app}\modules\{#JVM}\jar; Components: {#COMPN_JVM_MODULE}
33Source: modules\{#JVM}\readme.txt; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_SCILAB}
34Source: modules\{#JVM}\VERSION.xml; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_SCILAB}
35Source: modules\{#JVM}\changelog.txt; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_SCILAB}
36; 33;
37Source: modules\{#JVM}\sci_gateway\{#JVM}_gateway.xml; DestDir: {app}\modules\{#JVM}\sci_gateway; Components: {#COMPN_SCILAB} 34Source: modules\{#JVM}\license.txt; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_JVM_MODULE}
35Source: modules\{#JVM}\readme.txt; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_JVM_MODULE}
36Source: modules\{#JVM}\VERSION.xml; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_JVM_MODULE}
37Source: modules\{#JVM}\changelog.txt; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_JVM_MODULE}
38; 38;
39;Source: modules\{#JVM}\includes\*.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_SCILAB} 39Source: modules\{#JVM}\sci_gateway\{#JVM}_gateway.xml; DestDir: {app}\modules\{#JVM}\sci_gateway; Components: {#COMPN_JVM_MODULE}
40Source: modules\{#JVM}\includes\getScilabJavaVM.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_SCILAB}
41Source: modules\{#JVM}\includes\getScilabJNIEnv.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_SCILAB}
42Source: modules\{#JVM}\includes\addToClasspath.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_SCILAB}
43Source: modules\{#JVM}\includes\addToLibrarypath.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_SCILAB}
44Source: modules\{#JVM}\includes\getScilabObject.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_SCILAB}
45Source: modules\{#JVM}\includes\dynlib_jvm.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_SCILAB}
46; 40;
47Source: modules\{#JVM}\etc\{#JVM}.quit; DestDir: {app}\modules\{#JVM}\etc; Components: {#COMPN_SCILAB} 41;Source: modules\{#JVM}\includes\*.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_JVM_MODULE}
48Source: modules\{#JVM}\etc\{#JVM}.start; DestDir: {app}\modules\{#JVM}\etc; Components: {#COMPN_SCILAB} 42Source: modules\{#JVM}\includes\getScilabJavaVM.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_JVM_MODULE}
43Source: modules\{#JVM}\includes\getScilabJNIEnv.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_JVM_MODULE}
44Source: modules\{#JVM}\includes\addToClasspath.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_JVM_MODULE}
45Source: modules\{#JVM}\includes\addToLibrarypath.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_JVM_MODULE}
46Source: modules\{#JVM}\includes\getScilabObject.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_JVM_MODULE}
47Source: modules\{#JVM}\includes\dynlib_jvm.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_JVM_MODULE}
49; 48;
50Source: modules\{#JVM}\macros\buildmacros.sce; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_SCILAB} 49Source: modules\{#JVM}\etc\{#JVM}.quit; DestDir: {app}\modules\{#JVM}\etc; Components: {#COMPN_JVM_MODULE}
51Source: modules\{#JVM}\macros\buildmacros.bat; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_SCILAB} 50Source: modules\{#JVM}\etc\{#JVM}.start; DestDir: {app}\modules\{#JVM}\etc; Components: {#COMPN_JVM_MODULE}
52Source: modules\{#JVM}\macros\cleanmacros.bat; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_SCILAB}
53Source: modules\{#JVM}\macros\lib; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_SCILAB}
54Source: modules\{#JVM}\macros\names; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_SCILAB}
55Source: modules\{#JVM}\macros\*.bin; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_SCILAB}
56Source: modules\{#JVM}\macros\*.sci; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_SCILAB}
57; 51;
58Source: modules\{#JVM}\tests\*.*; DestDir: {app}\modules\{#JVM}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} 52Source: modules\{#JVM}\macros\buildmacros.sce; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
53Source: modules\{#JVM}\macros\buildmacros.bat; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
54Source: modules\{#JVM}\macros\cleanmacros.bat; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
55Source: modules\{#JVM}\macros\lib; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
56Source: modules\{#JVM}\macros\names; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
57Source: modules\{#JVM}\macros\*.bin; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
58Source: modules\{#JVM}\macros\*.sci; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
59;
60Source: modules\{#JVM}\tests\*.*; DestDir: {app}\modules\{#JVM}\tests; Flags: recursesubdirs; Components: {#COMPN_JVM_MODULE} and {#COMPN_TESTS}
59; 61;
60;-------------------------------------------------------------------------------------------------------------- 62;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/modules/jvm/src/nojvm/nojvm.c b/scilab/modules/jvm/src/nojvm/nojvm.c
index 871a439..8689173 100644
--- a/scilab/modules/jvm/src/nojvm/nojvm.c
+++ b/scilab/modules/jvm/src/nojvm/nojvm.c
@@ -1,50 +1,69 @@
1/* 1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 2* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) INRIA - Allan CORNET 3* Copyright (C) INRIA - Allan CORNET
4 * 4* Copyright (C) DIGITEO - 2010 - Allan CORNET
5 * This file must be used under the terms of the CeCILL. 5*
6 * This source file is licensed as described in the file COPYING, which 6* This file must be used under the terms of the CeCILL.
7 * you should have received as part of this distribution. The terms 7* This source file is licensed as described in the file COPYING, which
8 * are also available at 8* you should have received as part of this distribution. The terms
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 9* are also available at
10 * 10* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 */ 11*
12*/
12 13
13/*--------------------------------------------------------------------------*/ 14/*--------------------------------------------------------------------------*/
15#ifdef _MSC_VER
16#include <jni.h> /* JavaVM */
17#endif
14#include "Scierror.h" 18#include "Scierror.h"
15#include "with_java.h" 19#include "gw_jvm.h"
20#include "dynlib_jvm.h"
16#include "InitializeJVM.h" 21#include "InitializeJVM.h"
17#include "TerminateJVM.h" 22#include "TerminateJVM.h"
18#include "loadBackGroundClassPath.h" 23#include "loadBackGroundClassPath.h"
24#include "loadOnUseClassPath.h"
19#include "localization.h" 25#include "localization.h"
20
21/*--------------------------------------------------------------------------*/ 26/*--------------------------------------------------------------------------*/
22/* not using gw_jvm.h */ 27#ifdef _MSC_VER
23int gw_jvm(void); 28JVM_IMPEXP JavaVM *getScilabJavaVM(void)
29{
30 return NULL;
31}
32/*--------------------------------------------------------------------------*/
33JVM_IMPEXP jobject getScilabObject(void)
34{
35 return NULL;
36}
37/*--------------------------------------------------------------------------*/
38JVM_IMPEXP JNIEnv *getScilabJNIEnv(void)
39{
40 return NULL;
41}
42#endif
24/*--------------------------------------------------------------------------*/ 43/*--------------------------------------------------------------------------*/
25int gw_jvm(void) 44int gw_jvm(void)
26{ 45{
27 Scierror(999,_("Scilab Java module not installed.\n")); 46 Scierror(999,_("Scilab Java module not installed.\n"));
28 return 0; 47 return 0;
29} 48}
30/*--------------------------------------------------------------------------*/ 49/*--------------------------------------------------------------------------*/
31BOOL InitializeJVM(void) 50BOOL InitializeJVM(void)
32{ 51{
33 return FALSE; 52 return FALSE;
34} 53}
35/*--------------------------------------------------------------------------*/ 54/*--------------------------------------------------------------------------*/
36BOOL TerminateJVM(void) 55BOOL TerminateJVM(void)
37{ 56{
38 return FALSE; 57 return FALSE;
39} 58}
40/*--------------------------------------------------------------------------*/ 59/*--------------------------------------------------------------------------*/
41BOOL with_java(void) 60BOOL loadBackGroundClassPath(void)
42{ 61{
43 return FALSE; 62 return FALSE;
44} 63}
45/*--------------------------------------------------------------------------*/ 64/*--------------------------------------------------------------------------*/
46BOOL loadBackGroundClassPath(void) 65BOOL loadOnUseClassPath(char *tag)
47{ 66{
48 return FALSE; 67 return FALSE;
49} 68}
50/*--------------------------------------------------------------------------*/ 69/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/jvm/src/nojvm/nojvm.rc b/scilab/modules/jvm/src/nojvm/nojvm.rc
new file mode 100644
index 0000000..5a8badf
--- /dev/null
+++ b/scilab/modules/jvm/src/nojvm/nojvm.rc
@@ -0,0 +1,97 @@
1// Microsoft Visual C++ generated resource script.
2//
3
4
5#define APSTUDIO_READONLY_SYMBOLS
6/////////////////////////////////////////////////////////////////////////////
7//
8// Generated from the TEXTINCLUDE 2 resource.
9//
10//#include "afxres.h"
11#define APSTUDIO_HIDDEN_SYMBOLS
12#include "windows.h"
13/////////////////////////////////////////////////////////////////////////////
14#undef APSTUDIO_READONLY_SYMBOLS
15
16/////////////////////////////////////////////////////////////////////////////
17// French (France) resources
18
19#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
20#ifdef _WIN32
21LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
22#pragma code_page(1252)
23#endif //_WIN32
24
25#ifdef APSTUDIO_INVOKED
26/////////////////////////////////////////////////////////////////////////////
27//
28// TEXTINCLUDE
29//
30
311 TEXTINCLUDE
32BEGIN
33 "resource.h\0"
34END
35
36
373 TEXTINCLUDE
38BEGIN
39 "\r\n"
40 "\0"
41END
42
43#endif // APSTUDIO_INVOKED
44
45
46/////////////////////////////////////////////////////////////////////////////
47//
48// Version
49//
50
51VS_VERSION_INFO VERSIONINFO
52 FILEVERSION 5,3,0,0
53 PRODUCTVERSION 5,3,0,0
54 FILEFLAGSMASK 0x17L
55#ifdef _DEBUG
56 FILEFLAGS 0x1L
57#else
58 FILEFLAGS 0x0L
59#endif
60 FILEOS 0x4L
61 FILETYPE 0x0L
62 FILESUBTYPE 0x0L
63BEGIN
64 BLOCK "StringFileInfo"
65 BEGIN
66 BLOCK "040c04b0"
67 BEGIN
68 VALUE "FileDescription", "nojvm module"
69 VALUE "FileVersion", "5, 3, 0, 0"
70 VALUE "InternalName", "nojvm module"
71 VALUE "LegalCopyright", "Copyright (C) 2010"
72 VALUE "OriginalFilename", "nolibjvm.dll"
73 VALUE "ProductName", " nojvm"
74 VALUE "ProductVersion", "5, 3, 0, 0"
75 END
76 END
77 BLOCK "VarFileInfo"
78 BEGIN
79 VALUE "Translation", 0x40c, 1200
80 END
81END
82
83#endif // French (France) resources
84/////////////////////////////////////////////////////////////////////////////
85
86
87
88#ifndef APSTUDIO_INVOKED
89/////////////////////////////////////////////////////////////////////////////
90//
91// Generated from the TEXTINCLUDE 3 resource.
92//
93
94
95/////////////////////////////////////////////////////////////////////////////
96#endif // not APSTUDIO_INVOKED
97
diff --git a/scilab/modules/jvm/src/nojvm/nojvm.vcproj b/scilab/modules/jvm/src/nojvm/nojvm.vcproj
new file mode 100644
index 0000000..66df8c8
--- /dev/null
+++ b/scilab/modules/jvm/src/nojvm/nojvm.vcproj
@@ -0,0 +1,399 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="9,00"
5 Name="nolibjvm"
6 ProjectGUID="{889AD61B-12E9-4F85-8525-B83C16C88C3F}"
7 RootNamespace="nolibjvm"
8 Keyword="Win32Proj"
9 TargetFrameworkVersion="0"
10 >
11 <Platforms>
12 <Platform
13 Name="Win32"
14 />
15 <Platform
16 Name="x64"
17 />
18 </Platforms>
19 <ToolFiles>
20 </ToolFiles>
21 <Configurations>
22 <Configuration
23 Name="Debug|Win32"
24 OutputDirectory="$(SolutionDir)bin\"
25 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
26 ConfigurationType="2"
27 CharacterSet="2"
28 >
29 <Tool
30 Name="VCPreBuildEventTool"
31 />
32 <Tool
33 Name="VCCustomBuildTool"
34 />
35 <Tool
36 Name="VCXMLDataGeneratorTool"
37 />
38 <Tool
39 Name="VCWebServiceProxyGeneratorTool"
40 />
41 <Tool
42 Name="VCMIDLTool"
43 />
44 <Tool
45 Name="VCCLCompilerTool"
46 AdditionalOptions=""
47 Optimization="0"
48 AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS"
50 MinimalRebuild="true"
51 BasicRuntimeChecks="0"
52 RuntimeLibrary="3"
53 UsePrecompiledHeader="0"
54 WarningLevel="3"
55 DebugInformationFormat="3"
56 />
57 <Tool
58 Name="VCManagedResourceCompilerTool"
59 />
60 <Tool
61 Name="VCResourceCompilerTool"
62 />
63 <Tool
64 Name="VCPreLinkEventTool"
65 Description="Make dependencies"
66 CommandLine=""
67 />
68 <Tool
69 Name="VCLinkerTool"
70 AdditionalDependencies="../../../../bin/libintl.lib"
71 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
72 LinkIncremental="1"
73 ModuleDefinitionFile=""
74 GenerateDebugInformation="true"
75 SubSystem="2"
76 RandomizedBaseAddress="1"
77 DataExecutionPrevention="0"
78 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
79 TargetMachine="1"
80 CLRUnmanagedCodeCheck="true"
81 />
82 <Tool
83 Name="VCALinkTool"
84 />
85 <Tool
86 Name="VCManifestTool"
87 />
88 <Tool
89 Name="VCXDCMakeTool"
90 />
91 <Tool
92 Name="VCBscMakeTool"
93 />
94 <Tool
95 Name="VCFxCopTool"
96 />
97 <Tool
98 Name="VCAppVerifierTool"
99 />
100 <Tool
101 Name="VCPostBuildEventTool"
102 />
103 </Configuration>
104 <Configuration
105 Name="Debug|x64"
106 OutputDirectory="$(SolutionDir)bin\"
107 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
108 ConfigurationType="2"
109 CharacterSet="2"
110 >
111 <Tool
112 Name="VCPreBuildEventTool"
113 />
114 <Tool
115 Name="VCCustomBuildTool"
116 />
117 <Tool
118 Name="VCXMLDataGeneratorTool"
119 />
120 <Tool
121 Name="VCWebServiceProxyGeneratorTool"
122 />
123 <Tool
124 Name="VCMIDLTool"
125 TargetEnvironment="3"
126 />
127 <Tool
128 Name="VCCLCompilerTool"
129 Optimization="0"
130 AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
131 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS"
132 MinimalRebuild="true"
133 BasicRuntimeChecks="0"
134 RuntimeLibrary="3"
135 UsePrecompiledHeader="0"
136 WarningLevel="3"
137 DebugInformationFormat="3"
138 />
139 <Tool
140 Name="VCManagedResourceCompilerTool"
141 />
142 <Tool
143 Name="VCResourceCompilerTool"
144 />
145 <Tool
146 Name="VCPreLinkEventTool"
147 Description="Make dependencies"
148 CommandLine=""
149 />
150 <Tool
151 Name="VCLinkerTool"
152 AdditionalDependencies="../../../../bin/libintl.lib"
153 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
154 LinkIncremental="1"
155 ModuleDefinitionFile=""
156 GenerateDebugInformation="true"
157 SubSystem="2"
158 RandomizedBaseAddress="1"
159 DataExecutionPrevention="0"
160 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
161 TargetMachine="17"
162 CLRUnmanagedCodeCheck="true"
163 />
164 <Tool
165 Name="VCALinkTool"
166 />
167 <Tool
168 Name="VCManifestTool"
169 />
170 <Tool
171 Name="VCXDCMakeTool"
172 />
173 <Tool
174 Name="VCBscMakeTool"
175 />
176 <Tool
177 Name="VCFxCopTool"
178 />
179 <Tool
180 Name="VCAppVerifierTool"
181 />
182 <Tool
183 Name="VCPostBuildEventTool"
184 />
185 </Configuration>
186 <Configuration
187 Name="Release|Win32"
188 OutputDirectory="$(SolutionDir)bin\"
189 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
190 ConfigurationType="2"
191 CharacterSet="2"
192 WholeProgramOptimization="0"
193 >
194 <Tool
195 Name="VCPreBuildEventTool"
196 />
197 <Tool
198 Name="VCCustomBuildTool"
199 />
200 <Tool
201 Name="VCXMLDataGeneratorTool"
202 />
203 <Tool
204 Name="VCWebServiceProxyGeneratorTool"
205 />
206 <Tool
207 Name="VCMIDLTool"
208 />
209 <Tool
210 Name="VCCLCompilerTool"
211 AdditionalOptions=""
212 InlineFunctionExpansion="1"
213 FavorSizeOrSpeed="1"
214 WholeProgramOptimization="false"
215 AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
216 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS"
217 StringPooling="true"
218 RuntimeLibrary="2"
219 EnableEnhancedInstructionSet="0"
220 UsePrecompiledHeader="0"
221 WarningLevel="3"
222 DebugInformationFormat="3"
223 />
224 <Tool
225 Name="VCManagedResourceCompilerTool"
226 />
227 <Tool
228 Name="VCResourceCompilerTool"
229 />
230 <Tool
231 Name="VCPreLinkEventTool"
232 Description="Make dependencies"
233 CommandLine=""
234 />
235 <Tool
236 Name="VCLinkerTool"
237 AdditionalDependencies="../../../../bin/libintl.lib"
238 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
239 LinkIncremental="1"
240 ModuleDefinitionFile=""
241 GenerateDebugInformation="false"
242 SubSystem="2"
243 OptimizeReferences="2"
244 EnableCOMDATFolding="2"
245 LinkTimeCodeGeneration="0"
246 RandomizedBaseAddress="1"
247 DataExecutionPrevention="0"
248 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
249 TargetMachine="1"
250 CLRUnmanagedCodeCheck="true"
251 />
252 <Tool
253 Name="VCALinkTool"
254 />
255 <Tool
256 Name="VCManifestTool"
257 />
258 <Tool
259 Name="VCXDCMakeTool"
260 />
261 <Tool
262 Name="VCBscMakeTool"
263 />
264 <Tool
265 Name="VCFxCopTool"
266 />
267 <Tool
268 Name="VCAppVerifierTool"
269 />
270 <Tool
271 Name="VCPostBuildEventTool"
272 />
273 </Configuration>
274 <Configuration
275 Name="Release|x64"
276 OutputDirectory="$(SolutionDir)bin\"
277 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
278 ConfigurationType="2"
279 CharacterSet="2"
280 WholeProgramOptimization="0"
281 >
282 <Tool
283 Name="VCPreBuildEventTool"
284 />
285 <Tool
286 Name="VCCustomBuildTool"
287 />
288 <Tool
289 Name="VCXMLDataGeneratorTool"
290 />
291 <Tool
292 Name="VCWebServiceProxyGeneratorTool"
293 />
294 <Tool
295 Name="VCMIDLTool"
296 TargetEnvironment="3"
297 />
298 <Tool
299 Name="VCCLCompilerTool"
300 InlineFunctionExpansion="1"
301 FavorSizeOrSpeed="1"
302 WholeProgramOptimization="false"
303 AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
304 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;;LIBJVM_EXPORTS"
305 StringPooling="true"
306 RuntimeLibrary="2"
307 EnableEnhancedInstructionSet="0"
308 UsePrecompiledHeader="0"
309 WarningLevel="3"
310 DebugInformationFormat="3"
311 />
312 <Tool
313 Name="VCManagedResourceCompilerTool"
314 />
315 <Tool
316 Name="VCResourceCompilerTool"
317 />
318 <Tool
319 Name="VCPreLinkEventTool"
320 Description="Make dependencies"
321 CommandLine=""
322 />
323 <Tool
324 Name="VCLinkerTool"
325 AdditionalDependencies="../../../../bin/libintl.lib"
326 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
327 LinkIncremental="1"
328 ModuleDefinitionFile=""
329 GenerateDebugInformation="false"
330 SubSystem="2"
331 OptimizeReferences="2"
332 EnableCOMDATFolding="2"
333 LinkTimeCodeGeneration="0"
334 RandomizedBaseAddress="1"
335 DataExecutionPrevention="0"
336 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
337 TargetMachine="17"
338 CLRUnmanagedCodeCheck="true"
339 />
340 <Tool
341 Name="VCALinkTool"
342 />
343 <Tool
344 Name="VCManifestTool"
345 />
346 <Tool
347 Name="VCXDCMakeTool"
348 />
349 <Tool
350 Name="VCBscMakeTool"
351 />
352 <Tool
353 Name="VCFxCopTool"
354 />
355 <Tool
356 Name="VCAppVerifierTool"
357 />
358 <Tool
359 Name="VCPostBuildEventTool"
360 />
361 </Configuration>
362 </Configurations>
363 <References>
364 </References>
365 <Files>
366 <Filter
367 Name="Source Files"
368 Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
369 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
370 >
371 <File
372 RelativePath=".\nojvm.c"
373 >
374 </File>
375 </Filter>
376 <Filter
377 Name="Header Files"
378 Filter="h;hpp;hxx;hm;inl;inc;xsd"
379 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
380 >
381 </Filter>
382 <Filter
383 Name="Resource Files"
384 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
385 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
386 >
387 <File
388 RelativePath=".\nojvm.rc"
389 >
390 </File>
391 </Filter>
392 <Filter
393 Name="Libraries Dependencies"
394 >
395 </Filter>
396 </Files>
397 <Globals>
398 </Globals>
399</VisualStudioProject>
diff --git a/scilab/modules/scicos_blocks/scicos_blocks.iss b/scilab/modules/scicos_blocks/scicos_blocks.iss
index 3c89144..39bc774 100644
--- a/scilab/modules/scicos_blocks/scicos_blocks.iss
+++ b/scilab/modules/scicos_blocks/scicos_blocks.iss
@@ -28,7 +28,7 @@ Source: bin\{#SCICOS_BLOCKS}_f.lib; DestDir: {app}\bin; Components: {#COMPN_XCOS
28Source: modules\{#SCICOS_BLOCKS}\VERSION.xml; DestDir: {app}\modules\{#SCICOS_BLOCKS}; Components: {#COMPN_XCOS} 28Source: modules\{#SCICOS_BLOCKS}\VERSION.xml; DestDir: {app}\modules\{#SCICOS_BLOCKS}; Components: {#COMPN_XCOS}
29Source: modules\{#SCICOS_BLOCKS}\readme.txt; DestDir: {app}\modules\{#SCICOS_BLOCKS}; Components: {#COMPN_XCOS} 29Source: modules\{#SCICOS_BLOCKS}\readme.txt; DestDir: {app}\modules\{#SCICOS_BLOCKS}; Components: {#COMPN_XCOS}
30Source: modules\{#SCICOS_BLOCKS}\license.txt; DestDir: {app}\modules\{#SCICOS_BLOCKS}; Components: {#COMPN_XCOS} 30Source: modules\{#SCICOS_BLOCKS}\license.txt; DestDir: {app}\modules\{#SCICOS_BLOCKS}; Components: {#COMPN_XCOS}
31Source: modules\{#SCICOS_BLOCKS}\changelog.txt; DestDir: {app}\modules\{#SCICOS_BLOCKS; Components: {#COMPN_XCOS} 31Source: modules\{#SCICOS_BLOCKS}\changelog.txt; DestDir: {app}\modules\{#SCICOS_BLOCKS}; Components: {#COMPN_XCOS}
32; 32;
33Source: modules\{#SCICOS_BLOCKS}\etc\{#SCICOS_BLOCKS}.quit; DestDir: {app}\modules\{#SCICOS_BLOCKS}\etc; Components: {#COMPN_XCOS} 33Source: modules\{#SCICOS_BLOCKS}\etc\{#SCICOS_BLOCKS}.quit; DestDir: {app}\modules\{#SCICOS_BLOCKS}\etc; Components: {#COMPN_XCOS}
34Source: modules\{#SCICOS_BLOCKS}\etc\{#SCICOS_BLOCKS}.start; DestDir: {app}\modules\{#SCICOS_BLOCKS}\etc; Components: {#COMPN_XCOS} 34Source: modules\{#SCICOS_BLOCKS}\etc\{#SCICOS_BLOCKS}.start; DestDir: {app}\modules\{#SCICOS_BLOCKS}\etc; Components: {#COMPN_XCOS}
diff --git a/scilab/modules/types/types.iss b/scilab/modules/types/types.iss
index 263adf4..43dd38c 100644
--- a/scilab/modules/types/types.iss
+++ b/scilab/modules/types/types.iss
@@ -17,21 +17,21 @@
17; 17;
18#define TYPES "types" 18#define TYPES "types"
19; 19;
20Source: modules\{#TYPES}\jar\org.scilab.modules.{#TYPES}.jar;DestDir: {app}\modules\{#TYPES}\jar; Components: {#COMPN_SCILAB} 20Source: modules\{#TYPES}\jar\org.scilab.modules.{#TYPES}.jar;DestDir: {app}\modules\{#TYPES}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
21; 21;
22Source: modules\{#TYPES}\VERSION.xml; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB} 22Source: modules\{#TYPES}\VERSION.xml; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
23Source: modules\{#TYPES}\readme.txt; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB} 23Source: modules\{#TYPES}\readme.txt; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
24Source: modules\{#TYPES}\license.txt; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB} 24Source: modules\{#TYPES}\license.txt; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
25Source: modules\{#TYPES}\changelog.txt; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB} 25Source: modules\{#TYPES}\changelog.txt; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
26; 26;
27Source: modules\{#TYPES}\etc\{#TYPES}.quit; DestDir: {app}\modules\{#TYPES}\etc; Components: {#COMPN_SCILAB} 27Source: modules\{#TYPES}\etc\{#TYPES}.quit; DestDir: {app}\modules\{#TYPES}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
28Source: modules\{#TYPES}\etc\{#TYPES}.start; DestDir: {app}\modules\{#TYPES}\etc; Components: {#COMPN_SCILAB} 28Source: modules\{#TYPES}\etc\{#TYPES}.start; DestDir: {app}\modules\{#TYPES}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
29; 29;
30Source: modules\{#TYPES}\macros\buildmacros.sce; DestDir: {app}\modules\{#TYPES}\macros; Components: {#COMPN_SCILAB} 30Source: modules\{#TYPES}\macros\buildmacros.sce; DestDir: {app}\modules\{#TYPES}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
31Source: modules\{#TYPES}\macros\buildmacros.bat; DestDir: {app}\modules\{#TYPES}\macros; Components: {#COMPN_SCILAB} 31Source: modules\{#TYPES}\macros\buildmacros.bat; DestDir: {app}\modules\{#TYPES}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
32Source: modules\{#TYPES}\macros\cleanmacros.bat; DestDir: {app}\modules\{#TYPES}\macros; Components: {#COMPN_SCILAB} 32Source: modules\{#TYPES}\macros\cleanmacros.bat; DestDir: {app}\modules\{#TYPES}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
33; 33;
34;Source: modules\{#TYPES}\tests\*.*; DestDir: {app}\modules\{#TYPES}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} 34;Source: modules\{#TYPES}\tests\*.*; DestDir: {app}\modules\{#TYPES}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
35; 35;
36; 36;
37;-------------------------------------------------------------------------------------------------------------- 37;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/modules/ui_data/ui_data.iss b/scilab/modules/ui_data/ui_data.iss
index 8a6cd09..7133bf9 100644
--- a/scilab/modules/ui_data/ui_data.iss
+++ b/scilab/modules/ui_data/ui_data.iss
@@ -14,25 +14,25 @@
14; 14;
15#define UI_DATA "ui_data" 15#define UI_DATA "ui_data"
16; 16;
17Source: bin\sci{#UI_DATA}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 17Source: bin\sci{#UI_DATA}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
18Source: modules\{#UI_DATA}\jar\org.scilab.modules.{#UI_DATA}.jar;DestDir: {app}\modules\{#UI_DATA}\jar; Components: {#COMPN_SCILAB} 18Source: modules\{#UI_DATA}\jar\org.scilab.modules.{#UI_DATA}.jar;DestDir: {app}\modules\{#UI_DATA}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
19; 19;
20Source: modules\{#UI_DATA}\etc\{#UI_DATA}.start;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} 20Source: modules\{#UI_DATA}\etc\{#UI_DATA}.start;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
21Source: modules\{#UI_DATA}\etc\{#UI_DATA}.quit;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} 21Source: modules\{#UI_DATA}\etc\{#UI_DATA}.quit;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
22Source: modules\{#UI_DATA}\etc\variablebrowser_menubar.xml;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} 22Source: modules\{#UI_DATA}\etc\variablebrowser_menubar.xml;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
23Source: modules\{#UI_DATA}\etc\variableeditor_menubar.xml;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} 23Source: modules\{#UI_DATA}\etc\variableeditor_menubar.xml;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
24; 24;
25Source: modules\{#UI_DATA}\sci_gateway\{#UI_DATA}_gateway.xml; DestDir: {app}\modules\{#UI_DATA}\sci_gateway; Components: {#COMPN_SCILAB} 25Source: modules\{#UI_DATA}\sci_gateway\{#UI_DATA}_gateway.xml; DestDir: {app}\modules\{#UI_DATA}\sci_gateway; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
26; 26;
27Source: modules\{#UI_DATA}\version.xml; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB} 27Source: modules\{#UI_DATA}\version.xml; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
28Source: modules\{#UI_DATA}\readme.txt; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB} 28Source: modules\{#UI_DATA}\readme.txt; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
29Source: modules\{#UI_DATA}\license.txt; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB} 29Source: modules\{#UI_DATA}\license.txt; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
30Source: modules\{#UI_DATA}\changelog.txt; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB} 30Source: modules\{#UI_DATA}\changelog.txt; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
31; 31;
32Source: modules\{#UI_DATA}\images\icons\*.gif; DestDir: {app}\modules\{#UI_DATA}\images\icons; Components: {#COMPN_SCILAB} 32Source: modules\{#UI_DATA}\images\icons\*.gif; DestDir: {app}\modules\{#UI_DATA}\images\icons; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
33; 33;
34;Source: modules\{#UI_DATA}\demos\*.*; DestDir: {app}\modules\{#UI_DATA}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 34;Source: modules\{#UI_DATA}\demos\*.*; DestDir: {app}\modules\{#UI_DATA}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
35; 35;
36;Source: modules\{#UI_DATA}\tests\*.*; DestDir: {app}\modules\{#UI_DATA}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} 36;Source: modules\{#UI_DATA}\tests\*.*; DestDir: {app}\modules\{#UI_DATA}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
37; 37;
38;-------------------------------------------------------------------------------------------------------------- 38;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/modules/windows_tools/src/c/scilab_windows/console_main.c b/scilab/modules/windows_tools/src/c/scilab_windows/console_main.c
index f31c8bd..34669bc 100644
--- a/scilab/modules/windows_tools/src/c/scilab_windows/console_main.c
+++ b/scilab/modules/windows_tools/src/c/scilab_windows/console_main.c
@@ -29,6 +29,8 @@
29#include "WndThread.h" 29#include "WndThread.h"
30#include "localization.h" 30#include "localization.h"
31#include "LanguagePreferences_Windows.h" 31#include "LanguagePreferences_Windows.h"
32#include "with_module.h"
33
32/*--------------------------------------------------------------------------*/ 34/*--------------------------------------------------------------------------*/
33#define MIN_STACKSIZE 180000 35#define MIN_STACKSIZE 180000
34/*--------------------------------------------------------------------------*/ 36/*--------------------------------------------------------------------------*/
@@ -81,7 +83,10 @@ int Console_Main(int argc, char **argv)
81 while (argcount > 0) 83 while (argcount > 0)
82 { 84 {
83 argcount--; 85 argcount--;
84 if (_stricmp (my_argv[argcount], "-NW") == 0) nowin = 1; 86 if (_stricmp (my_argv[argcount], "-NW") == 0)
87 {
88 nowin = 1;
89 }
85 else if (_stricmp (my_argv[argcount], "-NS") == 0) startupf = 1; 90 else if (_stricmp (my_argv[argcount], "-NS") == 0) startupf = 1;
86 else if ( _stricmp(my_argv[argcount],"-NB") == 0) { sci_show_banner = 0; } 91 else if ( _stricmp(my_argv[argcount],"-NB") == 0) { sci_show_banner = 0; }
87 else if (_stricmp (my_argv[argcount], "-NWNI") == 0) 92 else if (_stricmp (my_argv[argcount], "-NWNI") == 0)
@@ -147,6 +152,12 @@ int Console_Main(int argc, char **argv)
147 } 152 }
148 } 153 }
149 154
155 if (!with_module("jvm"))
156 {
157 /* no module jvm then we force NWNI mode */
158 setScilabMode(SCILAB_NWNI);
159 }
160
150 if (getScilabMode() != SCILAB_NWNI) CreateScilabHiddenWndThread(); 161 if (getScilabMode() != SCILAB_NWNI) CreateScilabHiddenWndThread();
151 162
152 if ( (getScilabMode() == SCILAB_NWNI) || (getScilabMode() == SCILAB_NW) ) 163 if ( (getScilabMode() == SCILAB_NWNI) || (getScilabMode() == SCILAB_NW) )