From: Antoine ELIAS <antoine.elias@scilab-enterprises.com>
Date: Fri, 25 Jan 2013 09:21:24 +0000 (+0100)
Subject: update windows installer
X-Git-Tag: 5.4.1~568
X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=c163ca100718ecd72074bf5a34c501d5e52924c6

update windows installer

Change-Id: Ieac62f9ef5db86f8a42a3cc9c768d018f6827633
---

diff --git a/scilab/modules/tclsci/tclsci.iss b/scilab/modules/tclsci/tclsci.iss
index 4b825c9..dbe287c 100644
--- a/scilab/modules/tclsci/tclsci.iss
+++ b/scilab/modules/tclsci/tclsci.iss
@@ -18,31 +18,31 @@
 ;
 #define TCLSCI "tclsci"
 ;
-Source: modules\{#TCLSCI}\license.txt; DestDir: {app}\modules\{#TCLSCI}; Components: {#COMPN_TCLSCI}
+Source: modules\{#TCLSCI}\license.txt; DestDir: {app}\modules\{#TCLSCI}; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#TCLSCI}\sci_gateway\{#TCLSCI}_gateway.xml; DestDir: {app}\modules\{#TCLSCI}\sci_gateway; Components: {#COMPN_TCLSCI}
+Source: modules\{#TCLSCI}\sci_gateway\{#TCLSCI}_gateway.xml; DestDir: {app}\modules\{#TCLSCI}\sci_gateway; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#TCLSCI}\etc\{#TCLSCI}.quit; DestDir: {app}\modules\{#TCLSCI}\etc; Components: {#COMPN_TCLSCI}
-Source: modules\{#TCLSCI}\etc\{#TCLSCI}.start; DestDir: {app}\modules\{#TCLSCI}\etc; Components: {#COMPN_TCLSCI}
+Source: modules\{#TCLSCI}\etc\{#TCLSCI}.quit; DestDir: {app}\modules\{#TCLSCI}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#TCLSCI}\etc\{#TCLSCI}.start; DestDir: {app}\modules\{#TCLSCI}\etc; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#TCLSCI}\demos\*.*; DestDir: {app}\modules\{#TCLSCI}\demos; Flags: recursesubdirs; Components: {#COMPN_TCLSCI}
+Source: modules\{#TCLSCI}\demos\*.*; DestDir: {app}\modules\{#TCLSCI}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 ;
-;Source: modules\{#TCLSCI}\includes\*.h; Flags: recursesubdirs; DestDir: {app}\modules\{#TCLSCI}\includes; Components: {#COMPN_TCLSCI}
+;Source: modules\{#TCLSCI}\includes\*.h; Flags: recursesubdirs; DestDir: {app}\modules\{#TCLSCI}\includes; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#TCLSCI}\macros\lib; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_TCLSCI}
-Source: modules\{#TCLSCI}\macros\names; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_TCLSCI}
-Source: modules\{#TCLSCI}\macros\*.bin; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_TCLSCI}
-Source: modules\{#TCLSCI}\macros\*.sci; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_TCLSCI}
-Source: modules\{#TCLSCI}\macros\buildmacros.sce; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_TCLSCI}
-Source: modules\{#TCLSCI}\macros\buildmacros.bat; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_TCLSCI}
-Source: modules\{#TCLSCI}\macros\cleanmacros.bat; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_TCLSCI}
+Source: modules\{#TCLSCI}\macros\lib; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#TCLSCI}\macros\names; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#TCLSCI}\macros\*.bin; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#TCLSCI}\macros\*.sci; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#TCLSCI}\macros\buildmacros.sce; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#TCLSCI}\macros\buildmacros.bat; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#TCLSCI}\macros\cleanmacros.bat; DestDir: {app}\modules\{#TCLSCI}\macros; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#TCLSCI}\tcl\*.*; DestDir: {app}\modules\{#TCLSCI}\tcl; Flags: recursesubdirs; Components: {#COMPN_TCLSCI}
+Source: modules\{#TCLSCI}\tcl\*.*; DestDir: {app}\modules\{#TCLSCI}\tcl; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 ;
-Source: bin\tclsci.dll; DestDir: {app}\bin; Components: {#COMPN_TCLSCI}
-Source: bin\tcl85.dll; DestDir: {app}\bin; Components: {#COMPN_TCLSCI}
-Source: bin\tk85.dll; DestDir: {app}\bin; Components: {#COMPN_TCLSCI}
+Source: bin\tclsci.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\tcl85.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\tk85.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#TCLSCI}\tests\*.*; DestDir: {app}\modules\{#TCLSCI}\tests; Flags: recursesubdirs; Components:  {#COMPN_TCLSCI} and {#COMPN_TESTS}
+Source: modules\{#TCLSCI}\tests\*.*; DestDir: {app}\modules\{#TCLSCI}\tests; Flags: recursesubdirs; Components:  {#COMPN_SCILAB} and {#COMPN_TESTS}
 ;
 ;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/tools/innosetup/code_modules.iss b/scilab/tools/innosetup/code_modules.iss
index 0bdca93..4ac0f14 100644
--- a/scilab/tools/innosetup/code_modules.iss
+++ b/scilab/tools/innosetup/code_modules.iss
@@ -13,305 +13,145 @@
 //
 //------------------------------------------------------------------------------
 function CreateModulesFile: Boolean;
-    Var ModuleFileName : String;
-    i : Integer;
-    d : Integer;
-    ModulesXmlFileLines: TArrayOfString;
-    begin
-        i := 0;
-
-        setArrayLength(ModulesXmlFileLines, 256);
-        for d := 0 to GetArrayLength(ModulesXmlFileLines)-1 do
-          begin
-            ModulesXmlFileLines[d] := '';
-          end;
-
-        ModuleFileName := ExpandConstant('{app}') +'\etc\modules.xml';
-
-        ModulesXmlFileLines[i] := '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'; i := i + 1;
-        ModulesXmlFileLines[i] := '<!DOCTYPE modules SYSTEM "../modules/core/xml/modules.dtd">'; i := i + 1;
-        ModulesXmlFileLines[i] := '<!-- =================== -->'; i := i + 1;
-        ModulesXmlFileLines[i] := '<!--'; i := i + 1;
-        ModulesXmlFileLines[i] := ' Modules list for Scilab'; i := i + 1;
-        ModulesXmlFileLines[i] := ' @author Scilab Enterprises'; i := i + 1;
-        ModulesXmlFileLines[i] := ' @date 2013'; i := i + 1;
-        ModulesXmlFileLines[i] := ' ==================='; i := i + 1;
-        ModulesXmlFileLines[i] := ' Do not touch if you do not know what you are doing'; i := i + 1;
-        ModulesXmlFileLines[i] := ' Warning "core" module must be always the first module'; i := i + 1;
-        ModulesXmlFileLines[i] := ' activate="yes" module will be launched ( or not "no")'; i := i + 1;
-        ModulesXmlFileLines[i] := ' -->'; i := i + 1;
-        ModulesXmlFileLines[i] := '<!-- =================== -->'; i := i + 1;
-        ModulesXmlFileLines[i] := '<modules>'; i := i + 1;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="core" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="api_scilab" activate="yes"/>'; i := i + 1;
-            end;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="helptools" activate="yes"/>'; i := i + 1;
-            end;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="differential_equations" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="double" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="elementary_functions" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="functions" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="fileio" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_GRAPHICS}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="graphics" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="renderer" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="graphic_objects" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="graphic_export" activate="yes"/>'; i := i + 1;
-            end;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="boolean" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="cacsd" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="data_structures" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="console" activate="yes"/>'; i := i + 1;
-            end;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="action_binding" activate="yes"/>'; i := i + 1;
-            end;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="completion" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="history_manager" activate="yes"/>'; i := i + 1;
-            end;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="gui" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="preferences" activate="yes"/>'; i := i + 1;
-            end;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="dynamic_link" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="integer" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="io" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="output_stream" activate="yes"/>'; i := i + 1;
-            end;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="jvm" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="commons" activate="yes"/>'; i := i + 1;
-            end;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="linear_algebra" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="localization" activate="yes"/>'; i := i + 1;
-            end;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="graph" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="ui_data" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="history_browser" activate="yes"/>'; i := i + 1;
-            end;
-
-        ModulesXmlFileLines[i] := '<module name="intersci" activate="yes"/>'; i := i + 1;
-        ModulesXmlFileLines[i] := '<module name="interpolation" activate="yes"/>'; i := i + 1;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="optimization" activate="yes"/>'; i := i + 1;
-            end;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="overloading" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="polynomials" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="signal_processing" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="sparse" activate="yes"/>'; i := i + 1;
-            end;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="special_functions" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="string" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="symbolic" activate="yes"/>'; i := i + 1;
-            end;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="time" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="windows_tools" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="statistics" activate="yes"/>'; i := i + 1;
-            end;
-
-        ModulesXmlFileLines[i] := '<!-- comments -->'; i := i + 1;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="arnoldi" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="compatibility_functions" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) and IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="javasci" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="m2sci" activate="yes"/>'; i := i + 1;
-            end;
+Var ModuleFileName : String;
+i : Integer;
+d : Integer;
+ModulesXmlFileLines: TArrayOfString;
+begin
+
+    i := 0;
+
+    setArrayLength(ModulesXmlFileLines, 256);
+    for d := 0 to GetArrayLength(ModulesXmlFileLines)-1 do
+      begin
+        ModulesXmlFileLines[d] := '';
+      end;
+
+    ModuleFileName := ExpandConstant('{app}') +'\etc\modules.xml';
+
+    ModulesXmlFileLines[i] := '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<!DOCTYPE modules SYSTEM "../modules/core/xml/modules.dtd">'; i := i + 1;
+    ModulesXmlFileLines[i] := '<!-- =================== -->'; i := i + 1;
+    ModulesXmlFileLines[i] := '<!--'; i := i + 1;
+    ModulesXmlFileLines[i] := ' Modules list for Scilab'; i := i + 1;
+    ModulesXmlFileLines[i] := ' @author Scilab Enterprises'; i := i + 1;
+    ModulesXmlFileLines[i] := ' @date 2013'; i := i + 1;
+    ModulesXmlFileLines[i] := ' ==================='; i := i + 1;
+    ModulesXmlFileLines[i] := ' Do not touch if you do not know what you are doing'; i := i + 1;
+    ModulesXmlFileLines[i] := ' Warning "core" module must be always the first module'; i := i + 1;
+    ModulesXmlFileLines[i] := ' activate="yes" module will be launched ( or not "no")'; i := i + 1;
+    ModulesXmlFileLines[i] := ' -->'; i := i + 1;
+    ModulesXmlFileLines[i] := '<!-- =================== -->'; i := i + 1;
+    ModulesXmlFileLines[i] := '<modules>'; i := i + 1;
+
+    ModulesXmlFileLines[i] := '<module name="core" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="double" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="api_scilab" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="differential_equations" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="elementary_functions" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="functions" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="fileio" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="boolean" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="cacsd" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="data_structures" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="console" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="completion" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="history_manager" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="dynamic_link" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="integer" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="io" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="output_stream" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="intersci" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="linear_algebra" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="localization" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="interpolation" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="optimization" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="overloading" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="polynomials" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="signal_processing" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="sparse" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="special_functions" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="string" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="symbolic" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="time" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="windows_tools" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="statistics" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="arnoldi" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="compatibility_functions" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="m2sci" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="mexlib" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="sound" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="external_objects" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="randlib" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="demo_tools" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="spreadsheet" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="call_scilab" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="umfpack" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="genetic_algorithms" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="simulated_annealing" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="parameters" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="matio" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="atoms" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="xml" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="tclsci" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="hdf5" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="fftw" activate="yes"/>'; i := i + 1;
 
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="mexlib" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_TCLSCI}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="tclsci" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="sound" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="external_objects" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="randlib" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_DEVTOOLS}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="development_tools" activate="yes"/>'; i := i + 1;
-            end;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="demo_tools" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="spreadsheet" activate="yes"/>'; i := i + 1;
-            end;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="call_scilab" activate="yes"/>'; i := i + 1;
-            end;
-
-        ModulesXmlFileLines[i] := '<!-- comments -->'; i := i + 1;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_XCOS}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="xcos" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="scicos" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="scicos_blocks" activate="yes"/>'; i := i + 1;
-            end;
-
-        ModulesXmlFileLines[i] := '<!-- comments -->'; i := i + 1;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_FFTW}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="fftw" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="umfpack" activate="yes"/>'; i := i + 1;
-            end;
-
-        ModulesXmlFileLines[i] := '<!-- comments -->'; i := i + 1;
-
-        if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="genetic_algorithms" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="simulated_annealing" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="parameters" activate="yes"/>'; i := i + 1;
-            end;
+#ifndef SCILAB_F2C
+    ModulesXmlFileLines[i] := '<module name="parallel" activate="yes"/>'; i := i + 1;
+#endif
 
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="matio" activate="yes"/>'; i := i + 1;
-            end;
 
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="atoms" activate="yes"/>'; i := i + 1;
-            end;
 
-        if IsComponentSelected( ExpandConstant('{#COMPN_MODULES_MANAGER}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="modules_manager" activate="yes"/>'; i := i + 1;
-            end;
+    ModulesXmlFileLines[i] := '<!-- JMV dependencies -->'; i := i + 1;
+    if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
+    begin
+        ModulesXmlFileLines[i] := '<module name="helptools" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="action_binding" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="preferences" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="jvm" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="commons" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="history_browser" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="graph" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="javasci" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="types" activate="yes"/>'; i := i + 1;
+    end;
 
-        if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="types" activate="yes"/>'; i := i + 1;
-            end;
+    ModulesXmlFileLines[i] := '<!-- Scinotes dependencies -->'; i := i + 1;
+    if IsComponentSelected( ExpandConstant('{#COMPN_SCINOTES}') ) then
+    begin
+        ModulesXmlFileLines[i] := '<module name="scinotes" activate="yes"/>'; i := i + 1;
+    end;
 
-        ModulesXmlFileLines[i] := '<module name="hdf5" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<!-- Graphics dependencies -->'; i := i + 1;
+    if IsComponentSelected( ExpandConstant('{#COMPN_GRAPHICS}') ) then
+    begin
+        ModulesXmlFileLines[i] := '<module name="gui" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="graphics" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="renderer" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="graphic_objects" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="graphic_export" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="ui_data" activate="yes"/>'; i := i + 1;
+    end;
 
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCINOTES}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="scinotes" activate="yes"/>'; i := i + 1;
-            end;
-            
-#ifndef SCILAB_F2C
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="parallel" activate="yes"/>'; i := i + 1;
-            end;
-#endif
-        if (IsComponentSelected( ExpandConstant('{#COMPN_SCILAB}') )) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="xml" activate="yes"/>'; i := i + 1;
-            end;
+    ModulesXmlFileLines[i] := '<!-- Xcos dependencies -->'; i := i + 1;
+    if IsComponentSelected( ExpandConstant('{#COMPN_XCOS}') ) then
+    begin
+        ModulesXmlFileLines[i] := '<module name="xcos" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="scicos" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="scicos_blocks" activate="yes"/>'; i := i + 1;
+    end;
 
+    ModulesXmlFileLines[i] := '<!-- Dev tools dependencies -->'; i := i + 1;
+    if IsComponentSelected( ExpandConstant('{#COMPN_DEVTOOLS}') ) then
+    begin
+        ModulesXmlFileLines[i] := '<module name="development_tools" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="modules_manager" activate="yes"/>'; i := i + 1;
+    end;
 
-        ModulesXmlFileLines[i] := '</modules>'; i := i + 1;
+    ModulesXmlFileLines[i] := '</modules>'; i := i + 1;
 
     Result := SaveStringsToFile(ModuleFileName, ModulesXmlFileLines, False);
 
-    end;
+end;
 //------------------------------------------------------------------------------