Merge remote-tracking branch 'origin/master' into yasp 95/10295/1
Antoine ELIAS [Thu, 24 Jan 2013 16:36:12 +0000 (17:36 +0100)]
Conflicts:
scilab/Makefile.in
scilab/modules/arnoldi/arnoldi.iss
scilab/modules/atoms/atoms.iss
scilab/modules/cacsd/cacsd.iss
scilab/modules/compatibility_functions/compatibility_functions.iss
scilab/modules/differential_equations/differential_equations.iss
scilab/modules/external_objects/external_objects.iss
scilab/modules/interpolation/interpolation.iss
scilab/modules/intersci/intersci.iss
scilab/modules/linear_algebra/linear_algebra.iss
scilab/modules/m2sci/m2sci.iss
scilab/modules/matio/matio.iss
scilab/modules/mexlib/mexlib.iss
scilab/modules/optimization/optimization.iss
scilab/modules/parallel/parallel.iss
scilab/modules/polynomials/polynomials.iss
scilab/modules/randlib/randlib.iss
scilab/modules/signal_processing/signal_processing.iss
scilab/modules/sound/sound.iss
scilab/modules/sparse/sparse.iss
scilab/modules/spreadsheet/spreadsheet.iss
scilab/modules/statistics/statistics.iss
scilab/modules/symbolic/symbolic.iss
scilab/modules/umfpack/umfpack.iss
scilab/tools/innosetup/code_modules.iss
scilab/tools/innosetup/components.iss
scilab/tools/innosetup/icons.iss

Change-Id: I153a9e4863d429281bfd5d575a9f9a247749cdaf

53 files changed:
1  2 
scilab/Scilab.sln
scilab/configure
scilab/configure.ac
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/arnoldi/arnoldi.iss
scilab/modules/atoms/atoms.iss
scilab/modules/cacsd/cacsd.iss
scilab/modules/call_scilab/src/c/call_scilab.c
scilab/modules/commons/commons.iss
scilab/modules/compatibility_functions/compatibility_functions.iss
scilab/modules/compatibility_functions/etc/compatibility_functions.start
scilab/modules/console/console.iss
scilab/modules/console/src/noconsole/noconsole.vcxproj
scilab/modules/console/src/noconsole/noconsole.vcxproj.filters
scilab/modules/core/etc/core.start
scilab/modules/core/macros/intppty.sci
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/differential_equations/differential_equations.iss
scilab/modules/external_objects/external_objects.iss
scilab/modules/external_objects/macros/!_deff_wrapper.sci
scilab/modules/graphics/graphics.iss
scilab/modules/graphics/sci_gateway/c/sci_plot2d1.c
scilab/modules/gui/gui.iss
scilab/modules/gui/src/nogui/nogui.vcxproj
scilab/modules/gui/src/nogui/nogui.vcxproj.filters
scilab/modules/interpolation/interpolation.iss
scilab/modules/jvm/jvm.iss
scilab/modules/jvm/src/nojvm/nojvm.vcxproj
scilab/modules/jvm/src/nojvm/nojvm.vcxproj.filters
scilab/modules/linear_algebra/linear_algebra.iss
scilab/modules/m2sci/m2sci.iss
scilab/modules/matio/matio.iss
scilab/modules/mexlib/mexlib.iss
scilab/modules/optimization/optimization.iss
scilab/modules/parallel/parallel.iss
scilab/modules/polynomials/polynomials.iss
scilab/modules/randlib/randlib.iss
scilab/modules/signal_processing/signal_processing.iss
scilab/modules/sound/sound.iss
scilab/modules/sparse/sparse.iss
scilab/modules/spreadsheet/spreadsheet.iss
scilab/modules/statistics/statistics.iss
scilab/modules/symbolic/symbolic.iss
scilab/modules/types/types.iss
scilab/modules/umfpack/umfpack.iss
scilab/tools/innosetup/Create_ISS.sce
scilab/tools/innosetup/code_modules.iss
scilab/tools/innosetup/components.iss
scilab/tools/innosetup/files.iss
scilab/tools/innosetup/icons.iss
scilab/tools/innosetup/types.iss

@@@ -455,62 -446,8 +455,62 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5", "modules\hdf5\src\c\hdf5.vcxproj", "{A824EA62-AF07-4F43-9036-0E63990556BD}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
 +      EndProjectSection
  EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scinotes", "modules\scinotes\src\c\scinotes.vcxproj", "{BAE68B54-2C1A-44D0-A0E9-05156A784E79}"
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "operations", "modules\operations\operations.vcxproj", "{1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
 +              {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
 +              {3735EFF9-925B-45B1-82CF-762658E69E70} = {3735EFF9-925B-45B1-82CF-762658E69E70}
 +      EndProjectSection
 +EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elem_func_gw", "modules\elementary_functions\sci_gateway\cpp\elem_func_gw\elem_func_gw.vcxproj", "{9881F0CE-A1AC-4744-B709-7C1453A77B95}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elementary_functions_gw", "modules\elementary_functions\sci_gateway\cpp\elem_func_gw\elem_func_gw.vcxproj", "{9881F0CE-A1AC-4744-B709-7C1453A77B95}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
 +              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_manager", "modules\functions_manager\functions_manager.vcxproj", "{8EAC9381-C059-43EA-B5D7-FD5D6997B0BD}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {9594AC02-20EE-4FBF-95B4-BFA5865ED7CA} = {9594AC02-20EE-4FBF-95B4-BFA5865ED7CA}
 +              {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parse", "modules\parse\parse.vcxproj", "{74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "symbol", "modules\symbol\symbol.vcxproj", "{2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types", "modules\types\types.vcxproj", "{64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "system_env", "modules\system_env\system_env.vcxproj", "{7CA60AEF-9AFA-4D06-AF28-613C0AA27640}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_yasp", "modules\core\core_yasp.vcxproj", "{14373D41-991A-412E-8EA7-A832D98047B8}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {A9A2020D-5541-44F2-B080-DF3C9426C409} = {A9A2020D-5541-44F2-B080-DF3C9426C409}
 +              {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
 +              {0AEC8745-BB5B-4E66-A59A-7251412C3605} = {0AEC8745-BB5B-4E66-A59A-7251412C3605}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boolean_gw", "modules\boolean\src\cpp\boolean_gw.vcxproj", "{09E6CF32-EF2F-4C63-A2B8-B04964768BD6}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_gw", "modules\core\src\cpp\core_gw.vcxproj", "{3E933EB6-D427-4828-9B30-B6B9987491F6}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "io_gw", "modules\io\src\cpp\io_gw.vcxproj", "{719EC179-3AD3-4C6B-BBD8-B44C96B1A204}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
 +              {C2EDD447-BB60-41A1-973B-8213FCA9ECD4} = {C2EDD447-BB60-41A1-973B-8213FCA9ECD4}
 +      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos", "modules\xcos\src\c\xcos.vcxproj", "{494FA8C9-6C85-4175-BE4C-9A113C7A3278}"
  EndProject
@@@ -631,12 -511,8 +631,18 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nographic_objects", "modules\graphic_objects\src\nographic_objects\nographic_objects.vcxproj", "{A910BD0C-8FAF-4382-B06A-F767E4752733}"
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gui_gw", "modules\gui\sci_gateway\cpp\gui_gw.vcxproj", "{83C04253-B152-4EF6-BB36-35A7B0FDFB98}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics_gw", "modules\graphics\sci_gateway\cpp\graphics_gw.vcxproj", "{61B23D9B-3F73-4204-98F7-6F41218F4564}"
 +EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external_objects", "modules\external_objects\external_objects.vcxproj", "{3142E52C-309A-41D9-BD12-7B7E9E3BDD44}"
  EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nogui", "modules\gui\src\nogui\nogui.vcxproj", "{58A50B97-FA8D-4700-9E4A-C4993638EB7A}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nohistory_browser", "modules\history_browser\src\nohistory_browser\nohistory_browser.vcxproj", "{6EA99B1F-99B4-4528-8195-7508EF70CFED}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nolibjvm", "modules\jvm\src\nojvm\nojvm.vcxproj", "{889AD61B-12E9-4F85-8525-B83C16C88C3F}"
++EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|Win32.Build.0 = Release|Win32
                {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|x64.ActiveCfg = Release|x64
                {3142E52C-309A-41D9-BD12-7B7E9E3BDD44}.Release|x64.Build.0 = Release|x64
++              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Debug|Win32.ActiveCfg = Debug|Win32
++              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Debug|Win32.Build.0 = Debug|Win32
++              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Debug|x64.ActiveCfg = Debug|x64
++              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Debug|x64.Build.0 = Debug|x64
++              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Release|Win32.ActiveCfg = Release|Win32
++              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Release|Win32.Build.0 = Release|Win32
++              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Release|x64.ActiveCfg = Release|x64
++              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Release|x64.Build.0 = Release|x64
++              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Debug|Win32.ActiveCfg = Debug|Win32
++              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Debug|Win32.Build.0 = Debug|Win32
++              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Debug|x64.ActiveCfg = Debug|x64
++              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Debug|x64.Build.0 = Debug|x64
++              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Release|Win32.ActiveCfg = Release|Win32
++              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Release|Win32.Build.0 = Release|Win32
++              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Release|x64.ActiveCfg = Release|x64
++              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Release|x64.Build.0 = Release|x64
++              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Debug|Win32.ActiveCfg = Debug|Win32
++              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Debug|Win32.Build.0 = Debug|Win32
++              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Debug|x64.ActiveCfg = Debug|x64
++              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Debug|x64.Build.0 = Debug|x64
++              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Release|Win32.ActiveCfg = Release|Win32
++              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Release|Win32.Build.0 = Release|Win32
++              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Release|x64.ActiveCfg = Release|x64
++              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
Simple merge
@@@ -698,10 -696,9 +698,10 @@@ if test "$enable_code_coverage" = yes; 
     if test -z "$GENHTML" ; then
          AC_MSG_ERROR([Cannot find genhtml. Please install it (package lcov under Debian) or remove the option --enable-code-coverage])
     fi
-    CODE_COVERAGE_LDFLAGS="-coverage"
+    CODECOVERAGE_LDFLAGS="-coverage -lgcov"
  fi
  AM_CONDITIONAL(CODE_COVERAGE, test "$enable_code_coverage" = yes)
 +AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = yes)
  
  # flag for possible compilations in configure
  SCILIBS_CFLAGS=''
   -->
  <!-- =================== -->
  <modules>
-     <module name="core" activate="yes"/>
-     <module name="types" activate="yes"/>
-     <module name="elementary_functions" activate="yes"/>
-     <module name="boolean" activate="yes"/>
-     <module name="integer" activate="yes"/>
-     <module name="io" activate="yes"/>
-     <module name="functions" activate="yes"/>
-     <module name="output_stream" activate="yes"/>
-     <module name="matio" activate="@MATIO_ENABLE@"/>
-     <module name="fileio" activate="yes"/>
-     <module name="development_tools" activate="yes"/>
-     <module name="gui" activate="@GUI_ENABLE@"/>
-     <module name="time" activate="yes"/>
-     <module name="overloading" activate="yes"/>
-     <module name="string" activate="yes"/>
-     <module name="scinotes" activate="@GUI_ENABLE@"/>
-     <module name="data_structures" activate="yes"/>
-     <module name="localization" activate="yes"/>
-     <module name="jvm" activate="@JAVA_ENABLE@"/>
-     <module name="helptools" activate="@HELP_ENABLE@"/>
-     <module name="hdf5" activate="yes"/>
-     <!-- <module name="xcos" activate="@GUI_ENABLE@"/> -->
-     <module name="dynamic_link" activate="yes"/>
-     <module name="action_binding" activate="yes"/>
-     <module name="mexlib" activate="yes"/>
-     <module name="history_manager" activate="yes"/>
-     <module name="console" activate="yes"/>
-     <module name="modules_manager" activate="yes"/>
-     <module name="signal_processing" activate="yes"/>
-     <module name="linear_algebra" activate="yes"/>
-     <module name="statistics" activate="yes"/>
-     <module name="differential_equations" activate="yes"/>
-     <module name="spreadsheet" activate="yes"/>
-     <module name="randlib" activate="yes"/>
-     <module name="atoms" activate="yes"/>
-     <module name="interpolation" activate="yes"/>
-     <module name="cacsd" activate="yes"/>
-     <module name="sound" activate="yes"/>
-     <module name="umfpack" activate="yes"/>
-     <module name="optimization" activate="yes"/>
-     <module name="special_functions" activate="yes"/>
-     <module name="graphics" activate="@GUI_ENABLE@"/>
-     <module name="demo_tools" activate="@GUI_ENABLE@"/>
-     <module name="graphic_export" activate="yes"/>
-     <module name="operations" activate="yes"/>
-     <module name="api_scilab" activate="yes"/>
-     <module name="ast" activate="yes"/>
-     <module name="polynomials" activate="yes"/>
+ <module name="core" activate="yes"/>
+ <module name="differential_equations" activate="yes"/>
+ <module name="double" activate="yes"/>
+ <module name="elementary_functions" activate="yes"/>
+ <module name="functions" activate="yes"/>
+ <module name="fileio" activate="yes"/>
+ <module name="graphics" activate="@GRAPHICS_ENABLE@"/>
+ <module name="renderer" activate="@GRAPHICS_ENABLE@"/>
+ <module name="graphic_export" activate="@GRAPHICS_ENABLE@"/>
+ <module name="boolean" activate="yes"/>
+ <module name="cacsd" activate="yes"/>
+ <module name="data_structures" activate="yes"/>
+ <module name="action_binding" activate="yes"/>
+ <module name="console" activate="yes"/>
+ <module name="completion" activate="yes"/>
+ <module name="history_manager" activate="yes"/>
+ <module name="gui" activate="@GUI_ENABLE@"/>
+ <module name="dynamic_link" activate="yes"/>
+ <module name="integer" activate="yes"/>
+ <module name="interpolation" activate="yes"/>
+ <module name="io" activate="yes"/>
+ <module name="output_stream" activate="yes"/>
+ <module name="intersci" activate="yes"/>
+ <module name="jvm" activate="@JAVA_ENABLE@"/>
+ <module name="commons" activate="yes"/>
+ <module name="linear_algebra" activate="yes"/>
+ <module name="localization" activate="yes"/>
+ <module name="optimization" activate="yes"/>
+ <module name="overloading" activate="yes"/>
+ <module name="polynomials" activate="yes"/>
+ <module name="signal_processing" activate="yes"/>
+ <module name="sparse" activate="yes"/>
+ <module name="special_functions" activate="yes"/>
+ <module name="string" activate="yes"/>
+ <module name="symbolic" activate="yes"/>
+ <module name="time" activate="yes"/>
+ <module name="statistics" activate="yes"/>
+ <module name="arnoldi" activate="yes"/>
+ <module name="compatibility_functions" activate="yes"/>
+ <module name="javasci" activate="@JAVASCI_ENABLE@"/>
+ <module name="m2sci" activate="yes"/>
+ <module name="mexlib" activate="yes"/>
+ <module name="tclsci" activate="@WITH_TKSCI@"/>
+ <module name="sound" activate="yes"/>
+ <module name="randlib" activate="yes"/>
+ <module name="development_tools" activate="yes"/>
+ <module name="demo_tools" activate="@DEMOTOOLS_ENABLE@"/>
+ <module name="spreadsheet" activate="yes"/>
+ <module name="call_scilab" activate="yes"/>
+ <!-- comments -->
 -<module name="scicos" activate="@XCOS_ENABLE@"/>
 -<module name="scicos_blocks" activate="@XCOS_ENABLE@"/>
++<module name="scicos" activate="no"/><!-- @XCOS_ENABLE@ -->
++<module name="scicos_blocks" activate="no"/><!-- @XCOS_ENABLE@ -->
+ <!-- comments -->
 -<module name="fftw" activate="@FFTW_ENABLE@"/>
++<module name="fftw" activate="no"/><!-- @FFTW_ENABLE@ -->
+ <module name="umfpack" activate="@UMFPACK_ENABLE@"/>
+ <module name="module_skeleton" activate="no"/>
+ <!-- comments -->
+ <module name="genetic_algorithms" activate="yes"/>
+ <module name="simulated_annealing" activate="yes"/>
+ <module name="parameters" activate="yes"/>
+ <module name="atoms" activate="yes"/>
+ <module name="matio" activate="@MATIO_ENABLE@"/>
+ <module name="types" activate="@JAVA_ENABLE@"/>
+ <module name="hdf5" activate="yes"/>
 -<module name="xcos" activate="@GUI_ENABLE@"/>
++<module name="xcos" activate="no"/><!-- @GUI_ENABLE@ -->
+ <module name="graphic_objects" activate="@GUI_ENABLE@"/>
+ <module name="scinotes" activate="@GUI_ENABLE@"/>
+ <module name="ui_data" activate="@GUI_ENABLE@"/>
+ <module name="api_scilab" activate="yes"/>
+ <module name="helptools" activate="@HELP_ENABLE@"/>
+ <module name="graph" activate="@JAVA_ENABLE@"/>
+ <module name="parallel" activate="yes"/>
+ <module name="modules_manager" activate="yes"/>
+ <module name="history_browser" activate="@JAVA_ENABLE@"/>
+ <module name="preferences" activate="@GUI_ENABLE@"/>
+ <module name="xml" activate="yes"/>
+ <module name="external_objects" activate="yes"/>
  </modules>
   -->
  <!-- =================== -->
  <modules>
 -<module name="core" activate="yes"/>
 -<module name="differential_equations" activate="yes"/>
 -<module name="double" activate="yes"/>
 -<module name="elementary_functions" activate="yes"/>
 -<module name="functions" activate="yes"/>
 -<module name="fileio" activate="yes"/>
 -<module name="graphics" activate="yes"/>
 -<module name="renderer" activate="yes"/>
 -<module name="graphic_export" activate="yes"/>
 -<module name="boolean" activate="yes"/>
 -<module name="cacsd" activate="yes"/>
 -<module name="data_structures" activate="yes"/>
 -<module name="action_binding" activate="yes"/>
 -<module name="console" activate="yes"/>
 -<module name="completion" activate="yes"/>
 -<module name="history_manager" activate="yes"/>
 -<module name="gui" activate="yes"/>
 -<module name="dynamic_link" activate="yes"/>
 -<module name="integer" activate="yes"/>
 -<module name="interpolation" activate="yes"/>
 -<module name="io" activate="yes"/>
 -<module name="output_stream" activate="yes"/>
 -<module name="intersci" activate="yes"/>
 -<module name="jvm" activate="yes"/>
 -<module name="commons" activate="yes"/>
 -<module name="linear_algebra" activate="yes"/>
 -<module name="localization" activate="yes"/>
 -<module name="optimization" activate="yes"/>
 -<module name="overloading" activate="yes"/>
 -<module name="polynomials" activate="yes"/>
 -<module name="signal_processing" activate="yes"/>
 -<module name="sparse" activate="yes"/>
 -<module name="special_functions" activate="yes"/>
 -<module name="string" activate="yes"/>
 -<module name="symbolic" activate="yes"/>
 -<module name="time" activate="yes"/>
 -<module name="windows_tools" activate="yes"/>
 -<module name="statistics" activate="yes"/>
 -<!-- comments -->
 -<module name="arnoldi" activate="yes"/>
 -<module name="compatibility_functions" activate="yes"/>
 -<module name="javasci" activate="yes"/>
 -<module name="m2sci" activate="yes"/>
 -<module name="mexlib" activate="yes"/>
 -<module name="tclsci" activate="yes"/>
 -<module name="sound" activate="yes"/>
 -<module name="randlib" activate="yes"/>
 -<module name="development_tools" activate="yes"/>
 -<module name="demo_tools" activate="yes"/>
 -<module name="spreadsheet" activate="yes"/>
 -<module name="call_scilab" activate="yes"/>
 -<!-- comments -->
 -<module name="scicos" activate="yes"/>
 -<module name="scicos_blocks" activate="yes"/>
 -<!-- comments -->
 -<module name="fftw" activate="yes"/>
 -<module name="umfpack" activate="yes"/>
 -<module name="module_skeleton" activate="no"/>
 -<!-- comments -->
 -<module name="genetic_algorithms" activate="yes"/>
 -<module name="simulated_annealing" activate="yes"/>
 -<module name="parameters" activate="yes"/>
 -<module name="matio" activate="yes"/>
 -<module name="atoms" activate="yes"/>
 -<module name="types" activate="yes"/>
 -<module name="hdf5" activate="yes"/>
 -<module name="xcos" activate="yes"/>
 -<module name="graphic_objects" activate="yes"/>
 -<module name="scinotes" activate="yes"/>
 -<module name="ui_data" activate="yes"/>
 -<module name="api_scilab" activate="yes"/>
 -<module name="helptools" activate="yes"/>
 -<module name="graph" activate="yes"/>
 -<module name="parallel" activate="yes"/>
 -<module name="modules_manager" activate="yes"/>
 -<module name="history_browser" activate="yes"/>
 -<module name="preferences" activate="yes"/>
 -<module name="xml" activate="yes"/>
 -<module name="external_objects" activate="yes"/>
 -<!-- comments -->
 +    <module name="core" activate="yes"/>
-     <module name="types" activate="yes"/>
++    <module name="differential_equations" activate="yes"/>
 +    <module name="elementary_functions" activate="yes"/>
++    <module name="functions" activate="yes"/>
++    <module name="fileio" activate="yes"/>
++    <module name="graphics" activate="yes"/>
++    <module name="renderer" activate="yes"/>
++    <module name="graphic_export" activate="yes"/>
 +    <module name="boolean" activate="yes"/>
++    <module name="cacsd" activate="yes"/>
++    <module name="data_structures" activate="yes"/>
++    <module name="action_binding" activate="yes"/>
++    <module name="console" activate="yes"/>
++    <module name="completion" activate="yes"/>
++    <module name="history_manager" activate="yes"/>
++    <module name="gui" activate="yes"/>
++    <module name="dynamic_link" activate="yes"/>
 +    <module name="integer" activate="yes"/>
++    <module name="interpolation" activate="yes"/>
 +    <module name="io" activate="yes"/>
-     <module name="functions" activate="yes"/>
 +    <module name="output_stream" activate="yes"/>
-     <module name="matio" activate="yes"/>
-     <module name="fileio" activate="yes"/>
-     <module name="development_tools" activate="yes"/>
-     <module name="gui" activate="yes"/>
-     <module name="time" activate="yes"/>
++    <module name="jvm" activate="yes"/>
++    <module name="commons" activate="yes"/>
++    <module name="linear_algebra" activate="yes"/>
++    <module name="localization" activate="yes"/>
++    <module name="optimization" activate="yes"/>
 +    <module name="overloading" activate="yes"/>
++    <module name="polynomials" activate="yes"/>
++    <module name="signal_processing" activate="yes"/>
++    <module name="sparse" activate="yes"/>
++    <module name="special_functions" activate="yes"/>
 +    <module name="string" activate="yes"/>
-     <module name="scinotes" activate="yes"/>
-     <module name="data_structures" activate="yes"/>
-     <module name="localization" activate="yes"/>
++    <module name="symbolic" activate="yes"/>
++    <module name="time" activate="yes"/>
 +    <module name="windows_tools" activate="yes"/>
-     <module name="jvm" activate="yes"/>
-     <module name="helptools" activate="yes"/>
-     <module name="hdf5" activate="yes"/>
-     <!-- <module name="xcos" activate="yes"/> -->
-     <module name="dynamic_link" activate="yes"/>
-     <module name="action_binding" activate="yes"/>
-     <module name="mexlib" activate="yes"/>
-     <module name="history_manager" activate="yes"/>
-     <module name="console" activate="yes"/>
-     <module name="modules_manager" activate="yes"/>
-     <module name="signal_processing" activate="yes"/>
-     <module name="linear_algebra" activate="yes"/>
 +    <module name="statistics" activate="yes"/>
-     <module name="differential_equations" activate="yes"/>
-     <module name="spreadsheet" activate="yes"/>
-     <module name="randlib" activate="yes"/>
-     <module name="atoms" activate="yes"/>
-     <module name="interpolation" activate="yes"/>
-     <module name="cacsd" activate="yes"/>
++    <module name="arnoldi" activate="yes"/>
++    <module name="compatibility_functions" activate="yes"/>
++    <module name="javasci" activate="yes"/>
++    <module name="m2sci" activate="yes"/>
++    <module name="mexlib" activate="yes"/>
++    <module name="tclsci" activate="yes"/>
 +    <module name="sound" activate="yes"/>
-     <module name="umfpack" activate="yes"/>
-     <module name="optimization" activate="yes"/>
-     <module name="special_functions" activate="yes"/>
-     <module name="graphics" activate="yes"/>
++    <module name="randlib" activate="yes"/>
++    <module name="development_tools" activate="yes"/>
 +    <module name="demo_tools" activate="yes"/>
-     <module name="graphic_export" activate="yes"/>
-     <module name="operations" activate="yes"/>
++    <module name="spreadsheet" activate="yes"/>
++    <module name="call_scilab" activate="yes"/>
++    <module name="scicos" activate="no"/>
++    <module name="scicos_blocks" activate="no"/>
++    <module name="fftw" activate="no"/>
++    <module name="umfpack" activate="yes"/>
++    <module name="module_skeleton" activate="no"/>
++    <module name="genetic_algorithms" activate="yes"/>
++    <module name="simulated_annealing" activate="yes"/>
++    <module name="parameters" activate="yes"/>
++    <module name="matio" activate="yes"/>
++    <module name="atoms" activate="yes"/>
++    <module name="types" activate="yes"/>
++    <module name="hdf5" activate="yes"/>
++    <module name="xcos" activate="no"/>
++    <module name="graphic_objects" activate="yes"/>
++    <module name="scinotes" activate="yes"/>
++    <module name="ui_data" activate="yes"/>
 +    <module name="api_scilab" activate="yes"/>
++    <module name="helptools" activate="yes"/>
++    <module name="graph" activate="yes"/>
++    <module name="parallel" activate="yes"/>
++    <module name="modules_manager" activate="yes"/>
++    <module name="history_browser" activate="yes"/>
++    <module name="preferences" activate="yes"/>
++    <module name="xml" activate="yes"/>
++    <module name="external_objects" activate="yes"/>
++    <module name="operations" activate="yes"/>
 +    <module name="ast" activate="yes"/>
-     <module name="polynomials" activate="yes"/>
  </modules>
  ;
  #define ARNOLDI "arnoldi"
  ;
- Source: bin\{#ARNOLDI}.dll; DestDir: {app}\bin; Components: {#COMPN_ARNOLDI};
- ;Source: bin\no{#ARNOLDI}.dll; DestDir: {app}\bin; DestName: arnoldi.dll; Components: not ({#COMPN_ARNOLDI})
+ Source: bin\{#ARNOLDI}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB};
 -;Source: bin\no{#ARNOLDI}.dll; DestDir: {app}\bin; DestName: arnoldi.dll; Components: not ({#COMPN_SCILAB})
  ;
- Source: bin\Arpack.dll; DestDir: {app}\bin; Components: {#COMPN_ARNOLDI}
+ Source: bin\Arpack.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#ARNOLDI}\license.txt; DestDir: {app}\modules\{#ARNOLDI}; Components: {#COMPN_ARNOLDI}
+ Source: modules\{#ARNOLDI}\license.txt; DestDir: {app}\modules\{#ARNOLDI}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#ARNOLDI}\sci_gateway\{#ARNOLDI}_gateway.xml; DestDir: {app}\modules\{#ARNOLDI}\sci_gateway; Components: {#COMPN_ARNOLDI}
+ Source: modules\{#ARNOLDI}\sci_gateway\{#ARNOLDI}_gateway.xml; DestDir: {app}\modules\{#ARNOLDI}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#ARNOLDI}\etc\{#ARNOLDI}.quit; DestDir: {app}\modules\{#ARNOLDI}\etc; Components: {#COMPN_ARNOLDI}
- Source: modules\{#ARNOLDI}\etc\{#ARNOLDI}.start; DestDir: {app}\modules\{#ARNOLDI}\etc; Components: {#COMPN_ARNOLDI}
+ Source: modules\{#ARNOLDI}\etc\{#ARNOLDI}.quit; DestDir: {app}\modules\{#ARNOLDI}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#ARNOLDI}\etc\{#ARNOLDI}.start; DestDir: {app}\modules\{#ARNOLDI}\etc; Components: {#COMPN_SCILAB}
  ;
 -;
 -;Source: modules\{#ARNOLDI}\includes\*.h; DestDir: {app}\modules\{#ARNOLDI}\includes; Components: {#COMPN_SCILAB}
 -;
 -Source: modules\{#ARNOLDI}\macros\lib; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#ARNOLDI}\macros\names; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#ARNOLDI}\macros\*.bin; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#ARNOLDI}\macros\*.sci; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#ARNOLDI}\macros\buildmacros.sce; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#ARNOLDI}\macros\buildmacros.bat; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#ARNOLDI}\macros\cleanmacros.bat; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_SCILAB}
 -;
 -;Source: modules\{#ARNOLDI}\demos\*.*; DestDir: {app}\modules\{#ARNOLDI}\demos; Components: {#COMPN_SCILAB}
++Source: modules\{#ARNOLDI}\macros\lib; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#ARNOLDI}\includes\*.h; DestDir: {app}\modules\{#ARNOLDI}\includes; Components: {#COMPN_ARNOLDI}
- ;
- Source: modules\{#ARNOLDI}\macros\*.sci; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_ARNOLDI}
- Source: modules\{#ARNOLDI}\macros\buildmacros.sce; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_ARNOLDI}
- Source: modules\{#ARNOLDI}\macros\buildmacros.bat; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_ARNOLDI}
- Source: modules\{#ARNOLDI}\macros\cleanmacros.bat; DestDir: {app}\modules\{#ARNOLDI}\macros; Components: {#COMPN_ARNOLDI}
- ;
- ;Source: modules\{#ARNOLDI}\demos\*.*; DestDir: {app}\modules\{#ARNOLDI}\demos; Components: {#COMPN_ARNOLDI}
- ;
- Source: modules\{#ARNOLDI}\tests\*.*; DestDir: {app}\modules\{#ARNOLDI}\tests; Flags: recursesubdirs; Components: {#COMPN_ARNOLDI} and {#COMPN_TESTS}
+ Source: modules\{#ARNOLDI}\tests\*.*; DestDir: {app}\modules\{#ARNOLDI}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
  ;
  ;--------------------------------------------------------------------------------------------------------------
@@@ -26,16 -26,18 +26,13 @@@ Source: modules\{#ATOMS}\etc\repositori
  Source: modules\{#ATOMS}\images\icons\16x16\emblems\*.png; DestDir: {app}\modules\{#ATOMS}\images\icons\16x16\emblems; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
  Source: modules\{#ATOMS}\images\icons\16x16\status\*.png; DestDir: {app}\modules\{#ATOMS}\images\icons\16x16\status; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
  ;
- Source: modules\{#ATOMS}\macros\lib; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_ATOMS}
- Source: modules\{#ATOMS}\macros\*.sci; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_ATOMS}
- Source: modules\{#ATOMS}\macros\buildmacros.sce; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_ATOMS}
- Source: modules\{#ATOMS}\macros\buildmacros.bat; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_ATOMS}
- Source: modules\{#ATOMS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_ATOMS}
+ Source: modules\{#ATOMS}\macros\lib; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -Source: modules\{#ATOMS}\macros\names; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -Source: modules\{#ATOMS}\macros\*.bin; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#ATOMS}\macros\*.sci; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#ATOMS}\macros\buildmacros.sce; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#ATOMS}\macros\buildmacros.bat; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#ATOMS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#ATOMS}\demos\*.*; DestDir: {app}\modules\{#ATOMS}\demos; Flags: recursesubdirs; Components: {#COMPN_ATOMS}
 -;Source: modules\{#ATOMS}\demos\*.*; DestDir: {app}\modules\{#ATOMS}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#ATOMS}\tests\*.*; DestDir: {app}\modules\{#ATOMS}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
  ;
- Source: modules\{#ATOMS}\tests\*.*; DestDir: {app}\modules\{#ATOMS}\tests; Flags: recursesubdirs; Components: {#COMPN_ATOMS} and {#COMPN_TESTS}
- ;
--;--------------------------------------------------------------------------------------------------------------
  #include BinariesSourcePath + "\contrib\external_modules.iss"
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define CACSD "cacsd"
  ;
- Source: bin\slicot_f.dll; DestDir: {app}\bin; Components: {#COMPN_CACSD}
- Source: bin\{#CACSD}_f.dll; DestDir: {app}\bin; Components: {#COMPN_CACSD}
- Source: bin\{#CACSD}.dll; DestDir: {app}\bin; Components: {#COMPN_CACSD}
+ Source: bin\slicot_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\{#CACSD}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\{#CACSD}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#CACSD}\license.txt; DestDir: {app}\modules\{#CACSD}; Components: {#COMPN_CACSD}
+ Source: modules\{#CACSD}\license.txt; DestDir: {app}\modules\{#CACSD}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#CACSD}\sci_gateway\{#CACSD}_gateway.xml; DestDir: {app}\modules\{#CACSD}\sci_gateway; Components: {#COMPN_CACSD}
+ Source: modules\{#CACSD}\sci_gateway\{#CACSD}_gateway.xml; DestDir: {app}\modules\{#CACSD}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#CACSD}\etc\{#CACSD}.quit; DestDir: {app}\modules\{#CACSD}\etc; Components: {#COMPN_CACSD}
- Source: modules\{#CACSD}\etc\{#CACSD}.start; DestDir: {app}\modules\{#CACSD}\etc; Components: {#COMPN_CACSD}
+ Source: modules\{#CACSD}\etc\{#CACSD}.quit; DestDir: {app}\modules\{#CACSD}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#CACSD}\etc\{#CACSD}.start; DestDir: {app}\modules\{#CACSD}\etc; Components: {#COMPN_SCILAB}
  ;
 -;
 -;Source: modules\{#CACSD}\includes\*.h; DestDir: {app}\modules\{#CACSD}\includes; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#CACSD}\macros\lib; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#CACSD}\macros\names; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#CACSD}\macros\*.bin; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#CACSD}\macros\*.sci; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#CACSD}\macros\buildmacros.sce; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#CACSD}\macros\buildmacros.bat; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#CACSD}\macros\cleanmacros.bat; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#CACSD}\includes\*.h; DestDir: {app}\modules\{#CACSD}\includes; Components: {#COMPN_CACSD}
+ Source: modules\{#CACSD}\demos\*.*; DestDir: {app}\modules\{#CACSD}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#CACSD}\macros\lib; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_CACSD}
- Source: modules\{#CACSD}\macros\*.sci; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_CACSD}
- Source: modules\{#CACSD}\macros\buildmacros.sce; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_CACSD}
- Source: modules\{#CACSD}\macros\buildmacros.bat; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_CACSD}
- Source: modules\{#CACSD}\macros\cleanmacros.bat; DestDir: {app}\modules\{#CACSD}\macros; Components: {#COMPN_CACSD}
- ;
- Source: modules\{#CACSD}\demos\*.*; DestDir: {app}\modules\{#CACSD}\demos; Flags: recursesubdirs; Components: {#COMPN_CACSD}
- ;
- Source: modules\{#CACSD}\tests\*.*; DestDir: {app}\modules\{#CACSD}\tests; Flags: recursesubdirs; Components: {#COMPN_CACSD} and {#COMPN_TESTS}
+ Source: modules\{#CACSD}\tests\*.*; DestDir: {app}\modules\{#CACSD}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
  ;--------------------------------------------------------------------------------------------------------------
@@@ -111,7 -115,7 +111,9 @@@ int Call_ScilabOpen(char *SCIpath, BOO
      }
  
      if (getCallScilabEngineState() == CALL_SCILAB_ENGINE_STARTED)
++    {
          return -1;
++    }
  
      SetFromCToON();
  
      }
  
      /* creates TMPDIR */
 -    C2F(settmpdir) ();
 +    defineTMPDIR();
  
      /* Scilab Initialization */
--    C2F(inisci) (&iflag, &StacksizeUsed, &ierr);
++    //C2F(inisci) (&iflag, &StacksizeUsed, &ierr);
  
      if (ierr > 0)
      {
@@@ -305,11 -326,9 +307,11 @@@ char *getLastErrorMessageSingle(void
  }
  
  /*--------------------------------------------------------------------------*/
-- int getLastErrorValue(void)
-- {
--     /* defined in lasterror.h */
-      // FIXME : Call system_env function
-      //return getInternalLastErrorValue();
-      return 0;
-  }
-  /*--------------------------------------------------------------------------*/
 -     return getInternalLastErrorValue();
 - }
 - /*--------------------------------------------------------------------------*/
++int getLastErrorValue(void)
++{
++    /* defined in lasterror.h */
++    // FIXME : Call system_env function
++    //return getInternalLastErrorValue();
++    return 0;
++}
++/*--------------------------------------------------------------------------*/
Simple merge
  ;
  #define COMPATFUNCTIONS "compatibility_functions"
  ;
- Source: modules\{#COMPATFUNCTIONS}\license.txt; DestDir: {app}\modules\{#COMPATFUNCTIONS}; Components: {#COMPN_COMPATFUNCTIONS}
+ Source: modules\{#COMPATFUNCTIONS}\license.txt; DestDir: {app}\modules\{#COMPATFUNCTIONS}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#COMPATFUNCTIONS}\etc\{#COMPATFUNCTIONS}.quit; DestDir: {app}\modules\{#COMPATFUNCTIONS}\etc; Components: {#COMPN_COMPATFUNCTIONS}
- Source: modules\{#COMPATFUNCTIONS}\etc\{#COMPATFUNCTIONS}.start; DestDir: {app}\modules\{#COMPATFUNCTIONS}\etc; Components: {#COMPN_COMPATFUNCTIONS}
+ Source: modules\{#COMPATFUNCTIONS}\etc\{#COMPATFUNCTIONS}.quit; DestDir: {app}\modules\{#COMPATFUNCTIONS}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#COMPATFUNCTIONS}\etc\{#COMPATFUNCTIONS}.start; DestDir: {app}\modules\{#COMPATFUNCTIONS}\etc; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#COMPATFUNCTIONS}\includes\*.h; DestDir: {app}\modules\{#COMPATFUNCTIONS}\includes; Components: {#COMPN_COMPATFUNCTIONS}
- ;
- ;Source: modules\{#COMPATFUNCTIONS}\macros\lib; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}
- Source: modules\{#COMPATFUNCTIONS}\macros\*.sci; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}
- Source: modules\{#COMPATFUNCTIONS}\macros\buildmacros.sce; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}
- Source: modules\{#COMPATFUNCTIONS}\macros\buildmacros.bat; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}
- Source: modules\{#COMPATFUNCTIONS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_COMPATFUNCTIONS}
- ;
- ;Source: modules\{#COMPATFUNCTIONS}\demos\*.*; DestDir: {app}\modules\{#COMPATFUNCTIONS}\demos; Flags: recursesubdirs; Components: {#COMPN_COMPATFUNCTIONS}
- ;
- Source: modules\{#COMPATFUNCTIONS}\tests\*.*; DestDir: {app}\modules\{#COMPATFUNCTIONS}\tests; Flags: recursesubdirs; Components: {#COMPN_COMPATFUNCTIONS} and {#COMPN_TESTS}
 -;Source: modules\{#COMPATFUNCTIONS}\includes\*.h; DestDir: {app}\modules\{#COMPATFUNCTIONS}\includes; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#COMPATFUNCTIONS}\macros\lib; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#COMPATFUNCTIONS}\macros\names; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#COMPATFUNCTIONS}\macros\*.bin; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#COMPATFUNCTIONS}\macros\*.sci; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#COMPATFUNCTIONS}\macros\buildmacros.sce; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#COMPATFUNCTIONS}\macros\buildmacros.bat; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#COMPATFUNCTIONS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#COMPATFUNCTIONS}\macros; Components: {#COMPN_SCILAB}
  ;
 -;Source: modules\{#COMPATFUNCTIONS}\demos\*.*; DestDir: {app}\modules\{#COMPATFUNCTIONS}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#COMPATFUNCTIONS}\tests\*.*; DestDir: {app}\modules\{#COMPATFUNCTIONS}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
 -;
  ;--------------------------------------------------------------------------------------------------------------
@@@ -7,13 -7,13 +7,4 @@@
  // are also available at    
  // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  
--function compatibility_functilib = startModule()
--
--//Load  functions libraries
--// =============================================================================
--  load(SCI+"/modules/compatibility_functions/macros/lib");
--
--endfunction
--
--compatibility_functilib = startModule();
--clear startModule;
++load(SCI+"/modules/compatibility_functions/macros/lib");
  #define CONSOLE "console"
  ;
  Source: bin\sci{#CONSOLE}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 +Source: bin\sci{#CONSOLE}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
- Source: bin\{#CONSOLE}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
++Source: bin\{#CONSOLE}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\no{#CONSOLE}.dll; DestDir: {app}\bin; DestName: sci{#CONSOLE}.dll; Components: {#COMPN_SCILAB} and not ({#COMPN_JVM_MODULE})
 +Source: bin\no{#CONSOLE}.lib; DestDir: {app}\bin; DestName: sci{#CONSOLE}.lib; Components: {#COMPN_SCILAB} and not ({#COMPN_JVM_MODULE})
  ;
  Source: modules\{#CONSOLE}\jar\org.scilab.modules.{#CONSOLE}.jar;DestDir: {app}\modules\{#CONSOLE}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
  Source: thirdparty\jrosetta-engine.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
@@@ -160,7 -160,7 +160,7 @@@ lib /DEF:"$(ProjectDir)core_f_Import.de
      <ClCompile>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../operations/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../c;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../fileio/includes;../../../jvm/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../history_manager/includes;../../../ui_data/includes;../../../jvm/includes;../../../fileio/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../operations/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../c;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../fileio/includes;../../../jvm/includes;../../../../libs/MALLOC/includes;../../../core/includes../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../types/includes;../../../ast/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -192,6 -192,6 +192,7 @@@ lib /DEF:"$(ProjectDir)core_f_Import.de
      <ClCompile Include="..\..\sci_gateway\c\sci_lines.c" />
      <ClCompile Include="..\..\sci_gateway\c\sci_prompt.c" />
      <ClCompile Include="..\..\sci_gateway\c\sci_tohome.c" />
++    <ClCompile Include="..\cpp\scilabRead.cpp" />
      <ClCompile Include="..\c\clc.c" />
      <ClCompile Include="..\c\DllmainConsole.c" />
      <ClCompile Include="..\c\GetCommandLine.c" />
@@@ -90,6 -90,6 +90,9 @@@
      <ClCompile Include="..\c\more.c">
        <Filter>Source Files</Filter>
      </ClCompile>
++    <ClCompile Include="..\cpp\scilabRead.cpp">
++      <Filter>Source Files</Filter>
++    </ClCompile>
    </ItemGroup>
    <ItemGroup>
      <ResourceCompile Include="noconsole.rc">
@@@ -8,17 -8,17 +8,8 @@@
  // are also available at
  // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  
- function startModule()
- // =============================================================================
- // Load functions libraries
- // =============================================================================
-   if ~isfile('SCI/modules/core/macros/lib') then
-     error(msprintf(gettext("%s: Could not find ''%s'': Please check that macros have been built.\n"), ..
-           "startModule", "SCI/modules/core/macros/lib"));
-   end
-   load('SCI/modules/core/macros/lib');
- endfunction
- startModule();
- clear startModule;
 -function corelib = startModule()
 -
 -// =============================================================================
 -// Load functions libraries
 -// =============================================================================
 -  if ~isfile('SCI/modules/core/macros/lib') then
 -    error(msprintf(gettext("%s: Could not find ''%s'': Please check that macros have been built.\n"), ..
 -          "startModule", "SCI/modules/core/macros/lib"));
 -  end
 -  load('SCI/modules/core/macros/lib');
 -endfunction
 -
 -corelib = startModule();
 -clear startModule;
++if ~isfile('SCI/modules/core/macros/lib') then
++error(msprintf(gettext("%s: Could not find ''%s'': Please check that macros have been built.\n"), ..
++      "startModule", "SCI/modules/core/macros/lib"));
++end
++load('SCI/modules/core/macros/lib');
index 0000000,0000000..3476eb4
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,12 @@@
++// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
++// Copyright (C) INRIA
++// 
++// This file must be used under the terms of the CeCILL.
++// This source file is licensed as described in the file COPYING, which
++// you should have received as part of this distribution.  The terms
++// are also available at    
++// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
++
++function intppty(varargin)
++  
++endfunction
@@@ -87,7 -87,7 +87,7 @@@ static OpTab Interfaces[INTERFACES_MAX
      /* 48  */ {gw_time},
      /* 49  */ {gw_dynamic_sound},
      /* 50  */ {gw_localization},
--    /* 51  */ {gw_fftw},
++    /* 51  */ {NULL}, //gw_fftw
      /* 52  */ {gw_jvm},
      /* 53  */ {gw_console},
      /* 54  */ {gw_completion},
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
--                              <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion
--cd $(ConfigurationName)
--set LIST_OBJ=
--for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
--&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
--copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
--del *.def &gt;nul
--cd .." Description="Build $(ProjectName).def"/>
--                              <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(ProjectDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)core.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)string.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)data_structures_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)data_structures_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)string_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)fftw_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)fftw.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)integer_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)integer_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)sparse_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)sparse_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)double_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)double.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)console.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)boolean_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)boolean_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)data_structures_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)data_structures.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
++                              <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion&#xA;cd $(ConfigurationName)&#xA;set LIST_OBJ=&#xA;for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f&#xA;&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%&#xA;copy $(ProjectName).def ..\$(ProjectName).def &gt;nul&#xA;del *.def &gt;nul&#xA;cd .." Description="Build $(ProjectName).def"/>
++                              <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(ProjectDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)core.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)data_structures_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)data_structures_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)string_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)fftw_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)fftw.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)integer_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)integer_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)sparse_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)sparse_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)double_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)double.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)console.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)boolean_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)boolean_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)data_structures_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)data_structures.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
--                              <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion
--cd $(ConfigurationName)
--set LIST_OBJ=
--for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
--&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
--copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
--del *.def &gt;nul
--cd .." Description="Build $(ProjectName).def"/>
--                              <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(ProjectDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)core.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)string.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)data_structures_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)data_structures_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)string_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)fftw_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)fftw.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)integer_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)integer_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)sparse_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)sparse_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)double_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)double.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)console.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)boolean_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)boolean_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)data_structures_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)data_structures.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
++                              <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion&#xA;cd $(ConfigurationName)&#xA;set LIST_OBJ=&#xA;for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f&#xA;&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%&#xA;copy $(ProjectName).def ..\$(ProjectName).def &gt;nul&#xA;del *.def &gt;nul&#xA;cd .." Description="Build $(ProjectName).def"/>
++                              <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(ProjectDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)core.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)data_structures_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)data_structures_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)string_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)fftw_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)fftw.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)integer_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)integer_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)sparse_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)sparse_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)double_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)double.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)console.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)boolean_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)boolean_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)data_structures_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)data_structures.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(ProjectDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
--                              <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion
--cd $(ConfigurationName)
--set LIST_OBJ=
--for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
--&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
--copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
--del *.def &gt;nul
--cd .." Description="Build $(ProjectName).def"/>
--                              <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(ProjectDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)core.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)string.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)data_structures_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)data_structures_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)string_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)fftw_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)fftw.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)integer_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)integer_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)sparse_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)sparse_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)double_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)double.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)console.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)boolean_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)boolean_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)data_structures_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)data_structures.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
++                              <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion&#xA;cd $(ConfigurationName)&#xA;set LIST_OBJ=&#xA;for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f&#xA;&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%&#xA;copy $(ProjectName).def ..\$(ProjectName).def &gt;nul&#xA;del *.def &gt;nul&#xA;cd .." Description="Build $(ProjectName).def"/>
++                              <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(ProjectDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)core.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)data_structures_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)data_structures_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)string_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)fftw_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)fftw.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)integer_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)integer_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)sparse_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)sparse_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)double_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)double.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)console.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)boolean_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)boolean_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)data_structures_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)data_structures.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
--                              <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion
--cd $(ConfigurationName)
--set LIST_OBJ=
--for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
--&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
--copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
--del *.def &gt;nul
--cd .." Description="Build $(ProjectName).def"/>
--                              <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(ProjectDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)core.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)string.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)data_structures_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)data_structures_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)string_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)fftw_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)fftw.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)integer_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)integer_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)sparse_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)sparse_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)double_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)double.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)console.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)boolean_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)boolean_f.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)data_structures_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)data_structures.lib&quot; 1&gt;NUL 2&gt;NUL
--lib /DEF:&quot;$(ProjectDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
++                              <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion&#xA;cd $(ConfigurationName)&#xA;set LIST_OBJ=&#xA;for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f&#xA;&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%&#xA;copy $(ProjectName).def ..\$(ProjectName).def &gt;nul&#xA;del *.def &gt;nul&#xA;cd .." Description="Build $(ProjectName).def"/>
++                              <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(ProjectDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)core.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)linpack_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)linpack_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)data_structures_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)data_structures_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)string_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)fftw_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)fftw.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)integer_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)integer_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)sparse_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)sparse_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)double_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)double.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)console.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)boolean_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)boolean_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)data_structures_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)data_structures.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(ProjectDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(ProjectDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
        <Files>
                <File RelativePath="hmcreate.f"/>
                <File RelativePath="hndlops.f"/>
                <File RelativePath="indxg.f"/>
--              <File RelativePath="inisci.f"/>
                <File RelativePath="intstr.f"/>
                <File RelativePath="isany.f"/>
                <File RelativePath="isbrk.f"/>
  ;
  #define DIFFEQU "differential_equations"
  ;
- Source: bin\{#DIFFEQU}_f.dll; DestDir: {app}\bin; Components: {#COMPN_EQUDIF}
- Source: bin\{#DIFFEQU}_f.lib; DestDir: {app}\bin; Components: {#COMPN_EQUDIF}
- Source: bin\{#DIFFEQU}.dll; DestDir: {app}\bin; Components: {#COMPN_EQUDIF}
- Source: bin\{#DIFFEQU}.lib; DestDir: {app}\bin; Components: {#COMPN_EQUDIF}
+ Source: bin\{#DIFFEQU}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
++Source: bin\{#DIFFEQU}_f.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\{#DIFFEQU}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#DIFFEQU}\license.txt; DestDir: {app}\modules\{#DIFFEQU}; Components: {#COMPN_EQUDIF}
+ Source: modules\{#DIFFEQU}\license.txt; DestDir: {app}\modules\{#DIFFEQU}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#DIFFEQU}\sci_gateway\{#DIFFEQU}_gateway.xml; DestDir: {app}\modules\{#DIFFEQU}\sci_gateway; Components: {#COMPN_EQUDIF}
+ Source: modules\{#DIFFEQU}\sci_gateway\{#DIFFEQU}_gateway.xml; DestDir: {app}\modules\{#DIFFEQU}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#DIFFEQU}\etc\{#DIFFEQU}.quit; DestDir: {app}\modules\{#DIFFEQU}\etc; Components: {#COMPN_EQUDIF}
- Source: modules\{#DIFFEQU}\etc\{#DIFFEQU}.start; DestDir: {app}\modules\{#DIFFEQU}\etc; Components: {#COMPN_EQUDIF}
+ Source: modules\{#DIFFEQU}\etc\{#DIFFEQU}.quit; DestDir: {app}\modules\{#DIFFEQU}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#DIFFEQU}\etc\{#DIFFEQU}.start; DestDir: {app}\modules\{#DIFFEQU}\etc; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#DIFFEQU}\includes\*.h; DestDir: {app}\modules\{#DIFFEQU}\includes; Components: {#COMPN_EQUDIF}
 -;Source: modules\{#DIFFEQU}\includes\*.h; DestDir: {app}\modules\{#DIFFEQU}\includes; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#DIFFEQU}\macros\lib; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -Source: modules\{#DIFFEQU}\macros\names; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -Source: modules\{#DIFFEQU}\macros\*.bin; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#DIFFEQU}\macros\*.sci; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#DIFFEQU}\macros\buildmacros.sce; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#DIFFEQU}\macros\buildmacros.bat; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#DIFFEQU}\macros\cleanmacros.bat; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#DIFFEQU}\macros\lib; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_EQUDIF}
- Source: modules\{#DIFFEQU}\macros\*.sci; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_EQUDIF}
- Source: modules\{#DIFFEQU}\macros\buildmacros.sce; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_EQUDIF}
- Source: modules\{#DIFFEQU}\macros\buildmacros.bat; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_EQUDIF}
- Source: modules\{#DIFFEQU}\macros\cleanmacros.bat; DestDir: {app}\modules\{#DIFFEQU}\macros; Flags: recursesubdirs; Components: {#COMPN_EQUDIF}
- ;
- Source: modules\{#DIFFEQU}\demos\*.*; DestDir: {app}\modules\{#DIFFEQU}\demos; Flags: recursesubdirs; Components: {#COMPN_EQUDIF}
- ;
- Source: modules\{#DIFFEQU}\tests\*.*; DestDir: {app}\modules\{#DIFFEQU}\tests; Flags: recursesubdirs; Components: {#COMPN_EQUDIF} and {#COMPN_TESTS}
+ Source: modules\{#DIFFEQU}\demos\*.*; DestDir: {app}\modules\{#DIFFEQU}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
+ Source: modules\{#DIFFEQU}\tests\*.*; DestDir: {app}\modules\{#DIFFEQU}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
 -;
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define EXTERNAL_OBJECTS "external_objects"
  ;
- Source: bin\external_objects.dll; DestDir: {app}\bin; Components: {#COMPN_EXTERNAL_OBJECTS}
- Source: bin\external_objects.lib; DestDir: {app}\bin; Components: {#COMPN_EXTERNAL_OBJECTS}
 -Source: bin\external_objects.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 -Source: bin\external_objects.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
++Source: bin\{#EXTERNAL_OBJECTS}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
++Source: bin\{#EXTERNAL_OBJECTS}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#EXTERNAL_OBJECTS}\sci_gateway\{#EXTERNAL_OBJECTS}_gateway.xml; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\sci_gateway; Components: {#COMPN_EXTERNAL_OBJECTS}
+ Source: modules\{#EXTERNAL_OBJECTS}\sci_gateway\{#EXTERNAL_OBJECTS}_gateway.xml; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#EXTERNAL_OBJECTS}\includes\*.h; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\includes; Components: {#COMPN_EXTERNAL_OBJECTS}
- Source: modules\{#EXTERNAL_OBJECTS}\includes\*.hxx; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\includes; Components: {#COMPN_EXTERNAL_OBJECTS}
+ Source: modules\{#EXTERNAL_OBJECTS}\includes\*.h; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\includes; Components: {#COMPN_SCILAB}
+ Source: modules\{#EXTERNAL_OBJECTS}\includes\*.hxx; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\includes; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#EXTERNAL_OBJECTS}\etc\{#EXTERNAL_OBJECTS}.quit; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\etc; Components: {#COMPN_EXTERNAL_OBJECTS}
- Source: modules\{#EXTERNAL_OBJECTS}\etc\{#EXTERNAL_OBJECTS}.start; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\etc; Components: {#COMPN_EXTERNAL_OBJECTS}
- ;
- Source: modules\{#EXTERNAL_OBJECTS}\macros\buildmacros.sce; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_EXTERNAL_OBJECTS}
- Source: modules\{#EXTERNAL_OBJECTS}\macros\buildmacros.bat; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_EXTERNAL_OBJECTS}
- Source: modules\{#EXTERNAL_OBJECTS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_EXTERNAL_OBJECTS}
- ;Source: modules\{#EXTERNAL_OBJECTS}\macros\*.bin; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_EXTERNAL_OBJECTS}
- Source: modules\{#EXTERNAL_OBJECTS}\macros\*.sci; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_EXTERNAL_OBJECTS}
- ;Source: modules\{#EXTERNAL_OBJECTS}\macros\lib; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_EXTERNAL_OBJECTS}
- ;Source: modules\{#EXTERNAL_OBJECTS}\macros\names; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_EXTERNAL_OBJECTS}
- ;
- ;Source: modules\{#EXTERNAL_OBJECTS}\tests\*.*; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\tests; Flags: recursesubdirs; Components: {#COMPN_EXTERNAL_OBJECTS} and {#COMPN_TESTS}
+ Source: modules\{#EXTERNAL_OBJECTS}\etc\{#EXTERNAL_OBJECTS}.quit; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#EXTERNAL_OBJECTS}\etc\{#EXTERNAL_OBJECTS}.start; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\etc; Components: {#COMPN_SCILAB}
  ;
+ Source: modules\{#EXTERNAL_OBJECTS}\macros\buildmacros.sce; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#EXTERNAL_OBJECTS}\macros\buildmacros.bat; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#EXTERNAL_OBJECTS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#EXTERNAL_OBJECTS}\macros\*.bin; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#EXTERNAL_OBJECTS}\macros\*.sci; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
++;Source: modules\{#EXTERNAL_OBJECTS}\macros\*.sci; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#EXTERNAL_OBJECTS}\macros\lib; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#EXTERNAL_OBJECTS}\macros\names; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\macros; Components: {#COMPN_SCILAB}
 -;
 -;Source: modules\{#EXTERNAL_OBJECTS}\tests\*.*; DestDir: {app}\modules\{#EXTERNAL_OBJECTS}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
 -;
  ;--------------------------------------------------------------------------------------------------------------
diff --cc scilab/modules/external_objects/macros/!_deff_wrapper.sci
index 8b2dff5,8b2dff5..0000000
deleted file mode 100644,100644
+++ /dev/null
@@@ -1,4 -1,4 +1,0 @@@
--function !_deff_wrapper(name, definition, code)
--    deff(definition, code);
--    execstr(name + '=resume(' + name + ')');
--endfunction
@@@ -24,11 -24,8 +24,12 @@@ Source: thirdparty\jlatexmath-1.0.0.jar
  Source: thirdparty\jlatexmath-fop-1.0.0.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
  ;
  Source: bin\{#GRAPHICS}.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
 +Source: bin\{#GRAPHICS}.lib; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
 +Source: bin\{#GRAPHICS}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
  ;
  Source: bin\no{#GRAPHICS}.dll; DestDir: {app}\bin; DestName: {#GRAPHICS}.dll; Components: not ({#COMPN_GRAPHICS})
 +Source: bin\no{#GRAPHICS}.lib; DestDir: {app}\bin; DestName: {#GRAPHICS}.lib; Components: not ({#COMPN_GRAPHICS})
++Source: bin\no{#GRAPHICS}.dll; DestDir: {app}\bin; DestName: {#GRAPHICS}_gw.dll; Components: not ({#COMPN_GRAPHICS})
  ;
  Source: modules\{#GRAPHICS}\sci_gateway\{#GRAPHICS}_gateway.xml; DestDir: {app}\modules\{#GRAPHICS}\sci_gateway; Components: {#COMPN_GRAPHICS}
  ;
  #include "MALLOC.h"
  
  /*--------------------------------------------------------------------------*/
 -int sci_plot2d1_1 (char *fname, unsigned long fname_len)
 +int sci_plot2d1_1 (char *fname, void *pvApiCtx)
  {
 -    return sci_plot2d1_G("plot2d1", 1, fname_len); /* NG */
 +    return sci_plot2d1_G("plot2d1", 1, pvApiCtx); /* NG */
  }
  /*--------------------------------------------------------------------------*/
 -int sci_plot2d1_2 (char *fname, unsigned long fname_len)
 +int sci_plot2d1_2 (char *fname, void *pvApiCtx)
  {
 -    return sci_plot2d1_G("plot2d2", 2, fname_len); /* NG */
 +    return sci_plot2d1_G("plot2d2", 2, pvApiCtx); /* NG */
  }
  /*--------------------------------------------------------------------------*/
 -int sci_plot2d1_3 (char *fname, unsigned long fname_len)
 +int sci_plot2d1_3 (char *fname, void *pvApiCtx)
  {
 -    return sci_plot2d1_G("plot2d3", 3, fname_len); /* NG */
 +    return sci_plot2d1_G("plot2d3", 3, pvApiCtx); /* NG */
  }
  /*--------------------------------------------------------------------------*/
 -int sci_plot2d1_4 (char *fname, unsigned long fname_len)
 +int sci_plot2d1_4 (char *fname, void *pvApiCtx)
  {
 -    return sci_plot2d1_G("plot2d4", 4, fname_len); /* NG */
 +    return sci_plot2d1_G("plot2d4", 4, pvApiCtx); /* NG */
  }
  /*--------------------------------------------------------------------------*/
 -int sci_plot2d1_G(char * fname, int ptype, unsigned long fname_len)
 +int sci_plot2d1_G(char * fname, int ptype, void *pvApiCtx)
  {
      SciErr sciErr;
      int* piAddrl1 = NULL;
      double* l1 = NULL;
      int* piAddrl2 = NULL;
@@@ -19,8 -19,7 +19,9 @@@
  #define GUI "gui"
  ;
  Source: bin\sci{#GUI}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 +Source: bin\{#GUI}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
- ;Source: bin\no{#GUI}.dll; DestDir: {app}\bin; DestName: sci{#GUI}.dll; Components: not( {#COMPN_JVM_MODULE} )
+ Source: bin\no{#GUI}.dll; DestDir: {app}\bin; DestName: sci{#GUI}.dll; Components: not( {#COMPN_JVM_MODULE} )
++Source: bin\no{#GUI}.dll; DestDir: {app}\bin; DestName: {#GUI}_gw.dll; Components: not( {#COMPN_JVM_MODULE} )
  ;
  
  Source: modules\{#GUI}\jar\org.scilab.modules.{#GUI}.jar; DestDir: {app}\modules\{#GUI}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
@@@ -76,8 -76,8 +76,8 @@@
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
        <Optimization>Disabled</Optimization>
--      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../../libs/dynamiclibrary/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
      </ClCompile>
@@@ -98,8 -98,8 +98,8 @@@
      </Midl>
      <ClCompile>
        <Optimization>Disabled</Optimization>
--      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../../libs/dynamiclibrary/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
      </ClCompile>
      <ClCompile>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
--      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../../libs/dynamiclibrary/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
      <ClCompile>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
--      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../../libs/dynamiclibrary/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
    </ItemDefinitionGroup>
    <ItemGroup>
      <ClCompile Include="nogui.c" />
++    <ClCompile Include="nogui_gw.cpp" />
    </ItemGroup>
    <ItemGroup>
      <ResourceCompile Include="nogui.rc" />
@@@ -21,6 -21,6 +21,9 @@@
      <ClCompile Include="nogui.c">
        <Filter>Source Files</Filter>
      </ClCompile>
++    <ClCompile Include="nogui_gw.cpp">
++      <Filter>Source Files</Filter>
++    </ClCompile>
    </ItemGroup>
    <ItemGroup>
      <ResourceCompile Include="nogui.rc">
  ;
  #define INTERPOLATION "interpolation"
  ;
- Source: bin\{#INTERPOLATION}_f.dll; DestDir: {app}\bin; Components: {#COMPN_INTERP}
- Source: bin\{#INTERPOLATION}_f.lib; DestDir: {app}\bin; Components: {#COMPN_INTERP}
- Source: bin\{#INTERPOLATION}.dll; DestDir: {app}\bin; Components: {#COMPN_INTERP}
- Source: bin\{#INTERPOLATION}.lib; DestDir: {app}\bin; Components: {#COMPN_INTERP}
+ Source: bin\{#INTERPOLATION}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
++Source: bin\{#INTERPOLATION}_f.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\{#INTERPOLATION}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#INTERPOLATION}\license.txt; DestDir: {app}\modules\{#INTERPOLATION}; Components: {#COMPN_INTERP}
+ Source: modules\{#INTERPOLATION}\license.txt; DestDir: {app}\modules\{#INTERPOLATION}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#INTERPOLATION}\sci_gateway\{#INTERPOLATION}_gateway.xml; DestDir: {app}\modules\{#INTERPOLATION}\sci_gateway; Components: {#COMPN_INTERP}
+ Source: modules\{#INTERPOLATION}\sci_gateway\{#INTERPOLATION}_gateway.xml; DestDir: {app}\modules\{#INTERPOLATION}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#INTERPOLATION}\etc\{#INTERPOLATION}.quit; DestDir: {app}\modules\{#INTERPOLATION}\etc; Components: {#COMPN_INTERP}
- Source: modules\{#INTERPOLATION}\etc\{#INTERPOLATION}.start; DestDir: {app}\modules\{#INTERPOLATION}\etc; Components: {#COMPN_INTERP}
+ Source: modules\{#INTERPOLATION}\etc\{#INTERPOLATION}.quit; DestDir: {app}\modules\{#INTERPOLATION}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#INTERPOLATION}\etc\{#INTERPOLATION}.start; DestDir: {app}\modules\{#INTERPOLATION}\etc; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#INTERPOLATION}\includes\*.h; DestDir: {app}\modules\{#INTERPOLATION}\includes; Components: {#COMPN_INTERP}
 -;Source: modules\{#INTERPOLATION}\includes\*.h; DestDir: {app}\modules\{#INTERPOLATION}\includes; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#INTERPOLATION}\macros\lib; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -Source: modules\{#INTERPOLATION}\macros\names; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -Source: modules\{#INTERPOLATION}\macros\*.bin; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#INTERPOLATION}\macros\*.sci; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#INTERPOLATION}\macros\buildmacros.sce; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#INTERPOLATION}\macros\buildmacros.bat; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#INTERPOLATION}\macros\cleanmacros.bat; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#INTERPOLATION}\macros\lib; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_INTERP}
- Source: modules\{#INTERPOLATION}\macros\*.sci; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_INTERP}
- Source: modules\{#INTERPOLATION}\macros\buildmacros.sce; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_INTERP}
- Source: modules\{#INTERPOLATION}\macros\buildmacros.bat; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_INTERP}
- Source: modules\{#INTERPOLATION}\macros\cleanmacros.bat; DestDir: {app}\modules\{#INTERPOLATION}\macros; Flags: recursesubdirs; Components: {#COMPN_INTERP}
- ;
- Source: modules\{#INTERPOLATION}\demos\*.*; DestDir: {app}\modules\{#INTERPOLATION}\demos; Flags: recursesubdirs; Components: {#COMPN_INTERP}
- ;
- Source: modules\{#INTERPOLATION}\tests\*.*; DestDir: {app}\modules\{#INTERPOLATION}\tests; Flags: recursesubdirs; Components:{#COMPN_INTERP} and {#COMPN_TESTS}
+ Source: modules\{#INTERPOLATION}\demos\*.*; DestDir: {app}\modules\{#INTERPOLATION}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
+ Source: modules\{#INTERPOLATION}\tests\*.*; DestDir: {app}\modules\{#INTERPOLATION}\tests; Flags: recursesubdirs; Components:{#COMPN_SCILAB} and {#COMPN_TESTS}
 -;
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #DEFINE JVM "jvm"
  ;
--Source: bin\lib{#JVM}.lib; DestDir: {app}\bin; Components: {#COMPN_JVM_MODULE}
 -Source: bin\nolib{#JVM}.lib; DestDir: {app}\bin; DestName: lib{#JVM}.lib; Components: not ({#COMPN_JVM_MODULE})
  ;
  Source: bin\lib{#JVM}.dll; DestDir: {app}\bin; Components: {#COMPN_JVM_MODULE}
++Source: bin\lib{#JVM}.lib; DestDir: {app}\bin; Components: {#COMPN_JVM_MODULE}
 +Source: bin\lib{#JVM}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_JVM_MODULE}
- ;Source: bin\nolib{#JVM}.dll; DestDir: {app}\bin; DestName: lib{#JVM}.dll; Components: not ({#COMPN_JVM_MODULE})
+ Source: bin\nolib{#JVM}.dll; DestDir: {app}\bin; DestName: lib{#JVM}.dll; Components: not ({#COMPN_JVM_MODULE})
++Source: bin\nolib{#JVM}.lib; DestDir: {app}\bin; DestName: lib{#JVM}.lib; Components: not ({#COMPN_JVM_MODULE})
++Source: bin\nolib{#JVM}.dll; DestDir: {app}\bin; DestName: lib{#JVM}_gw.dll; Components: not ({#COMPN_JVM_MODULE})
  ;
  Source: etc\classpath.xml; DestDir: {app}\etc; Components: {#COMPN_JVM_MODULE}
  Source: etc\librarypath.xml; DestDir: {app}\etc; Components: {#COMPN_JVM_MODULE}
@@@ -77,7 -77,7 +77,7 @@@
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
        <Optimization>Disabled</Optimization>
--      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
      </Midl>
      <ClCompile>
        <Optimization>Disabled</Optimization>
--      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
      <ClCompile>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
--      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <ClCompile>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
--      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    </ItemDefinitionGroup>
    <ItemGroup>
      <ClCompile Include="nojvm.c" />
++    <ClCompile Include="nojvm_gw.cpp" />
    </ItemGroup>
    <ItemGroup>
      <ResourceCompile Include="nojvm.rc" />
@@@ -24,6 -24,6 +24,9 @@@
      <ClCompile Include="nojvm.c">
        <Filter>Source Files</Filter>
      </ClCompile>
++    <ClCompile Include="nojvm_gw.cpp">
++      <Filter>Source Files</Filter>
++    </ClCompile>
    </ItemGroup>
    <ItemGroup>
      <ResourceCompile Include="nojvm.rc">
  ;
  #define LINEAR_ALGEBRA "linear_algebra"
  ;
- Source: bin\{#LINEAR_ALGEBRA}.dll; DestDir: {app}\bin; Components: {#COMPN_LINALG}
- Source: bin\{#LINEAR_ALGEBRA}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_LINALG}
- Source: bin\{#LINEAR_ALGEBRA}_f.dll; DestDir: {app}\bin; Components: {#COMPN_LINALG}
+ Source: bin\{#LINEAR_ALGEBRA}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
++Source: bin\{#LINEAR_ALGEBRA}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\{#LINEAR_ALGEBRA}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#LINEAR_ALGEBRA}\license.txt; DestDir: {app}\modules\{#LINEAR_ALGEBRA}; Components: {#COMPN_LINALG}
+ Source: modules\{#LINEAR_ALGEBRA}\license.txt; DestDir: {app}\modules\{#LINEAR_ALGEBRA}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#LINEAR_ALGEBRA}\sci_gateway\{#LINEAR_ALGEBRA}_gateway.xml; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\sci_gateway; Components: {#COMPN_LINALG}
+ Source: modules\{#LINEAR_ALGEBRA}\sci_gateway\{#LINEAR_ALGEBRA}_gateway.xml; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#LINEAR_ALGEBRA}\etc\{#LINEAR_ALGEBRA}.quit; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\etc; Components: {#COMPN_LINALG}
- Source: modules\{#LINEAR_ALGEBRA}\etc\{#LINEAR_ALGEBRA}.start; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\etc; Components: {#COMPN_LINALG}
+ Source: modules\{#LINEAR_ALGEBRA}\etc\{#LINEAR_ALGEBRA}.quit; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#LINEAR_ALGEBRA}\etc\{#LINEAR_ALGEBRA}.start; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\etc; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#LINEAR_ALGEBRA}\includes\*.h; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\includes; Components: {#COMPN_LINALG}
 -;Source: modules\{#LINEAR_ALGEBRA}\includes\*.h; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\includes; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#LINEAR_ALGEBRA}\macros\buildmacros.sce; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#LINEAR_ALGEBRA}\macros\buildmacros.bat; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#LINEAR_ALGEBRA}\macros\cleanmacros.bat; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#LINEAR_ALGEBRA}\macros\lib; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#LINEAR_ALGEBRA}\macros\names; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#LINEAR_ALGEBRA}\macros\*.bin; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#LINEAR_ALGEBRA}\macros\*.sci; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#LINEAR_ALGEBRA}\macros\buildmacros.sce; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_LINALG}
- Source: modules\{#LINEAR_ALGEBRA}\macros\buildmacros.bat; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_LINALG}
- Source: modules\{#LINEAR_ALGEBRA}\macros\cleanmacros.bat; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_LINALG}
- Source: modules\{#LINEAR_ALGEBRA}\macros\lib; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_LINALG}
- Source: modules\{#LINEAR_ALGEBRA}\macros\*.sci; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\macros; Components: {#COMPN_LINALG}
- ;
- ;Source: modules\{#LINEAR_ALGEBRA}\demos\*.*; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\demos; Flags: recursesubdirs;  Components: {#COMPN_LINALG}
- ;
- Source: modules\{#LINEAR_ALGEBRA}\examples\*.*; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\examples; Flags: recursesubdirs;  Components: {#COMPN_LINALG}
- ;
- Source: modules\{#LINEAR_ALGEBRA}\tests\*.*; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\tests; Flags: recursesubdirs; Components: {#COMPN_LINALG} and {#COMPN_TESTS}
 -;Source: modules\{#LINEAR_ALGEBRA}\demos\*.*; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\demos; Flags: recursesubdirs;  Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#LINEAR_ALGEBRA}\examples\*.*; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\examples; Flags: recursesubdirs;  Components: {#COMPN_SCILAB}
  ;
+ Source: modules\{#LINEAR_ALGEBRA}\tests\*.*; DestDir: {app}\modules\{#LINEAR_ALGEBRA}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
 -;
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define M2SCI "m2sci"
  ;
- Source: modules\{#M2SCI}\license.txt; DestDir: {app}\modules\{#M2SCI}; Components: {#COMPN_M2SCI}
+ Source: modules\{#M2SCI}\license.txt; DestDir: {app}\modules\{#M2SCI}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#M2SCI}\etc\{#M2SCI}.quit; DestDir: {app}\modules\{#M2SCI}\etc; Components: {#COMPN_M2SCI}
- Source: modules\{#M2SCI}\etc\{#M2SCI}.start; DestDir: {app}\modules\{#M2SCI}\etc; Components: {#COMPN_M2SCI}
+ Source: modules\{#M2SCI}\etc\{#M2SCI}.quit; DestDir: {app}\modules\{#M2SCI}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#M2SCI}\etc\{#M2SCI}.start; DestDir: {app}\modules\{#M2SCI}\etc; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#M2SCI}\macros\lib; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_M2SCI}
- Source: modules\{#M2SCI}\macros\*.sci; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_M2SCI}
- Source: modules\{#M2SCI}\macros\buildmacros.sce; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_M2SCI}
- Source: modules\{#M2SCI}\macros\buildmacros.bat; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_M2SCI}
- Source: modules\{#M2SCI}\macros\cleanmacros.bat; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_M2SCI}
+ Source: modules\{#M2SCI}\macros\lib; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -Source: modules\{#M2SCI}\macros\names; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -Source: modules\{#M2SCI}\macros\*.bin; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#M2SCI}\macros\*.sci; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#M2SCI}\macros\buildmacros.sce; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#M2SCI}\macros\buildmacros.bat; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#M2SCI}\macros\cleanmacros.bat; DestDir: {app}\modules\{#M2SCI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#M2SCI}\demos\*.*; DestDir: {app}\modules\{#M2SCI}\demos; Flags: recursesubdirs; Components: {#COMPN_M2SCI}
- ;
- Source: modules\{#M2SCI}\tests\*.*; DestDir: {app}\modules\{#M2SCI}\tests; Flags: recursesubdirs; Components: {#COMPN_M2SCI} and {#COMPN_TESTS}
 -;Source: modules\{#M2SCI}\demos\*.*; DestDir: {app}\modules\{#M2SCI}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#M2SCI}\tests\*.*; DestDir: {app}\modules\{#M2SCI}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
  ;
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define MATIO "matio"
  ;
- Source: bin\{#MATIO}.dll; DestDir: {app}\bin; Components: {#COMPN_MATIO}
- Source: bin\lib{#MATIO}.dll; DestDir: {app}\bin; Components: {#COMPN_MATIO}
+ Source: bin\{#MATIO}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\lib{#MATIO}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\{#MATIO}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#MATIO}\license.txt; DestDir: {app}\modules\{#MATIO}; Components: {#COMPN_MATIO}
+ Source: modules\{#MATIO}\license.txt; DestDir: {app}\modules\{#MATIO}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#MATIO}\etc\{#MATIO}.quit; DestDir: {app}\modules\{#MATIO}\etc; Components: {#COMPN_MATIO}
- Source: modules\{#MATIO}\etc\{#MATIO}.start; DestDir: {app}\modules\{#MATIO}\etc; Components: {#COMPN_MATIO}
+ Source: modules\{#MATIO}\etc\{#MATIO}.quit; DestDir: {app}\modules\{#MATIO}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#MATIO}\etc\{#MATIO}.start; DestDir: {app}\modules\{#MATIO}\etc; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#MATIO}\includes\*.h; DestDir: {app}\modules\{#MATIO}\includes; Components: {#COMPN_MATIO}
 -;Source: modules\{#MATIO}\includes\*.h; DestDir: {app}\modules\{#MATIO}\includes; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#MATIO}\macros\lib; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#MATIO}\macros\names; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#MATIO}\macros\*.bin; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#MATIO}\macros\*.sci; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#MATIO}\macros\buildmacros.sce; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#MATIO}\macros\buildmacros.bat; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#MATIO}\macros\cleanmacros.bat; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#MATIO}\macros\lib; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_MATIO}
- Source: modules\{#MATIO}\macros\*.sci; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_MATIO}
- Source: modules\{#MATIO}\macros\buildmacros.sce; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_MATIO}
- Source: modules\{#MATIO}\macros\buildmacros.bat; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_MATIO}
- Source: modules\{#MATIO}\macros\cleanmacros.bat; DestDir: {app}\modules\{#MATIO}\macros; Components: {#COMPN_MATIO}
- ;
- Source: modules\{#MATIO}\sci_gateway\{#MATIO}_gateway.xml; DestDir: {app}\modules\{#MATIO}\sci_gateway; Components: {#COMPN_MATIO}
- ;
- ;Source: modules\{#MATIO}\demos\*.*; DestDir: {app}\modules\{#MATIO}\demos; Flags: recursesubdirs; Components: {#COMPN_MATIO}
- ;
- Source: modules\{#MATIO}\tests\*.*; DestDir: {app}\modules\{#MATIO}\tests; Flags: recursesubdirs; Components: {#COMPN_MATIO} and {#COMPN_TESTS}
+ Source: modules\{#MATIO}\sci_gateway\{#MATIO}_gateway.xml; DestDir: {app}\modules\{#MATIO}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
 -;Source: modules\{#MATIO}\demos\*.*; DestDir: {app}\modules\{#MATIO}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#MATIO}\tests\*.*; DestDir: {app}\modules\{#MATIO}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
 -;
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define MEXLIB "mexlib"
  ;
- Source: bin\libmx.dll; DestDir: {app}\bin; Components: {#COMPN_MEXLIB}
- Source: bin\libmx.lib; DestDir: {app}\bin; Components: {#COMPN_MEXLIB}
- Source: bin\libmex.dll; DestDir: {app}\bin; Components: {#COMPN_MEXLIB}
- Source: bin\libmex.lib; DestDir: {app}\bin; Components: {#COMPN_MEXLIB}
- Source: bin\libmat.dll; DestDir: {app}\bin; Components: {#COMPN_MEXLIB}
- Source: bin\libmat.lib; DestDir: {app}\bin; Components: {#COMPN_MEXLIB}
+ Source: bin\libmx.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\libmx.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\libmex.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\libmex.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\libmat.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\libmat.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#MEXLIB}\license.txt; DestDir: {app}\modules\{#MEXLIB}; Components: {#COMPN_MEXLIB}
+ Source: modules\{#MEXLIB}\license.txt; DestDir: {app}\modules\{#MEXLIB}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#MEXLIB}\etc\{#MEXLIB}.quit; DestDir: {app}\modules\{#MEXLIB}\etc; Components: {#COMPN_MEXLIB}
- Source: modules\{#MEXLIB}\etc\{#MEXLIB}.start; DestDir: {app}\modules\{#MEXLIB}\etc; Components: {#COMPN_MEXLIB}
+ Source: modules\{#MEXLIB}\etc\{#MEXLIB}.quit; DestDir: {app}\modules\{#MEXLIB}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#MEXLIB}\etc\{#MEXLIB}.start; DestDir: {app}\modules\{#MEXLIB}\etc; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#MEXLIB}\includes\*.h; DestDir: {app}\modules\{#MEXLIB}\includes; Components: {#COMPN_MEXLIB}
+ Source: modules\{#MEXLIB}\includes\*.h; DestDir: {app}\modules\{#MEXLIB}\includes; Components: {#COMPN_SCILAB}
  ;
- ;;Source: modules\{#MEXLIB}\macros\lib; DestDir: {app}\modules\{#MEXLIB}\macros; Components: {#COMPN_MEXLIB}
- ;Source: modules\{#MEXLIB}\macros\*.sci; DestDir: {app}\modules\{#MEXLIB}\macros; Components: {#COMPN_MEXLIB}
- Source: modules\{#MEXLIB}\macros\buildmacros.sce; DestDir: {app}\modules\{#MEXLIB}\macros; Components: {#COMPN_MEXLIB}
- Source: modules\{#MEXLIB}\macros\buildmacros.bat; DestDir: {app}\modules\{#MEXLIB}\macros; Components: {#COMPN_MEXLIB}
- Source: modules\{#MEXLIB}\macros\cleanmacros.bat; DestDir: {app}\modules\{#MEXLIB}\macros; Components: {#COMPN_MEXLIB}
 -;Source: modules\{#MEXLIB}\macros\lib; DestDir: {app}\modules\{#MEXLIB}\macros; Components: {#COMPN_SCILAB}
 -;Source: modules\{#MEXLIB}\macros\names; DestDir: {app}\modules\{#MEXLIB}\macros; Components: {#COMPN_SCILAB}
 -;Source: modules\{#MEXLIB}\macros\*.bin; DestDir: {app}\modules\{#MEXLIB}\macros; Components: {#COMPN_SCILAB}
 -;Source: modules\{#MEXLIB}\macros\*.sci; DestDir: {app}\modules\{#MEXLIB}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#MEXLIB}\macros\buildmacros.sce; DestDir: {app}\modules\{#MEXLIB}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#MEXLIB}\macros\buildmacros.bat; DestDir: {app}\modules\{#MEXLIB}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#MEXLIB}\macros\cleanmacros.bat; DestDir: {app}\modules\{#MEXLIB}\macros; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#MEXLIB}\demos\*.*; DestDir: {app}\modules\{#MEXLIB}\demos; Flags: recursesubdirs; Components: {#COMPN_MEXLIB}
 -;Source: modules\{#MEXLIB}\demos\*.*; DestDir: {app}\modules\{#MEXLIB}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#MEXLIB}\examples\*.*; DestDir: {app}\modules\{#MEXLIB}\examples; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#MEXLIB}\examples\*.*; DestDir: {app}\modules\{#MEXLIB}\examples; Flags: recursesubdirs; Components: {#COMPN_MEXLIB}
- ;
- Source: modules\{#MEXLIB}\tests\*.*; DestDir: {app}\modules\{#MEXLIB}\tests; Flags: recursesubdirs; Components: {#COMPN_MEXLIB} and {#COMPN_TESTS}
+ Source: modules\{#MEXLIB}\tests\*.*; DestDir: {app}\modules\{#MEXLIB}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
  ;
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define OPTIMIZATION "optimization"
  ;
- Source: bin\{#OPTIMIZATION}_f.dll; DestDir: {app}\bin; Components: {#COMPN_OPTIM}
- Source: bin\{#OPTIMIZATION}_f.lib; DestDir: {app}\bin; Components: {#COMPN_OPTIM}
- Source: bin\{#OPTIMIZATION}.dll; DestDir: {app}\bin; Components: {#COMPN_OPTIM}
- Source: bin\{#OPTIMIZATION}.lib; DestDir: {app}\bin; Components: {#COMPN_OPTIM}
+ Source: bin\{#OPTIMIZATION}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\{#OPTIMIZATION}_f.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\{#OPTIMIZATION}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
++Source: bin\{#OPTIMIZATION}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#OPTIMIZATION}\license.txt; DestDir: {app}\modules\{#OPTIMIZATION}; Components: {#COMPN_OPTIM}
+ Source: modules\{#OPTIMIZATION}\license.txt; DestDir: {app}\modules\{#OPTIMIZATION}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#OPTIMIZATION}\sci_gateway\{#OPTIMIZATION}_gateway.xml; DestDir: {app}\modules\{#OPTIMIZATION}\sci_gateway; Components: {#COMPN_OPTIM}
+ Source: modules\{#OPTIMIZATION}\sci_gateway\{#OPTIMIZATION}_gateway.xml; DestDir: {app}\modules\{#OPTIMIZATION}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#OPTIMIZATION}\etc\{#OPTIMIZATION}.quit; DestDir: {app}\modules\{#OPTIMIZATION}\etc; Components: {#COMPN_OPTIM}
- Source: modules\{#OPTIMIZATION}\etc\{#OPTIMIZATION}.start; DestDir: {app}\modules\{#OPTIMIZATION}\etc; Components: {#COMPN_OPTIM}
+ Source: modules\{#OPTIMIZATION}\etc\{#OPTIMIZATION}.quit; DestDir: {app}\modules\{#OPTIMIZATION}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#OPTIMIZATION}\etc\{#OPTIMIZATION}.start; DestDir: {app}\modules\{#OPTIMIZATION}\etc; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#OPTIMIZATION}\includes\*.h; DestDir: {app}\modules\{#OPTIMIZATION}\includes; Components: {#COMPN_OPTIM}
 -;Source: modules\{#OPTIMIZATION}\includes\*.h; DestDir: {app}\modules\{#OPTIMIZATION}\includes; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#OPTIMIZATION}\macros\buildmacros.sce; DestDir: {app}\modules\{#OPTIMIZATION}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#OPTIMIZATION}\macros\buildmacros.bat; DestDir: {app}\modules\{#OPTIMIZATION}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#OPTIMIZATION}\macros\cleanmacros.bat; DestDir: {app}\modules\{#OPTIMIZATION}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#OPTIMIZATION}\macros\lib; DestDir: {app}\modules\{#OPTIMIZATION}\macros;Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -Source: modules\{#OPTIMIZATION}\macros\names; DestDir: {app}\modules\{#OPTIMIZATION}\macros;Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -Source: modules\{#OPTIMIZATION}\macros\*.bin; DestDir: {app}\modules\{#OPTIMIZATION}\macros;Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#OPTIMIZATION}\macros\*.sci; DestDir: {app}\modules\{#OPTIMIZATION}\macros;Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#OPTIMIZATION}\macros\buildmacros.sce; DestDir: {app}\modules\{#OPTIMIZATION}\macros; Components: {#COMPN_OPTIM}
- Source: modules\{#OPTIMIZATION}\macros\buildmacros.bat; DestDir: {app}\modules\{#OPTIMIZATION}\macros; Components: {#COMPN_OPTIM}
- Source: modules\{#OPTIMIZATION}\macros\cleanmacros.bat; DestDir: {app}\modules\{#OPTIMIZATION}\macros; Components: {#COMPN_OPTIM}
- Source: modules\{#OPTIMIZATION}\macros\lib; DestDir: {app}\modules\{#OPTIMIZATION}\macros;Flags: recursesubdirs; Components: {#COMPN_OPTIM}
- Source: modules\{#OPTIMIZATION}\macros\*.sci; DestDir: {app}\modules\{#OPTIMIZATION}\macros;Flags: recursesubdirs; Components: {#COMPN_OPTIM}
+ Source: modules\{#OPTIMIZATION}\demos\*.*; DestDir: {app}\modules\{#OPTIMIZATION}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#OPTIMIZATION}\demos\*.*; DestDir: {app}\modules\{#OPTIMIZATION}\demos; Flags: recursesubdirs; Components: {#COMPN_OPTIM}
- ;
- Source: modules\{#OPTIMIZATION}\tests\*.*; DestDir: {app}\modules\{#OPTIMIZATION}\tests; Flags: recursesubdirs; Components: {#COMPN_OPTIM}  and {#COMPN_TESTS}
+ Source: modules\{#OPTIMIZATION}\tests\*.*; DestDir: {app}\modules\{#OPTIMIZATION}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB}  and {#COMPN_TESTS}
  ;
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define PARALLEL "parallel"
  ;
- ;Source: bin\{#PARALLEL}.dll; DestDir: {app}\bin; Components: {#COMPN_PARALLEL}
 -#ifndef SCILAB_F2C
 -Source: bin\{#PARALLEL}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#PARALLEL}\license.txt; DestDir: {app}\modules\{#PARALLEL}; Components: {#COMPN_PARALLEL}
+ Source: modules\{#PARALLEL}\license.txt; DestDir: {app}\modules\{#PARALLEL}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#PARALLEL}\sci_gateway\{#PARALLEL}_gateway.xml; DestDir: {app}\modules\{#PARALLEL}\sci_gateway; Components: {#COMPN_PARALLEL}
+ Source: modules\{#PARALLEL}\sci_gateway\{#PARALLEL}_gateway.xml; DestDir: {app}\modules\{#PARALLEL}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#PARALLEL}\includes\*.h; DestDir: {app}\modules\{#PARALLEL}\includes; Components: {#COMPN_PARALLEL}
 -;Source: modules\{#PARALLEL}\includes\*.h; DestDir: {app}\modules\{#PARALLEL}\includes; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#PARALLEL}\etc\{#PARALLEL}.quit; DestDir: {app}\modules\{#PARALLEL}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#PARALLEL}\etc\{#PARALLEL}.start; DestDir: {app}\modules\{#PARALLEL}\etc; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#PARALLEL}\etc\{#PARALLEL}.quit; DestDir: {app}\modules\{#PARALLEL}\etc; Components: {#COMPN_PARALLEL}
- Source: modules\{#PARALLEL}\etc\{#PARALLEL}.start; DestDir: {app}\modules\{#PARALLEL}\etc; Components: {#COMPN_PARALLEL}
 -;
+ Source: modules\{#PARALLEL}\macros\buildmacros.sce; DestDir: {app}\modules\{#PARALLEL}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#PARALLEL}\macros\buildmacros.bat; DestDir: {app}\modules\{#PARALLEL}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#PARALLEL}\macros\cleanmacros.bat; DestDir: {app}\modules\{#PARALLEL}\macros; Components: {#COMPN_SCILAB}
 -;Source: modules\{#PARALLEL}\macros\*.bin; DestDir: {app}\modules\{#PARALLEL}\macros; Components: {#COMPN_SCILAB}
 -;Source: modules\{#PARALLEL}\macros\*.sci; DestDir: {app}\modules\{#PARALLEL}\macros; Components: {#COMPN_SCILAB}
 -;Source: modules\{#PARALLEL}\macros\lib; DestDir: {app}\modules\{#PARALLEL}\macros; Components: {#COMPN_SCILAB}
 -;Source: modules\{#PARALLEL}\macros\names; DestDir: {app}\modules\{#PARALLEL}\macros; Components: {#COMPN_SCILAB}
 -;
 -;Source: modules\{#PARALLEL}\demos\*.*; DestDir: {app}\modules\{#PARALLEL}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- ;
- Source: modules\{#PARALLEL}\macros\buildmacros.sce; DestDir: {app}\modules\{#PARALLEL}\macros; Components: {#COMPN_PARALLEL}
- Source: modules\{#PARALLEL}\macros\buildmacros.bat; DestDir: {app}\modules\{#PARALLEL}\macros; Components: {#COMPN_PARALLEL}
- Source: modules\{#PARALLEL}\macros\cleanmacros.bat; DestDir: {app}\modules\{#PARALLEL}\macros; Components: {#COMPN_PARALLEL}
- ;Source: modules\{#PARALLEL}\macros\*.sci; DestDir: {app}\modules\{#PARALLEL}\macros; Components: {#COMPN_PARALLEL}
- ;Source: modules\{#PARALLEL}\macros\lib; DestDir: {app}\modules\{#PARALLEL}\macros; Components: {#COMPN_PARALLEL}
- ;
- ;Source: modules\{#PARALLEL}\demos\*.*; DestDir: {app}\modules\{#PARALLEL}\demos; Flags: recursesubdirs; Components: {#COMPN_PARALLEL}
- ;
- Source: modules\{#PARALLEL}\tests\*.*; DestDir: {app}\modules\{#PARALLEL}\tests; Flags: recursesubdirs; Components: {#COMPN_TESTS} and {#COMPN_PARALLEL}
+ Source: modules\{#PARALLEL}\tests\*.*; DestDir: {app}\modules\{#PARALLEL}\tests; Flags: recursesubdirs; Components: {#COMPN_TESTS} and {#COMPN_SCILAB}
+ #endif
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define POLYNOMIALS "polynomials"
  ;
- Source: bin\{#POLYNOMIALS}.dll; DestDir: {app}\bin; Components: {#COMPN_POLY}
- Source: bin\{#POLYNOMIALS}.lib; DestDir: {app}\bin; Components: {#COMPN_POLY}
- Source: bin\{#POLYNOMIALS}_f.dll; DestDir: {app}\bin; Components: {#COMPN_POLY}
- Source: bin\{#POLYNOMIALS}_f.lib; DestDir: {app}\bin; Components: {#COMPN_POLY}
+ Source: bin\{#POLYNOMIALS}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\{#POLYNOMIALS}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#POLYNOMIALS}\license.txt; DestDir: {app}\modules\{#POLYNOMIALS}; Components: {#COMPN_POLY}
+ Source: modules\{#POLYNOMIALS}\license.txt; DestDir: {app}\modules\{#POLYNOMIALS}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#POLYNOMIALS}\sci_gateway\{#POLYNOMIALS}_gateway.xml; DestDir: {app}\modules\{#POLYNOMIALS}\sci_gateway; Components: {#COMPN_POLY}
+ Source: modules\{#POLYNOMIALS}\sci_gateway\{#POLYNOMIALS}_gateway.xml; DestDir: {app}\modules\{#POLYNOMIALS}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#POLYNOMIALS}\etc\{#POLYNOMIALS}.quit; DestDir: {app}\modules\{#POLYNOMIALS}\etc; Components: {#COMPN_POLY}
- Source: modules\{#POLYNOMIALS}\etc\{#POLYNOMIALS}.start; DestDir: {app}\modules\{#POLYNOMIALS}\etc; Components: {#COMPN_POLY}
+ Source: modules\{#POLYNOMIALS}\etc\{#POLYNOMIALS}.quit; DestDir: {app}\modules\{#POLYNOMIALS}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#POLYNOMIALS}\etc\{#POLYNOMIALS}.start; DestDir: {app}\modules\{#POLYNOMIALS}\etc; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#POLYNOMIALS}\includes\*.h; DestDir: {app}\modules\{#POLYNOMIALS}\includes; Components: {#COMPN_POLY}
 -;Source: modules\{#POLYNOMIALS}\includes\*.h; DestDir: {app}\modules\{#POLYNOMIALS}\includes; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#POLYNOMIALS}\macros\buildmacros.sce; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#POLYNOMIALS}\macros\buildmacros.bat; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#POLYNOMIALS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#POLYNOMIALS}\macros\lib; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#POLYNOMIALS}\macros\names; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#POLYNOMIALS}\macros\*.bin; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#POLYNOMIALS}\macros\*.sci; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#POLYNOMIALS}\macros\buildmacros.sce; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_POLY}
- Source: modules\{#POLYNOMIALS}\macros\buildmacros.bat; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_POLY}
- Source: modules\{#POLYNOMIALS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_POLY}
- Source: modules\{#POLYNOMIALS}\macros\lib; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_POLY}
- Source: modules\{#POLYNOMIALS}\macros\*.sci; DestDir: {app}\modules\{#POLYNOMIALS}\macros; Components: {#COMPN_POLY}
+ Source: modules\{#POLYNOMIALS}\demos\*.*; DestDir: {app}\modules\{#POLYNOMIALS}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#POLYNOMIALS}\demos\*.*; DestDir: {app}\modules\{#POLYNOMIALS}\demos; Flags: recursesubdirs; Components: {#COMPN_POLY}
- ;
- Source: modules\{#POLYNOMIALS}\tests\*.*; DestDir: {app}\modules\{#POLYNOMIALS}\tests; Flags: recursesubdirs; Components: {#COMPN_POLY} and {#COMPN_TESTS}
+ Source: modules\{#POLYNOMIALS}\tests\*.*; DestDir: {app}\modules\{#POLYNOMIALS}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
  ;
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define RANDLIB "randlib"
  ;
- Source: bin\{#RANDLIB}.dll; DestDir: {app}\bin; Components: {#COMPN_RANDLIB}
- Source: bin\{#RANDLIB}_f.dll; DestDir: {app}\bin; Components: {#COMPN_RANDLIB}
+ Source: bin\{#RANDLIB}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\{#RANDLIB}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#RANDLIB}\license.txt; DestDir: {app}\modules\{#RANDLIB}; Components: {#COMPN_RANDLIB}
+ Source: modules\{#RANDLIB}\license.txt; DestDir: {app}\modules\{#RANDLIB}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#RANDLIB}\sci_gateway\{#RANDLIB}_gateway.xml; DestDir: {app}\modules\{#RANDLIB}\sci_gateway; Components: {#COMPN_RANDLIB}
+ Source: modules\{#RANDLIB}\sci_gateway\{#RANDLIB}_gateway.xml; DestDir: {app}\modules\{#RANDLIB}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#RANDLIB}\etc\{#RANDLIB}.quit; DestDir: {app}\modules\{#RANDLIB}\etc; Components: {#COMPN_RANDLIB}
- Source: modules\{#RANDLIB}\etc\{#RANDLIB}.start; DestDir: {app}\modules\{#RANDLIB}\etc; Components: {#COMPN_RANDLIB}
+ Source: modules\{#RANDLIB}\etc\{#RANDLIB}.quit; DestDir: {app}\modules\{#RANDLIB}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#RANDLIB}\etc\{#RANDLIB}.start; DestDir: {app}\modules\{#RANDLIB}\etc; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#RANDLIB}\includes\*.h; DestDir: {app}\modules\{#RANDLIB}\includes; Components: {#COMPN_RANDLIB}
 -;Source: modules\{#RANDLIB}\includes\*.h; DestDir: {app}\modules\{#RANDLIB}\includes; Components: {#COMPN_SCILAB}
 -;
 -;Source: modules\{#RANDLIB}\macros\lib; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -;Source: modules\{#RANDLIB}\macros\names; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -;Source: modules\{#RANDLIB}\macros\*.bin; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -;Source: modules\{#RANDLIB}\macros\*.sci; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#RANDLIB}\macros\buildmacros.sce; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#RANDLIB}\macros\buildmacros.bat; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#RANDLIB}\macros\cleanmacros.bat; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#RANDLIB}\macros\lib; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_RANDLIB}
- ;Source: modules\{#RANDLIB}\macros\*.sci; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_RANDLIB}
- Source: modules\{#RANDLIB}\macros\buildmacros.sce; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_RANDLIB}
- Source: modules\{#RANDLIB}\macros\buildmacros.bat; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_RANDLIB}
- Source: modules\{#RANDLIB}\macros\cleanmacros.bat; DestDir: {app}\modules\{#RANDLIB}\macros; Flags: recursesubdirs; Components: {#COMPN_RANDLIB}
+ Source: modules\{#RANDLIB}\demos\*.*; DestDir: {app}\modules\{#RANDLIB}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#RANDLIB}\demos\*.*; DestDir: {app}\modules\{#RANDLIB}\demos; Flags: recursesubdirs; Components: {#COMPN_RANDLIB}
- ;
- Source: modules\{#RANDLIB}\tests\*.*; DestDir: {app}\modules\{#RANDLIB}\tests; Flags: recursesubdirs; Components: {#COMPN_RANDLIB} and {#COMPN_TESTS}
+ Source: modules\{#RANDLIB}\tests\*.*; DestDir: {app}\modules\{#RANDLIB}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
  ;
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define SIGPROC "signal_processing"
  ;
- Source: bin\{#SIGPROC}_f.dll; DestDir: {app}\bin; Components:  {#COMPN_SIGPROC}
- Source: bin\{#SIGPROC}.dll; DestDir: {app}\bin; Components:  {#COMPN_SIGPROC}
- Source: bin\{#SIGPROC}_gw.dll; DestDir: {app}\bin; Components:  {#COMPN_SIGPROC}
+ Source: bin\{#SIGPROC}_f.dll; DestDir: {app}\bin; Components:  {#COMPN_SCILAB}
+ Source: bin\{#SIGPROC}.dll; DestDir: {app}\bin; Components:  {#COMPN_SCILAB}
++Source: bin\{#SIGPROC}_gw.dll; DestDir: {app}\bin; Components:  {#COMPN_SCILAB}
  ;
- Source: modules\{#SIGPROC}\license.txt; DestDir: {app}\modules\signal_processing; Components: {#COMPN_SIGPROC}
+ Source: modules\{#SIGPROC}\license.txt; DestDir: {app}\modules\signal_processing; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SIGPROC}\sci_gateway\{#SIGPROC}_gateway.xml; DestDir: {app}\modules\{#SIGPROC}\sci_gateway; Components: {#COMPN_SIGPROC}
+ Source: modules\{#SIGPROC}\sci_gateway\{#SIGPROC}_gateway.xml; DestDir: {app}\modules\{#SIGPROC}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SIGPROC}\etc\{#SIGPROC}.quit; DestDir: {app}\modules\{#SIGPROC}\etc; Components: {#COMPN_SIGPROC}
- Source: modules\{#SIGPROC}\etc\{#SIGPROC}.start; DestDir: {app}\modules\{#SIGPROC}\etc; Components: {#COMPN_SIGPROC}
+ Source: modules\{#SIGPROC}\etc\{#SIGPROC}.quit; DestDir: {app}\modules\{#SIGPROC}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#SIGPROC}\etc\{#SIGPROC}.start; DestDir: {app}\modules\{#SIGPROC}\etc; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SIGPROC}\macros\lib; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SIGPROC}
- Source: modules\{#SIGPROC}\macros\*.sci; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SIGPROC}
- Source: modules\{#SIGPROC}\macros\buildmacros.sce; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SIGPROC}
- Source: modules\{#SIGPROC}\macros\buildmacros.bat; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SIGPROC}
- Source: modules\{#SIGPROC}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SIGPROC}
+ Source: modules\{#SIGPROC}\macros\lib; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#SIGPROC}\macros\names; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#SIGPROC}\macros\*.bin; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#SIGPROC}\macros\*.sci; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#SIGPROC}\macros\buildmacros.sce; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#SIGPROC}\macros\buildmacros.bat; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#SIGPROC}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SIGPROC}\macros; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SIGPROC}\demos\*.*; DestDir: {app}\modules\{#SIGPROC}\demos; Flags: recursesubdirs; Components: {#COMPN_SIGPROC}
+ Source: modules\{#SIGPROC}\demos\*.*; DestDir: {app}\modules\{#SIGPROC}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SIGPROC}\tests\*.*; DestDir: {app}\modules\{#SIGPROC}\tests; Flags: recursesubdirs; Components: {#COMPN_SIGPROC} and {#COMPN_TESTS}
+ Source: modules\{#SIGPROC}\tests\*.*; DestDir: {app}\modules\{#SIGPROC}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define SOUND "sound"
  ;
- Source: bin\sound.dll; DestDir: {app}\bin; Components: {#COMPN_SOUND}
 -Source: bin\sound.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
++Source: bin\{#SOUND}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SOUND}\license.txt; DestDir: {app}\modules\{#SOUND}; Components: {#COMPN_SOUND}
+ Source: modules\{#SOUND}\license.txt; DestDir: {app}\modules\{#SOUND}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SOUND}\sci_gateway\{#SOUND}_gateway.xml; DestDir: {app}\modules\{#SOUND}\sci_gateway; Components: {#COMPN_SOUND}
+ Source: modules\{#SOUND}\sci_gateway\{#SOUND}_gateway.xml; DestDir: {app}\modules\{#SOUND}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#SOUND}\includes\*.h; DestDir: {app}\modules\{#SOUND}\includes; Components: {#COMPN_SOUND}
 -;Source: modules\{#SOUND}\includes\*.h; DestDir: {app}\modules\{#SOUND}\includes; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#SOUND}\etc\{#SOUND}.quit; DestDir: {app}\modules\{#SOUND}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#SOUND}\etc\{#SOUND}.start; DestDir: {app}\modules\{#SOUND}\etc; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SOUND}\etc\{#SOUND}.quit; DestDir: {app}\modules\{#SOUND}\etc; Components: {#COMPN_SOUND}
- Source: modules\{#SOUND}\etc\{#SOUND}.start; DestDir: {app}\modules\{#SOUND}\etc; Components: {#COMPN_SOUND}
+ Source: modules\{#SOUND}\macros\buildmacros.sce; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#SOUND}\macros\buildmacros.bat; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#SOUND}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#SOUND}\macros\*.bin; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#SOUND}\macros\*.sci; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#SOUND}\macros\lib; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#SOUND}\macros\names; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SOUND}\macros\buildmacros.sce; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SOUND}
- Source: modules\{#SOUND}\macros\buildmacros.bat; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SOUND}
- Source: modules\{#SOUND}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SOUND}
- Source: modules\{#SOUND}\macros\*.sci; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SOUND}
- Source: modules\{#SOUND}\macros\lib; DestDir: {app}\modules\{#SOUND}\macros; Components: {#COMPN_SOUND}
+ Source: modules\{#SOUND}\demos\*.*; DestDir: {app}\modules\{#SOUND}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SOUND}\demos\*.*; DestDir: {app}\modules\{#SOUND}\demos; Flags: recursesubdirs; Components: {#COMPN_SOUND}
- ;
- Source: modules\{#SOUND}\tests\*.*; DestDir: {app}\modules\{#SOUND}\tests; Flags: recursesubdirs; Components: {#COMPN_SOUND} and {#COMPN_TESTS}
+ Source: modules\{#SOUND}\tests\*.*; DestDir: {app}\modules\{#SOUND}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
  ;
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define SPARSE "sparse"
  ;
- Source: bin\{#SPARSE}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SPARSE}
- Source: bin\{#SPARSE}.dll; DestDir: {app}\bin; Components: {#COMPN_SPARSE}
+ Source: bin\{#SPARSE}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\{#SPARSE}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SPARSE}\license.txt; DestDir: {app}\modules\{#SPARSE}; Components: {#COMPN_SPARSE}
+ Source: modules\{#SPARSE}\license.txt; DestDir: {app}\modules\{#SPARSE}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SPARSE}\sci_gateway\{#SPARSE}_gateway.xml; DestDir: {app}\modules\{#SPARSE}\sci_gateway; Components: {#COMPN_SPARSE}
+ Source: modules\{#SPARSE}\sci_gateway\{#SPARSE}_gateway.xml; DestDir: {app}\modules\{#SPARSE}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SPARSE}\etc\{#SPARSE}.quit; DestDir: {app}\modules\{#SPARSE}\etc; Components: {#COMPN_SPARSE}
- Source: modules\{#SPARSE}\etc\{#SPARSE}.start; DestDir: {app}\modules\{#SPARSE}\etc; Components: {#COMPN_SPARSE}
+ Source: modules\{#SPARSE}\etc\{#SPARSE}.quit; DestDir: {app}\modules\{#SPARSE}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#SPARSE}\etc\{#SPARSE}.start; DestDir: {app}\modules\{#SPARSE}\etc; Components: {#COMPN_SCILAB}
  ;
 -;
 -;Source: modules\{#SPARSE}\includes\*.h; DestDir: {app}\modules\{#SPARSE}\includes; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#SPARSE}\macros\buildmacros.sce; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#SPARSE}\macros\buildmacros.bat; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#SPARSE}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#SPARSE}\macros\lib; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#SPARSE}\macros\names; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#SPARSE}\macros\*.bin; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SCILAB}
++;Source: modules\{#SPARSE}\macros\lib; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#SPARSE}\macros\*.sci; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#SPARSE}\includes\*.h; DestDir: {app}\modules\{#SPARSE}\includes; Components: {#COMPN_SPARSE}
- ;
- Source: modules\{#SPARSE}\macros\buildmacros.sce; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SPARSE}
- Source: modules\{#SPARSE}\macros\buildmacros.bat; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SPARSE}
- Source: modules\{#SPARSE}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SPARSE}
- ;Source: modules\{#SPARSE}\macros\lib; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SPARSE}
- Source: modules\{#SPARSE}\macros\*.sci; DestDir: {app}\modules\{#SPARSE}\macros; Components: {#COMPN_SPARSE}
- ;
- ;Source: modules\{#SPARSE}\demos\*.*; DestDir: {app}\modules\{#SPARSE}\demos; Flags: recursesubdirs;  Components: {#COMPN_SPARSE}
- ;
- Source: modules\{#SPARSE}\tests\*.*; DestDir: {app}\modules\{#SPARSE}\tests; Flags: recursesubdirs; Components: {#COMPN_SPARSE} and {#COMPN_TESTS}
 -;Source: modules\{#SPARSE}\demos\*.*; DestDir: {app}\modules\{#SPARSE}\demos; Flags: recursesubdirs;  Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#SPARSE}\tests\*.*; DestDir: {app}\modules\{#SPARSE}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
  ;
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define SPREADSHEET "spreadsheet"
  ;
- Source: bin\{#SPREADSHEET}.dll; DestDir: {app}\bin; Components: {#COMPN_SPREADSHEET}
+ Source: bin\{#SPREADSHEET}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SPREADSHEET}\license.txt; DestDir: {app}\modules\{#SPREADSHEET}; Components: {#COMPN_SPREADSHEET}
+ Source: modules\{#SPREADSHEET}\license.txt; DestDir: {app}\modules\{#SPREADSHEET}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SPREADSHEET}\sci_gateway\{#SPREADSHEET}_gateway.xml; DestDir: {app}\modules\{#SPREADSHEET}\sci_gateway; Components: {#COMPN_SPREADSHEET}
+ Source: modules\{#SPREADSHEET}\sci_gateway\{#SPREADSHEET}_gateway.xml; DestDir: {app}\modules\{#SPREADSHEET}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#SPREADSHEET}\includes\*.h; DestDir: {app}\modules\{#SPREADSHEET}\includes; Components: {#COMPN_SPREADSHEET}
+ ;Source: modules\{#SPREADSHEET}\includes\*.h; DestDir: {app}\modules\{#SPREADSHEET}\includes; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SPREADSHEET}\etc\{#SPREADSHEET}.quit; DestDir: {app}\modules\{#SPREADSHEET}\etc; Components: {#COMPN_SPREADSHEET}
- Source: modules\{#SPREADSHEET}\etc\{#SPREADSHEET}.start; DestDir: {app}\modules\{#SPREADSHEET}\etc; Components: {#COMPN_SPREADSHEET}
+ Source: modules\{#SPREADSHEET}\etc\{#SPREADSHEET}.quit; DestDir: {app}\modules\{#SPREADSHEET}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#SPREADSHEET}\etc\{#SPREADSHEET}.start; DestDir: {app}\modules\{#SPREADSHEET}\etc; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SPREADSHEET}\macros\buildmacros.sce; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SPREADSHEET}
- Source: modules\{#SPREADSHEET}\macros\buildmacros.bat; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SPREADSHEET}
- Source: modules\{#SPREADSHEET}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SPREADSHEET}
- Source: modules\{#SPREADSHEET}\macros\*.sci; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SPREADSHEET}
- Source: modules\{#SPREADSHEET}\macros\lib; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SPREADSHEET}
+ Source: modules\{#SPREADSHEET}\macros\buildmacros.sce; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#SPREADSHEET}\macros\buildmacros.bat; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#SPREADSHEET}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#SPREADSHEET}\macros\*.bin; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#SPREADSHEET}\macros\*.sci; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#SPREADSHEET}\macros\lib; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#SPREADSHEET}\macros\names; DestDir: {app}\modules\{#SPREADSHEET}\macros; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SPREADSHEET}\demos\*.*; DestDir: {app}\modules\{#SPREADSHEET}\demos; Flags: recursesubdirs; Components: {#COMPN_SPREADSHEET}
+ Source: modules\{#SPREADSHEET}\demos\*.*; DestDir: {app}\modules\{#SPREADSHEET}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SPREADSHEET}\tests\*.*; DestDir: {app}\modules\{#SPREADSHEET}\tests; Flags: recursesubdirs; Components: {#COMPN_SPREADSHEET} and {#COMPN_TESTS}
+ Source: modules\{#SPREADSHEET}\tests\*.*; DestDir: {app}\modules\{#SPREADSHEET}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
  ;
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define STATISTICS "statistics"
  
- Source: bin\{#STATISTICS}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_STATS}
- Source: bin\{#STATISTICS}.dll; DestDir: {app}\bin; Components: {#COMPN_STATS}
- Source: bin\dcd_f.dll; DestDir: {app}\bin; Components: {#COMPN_STATS}
++Source: bin\{#STATISTICS}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\{#STATISTICS}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\dcd_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#STATISTICS}\license.txt; DestDir: {app}\modules\{#STATISTICS}; Components: {#COMPN_STATS}
+ Source: modules\{#STATISTICS}\license.txt; DestDir: {app}\modules\{#STATISTICS}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#STATISTICS}\sci_gateway\{#STATISTICS}_gateway.xml; DestDir: {app}\modules\{#STATISTICS}\sci_gateway; Components: {#COMPN_STATS}
+ Source: modules\{#STATISTICS}\sci_gateway\{#STATISTICS}_gateway.xml; DestDir: {app}\modules\{#STATISTICS}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#STATISTICS}\etc\{#STATISTICS}.quit; DestDir: {app}\modules\{#STATISTICS}\etc; Components: {#COMPN_STATS}
- Source: modules\{#STATISTICS}\etc\{#STATISTICS}.start; DestDir: {app}\modules\{#STATISTICS}\etc; Components: {#COMPN_STATS}
+ Source: modules\{#STATISTICS}\etc\{#STATISTICS}.quit; DestDir: {app}\modules\{#STATISTICS}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#STATISTICS}\etc\{#STATISTICS}.start; DestDir: {app}\modules\{#STATISTICS}\etc; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#STATISTICS}\macros\lib; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_STATS}
- Source: modules\{#STATISTICS}\macros\*.sci; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_STATS}
- Source: modules\{#STATISTICS}\macros\buildmacros.sce; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_STATS}
- Source: modules\{#STATISTICS}\macros\buildmacros.bat; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_STATS}
- Source: modules\{#STATISTICS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_STATS}
+ Source: modules\{#STATISTICS}\macros\lib; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#STATISTICS}\macros\names; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#STATISTICS}\macros\*.bin; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#STATISTICS}\macros\*.sci; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#STATISTICS}\macros\buildmacros.sce; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#STATISTICS}\macros\buildmacros.bat; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#STATISTICS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#STATISTICS}\macros; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#STATISTICS}\demos\*.*; DestDir: {app}\modules\{#STATISTICS}\demos; Flags: recursesubdirs; Components: {#COMPN_STATS}
- ;
- Source: modules\{#STATISTICS}\tests\*.*; DestDir: {app}\modules\{#STATISTICS}\tests; Flags: recursesubdirs; Components: {#COMPN_STATS} and {#COMPN_TESTS}
 -;Source: modules\{#STATISTICS}\demos\*.*; DestDir: {app}\modules\{#STATISTICS}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#STATISTICS}\tests\*.*; DestDir: {app}\modules\{#STATISTICS}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
  ;
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define SYMBOLIC "symbolic"
  ;
- Source: bin\{#SYMBOLIC}.dll; DestDir: {app}\bin; DestName: {#SYMBOLIC}.dll; Components: {#COMPN_SYMB}
- Source: bin\{#SYMBOLIC}_f.dll; DestDir: {app}\bin; DestName: {#SYMBOLIC}_f.dll; Components: {#COMPN_SYMB}
+ Source: bin\{#SYMBOLIC}.dll; DestDir: {app}\bin; DestName: {#SYMBOLIC}.dll; Components: {#COMPN_SCILAB}
+ Source: bin\{#SYMBOLIC}_f.dll; DestDir: {app}\bin; DestName: {#SYMBOLIC}_f.dll; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SYMBOLIC}\license.txt; DestDir: {app}\modules\{#SYMBOLIC}; Components: {#COMPN_SYMB}
+ Source: modules\{#SYMBOLIC}\license.txt; DestDir: {app}\modules\{#SYMBOLIC}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SYMBOLIC}\sci_gateway\{#SYMBOLIC}_gateway.xml; DestDir: {app}\modules\{#SYMBOLIC}\sci_gateway; Components: {#COMPN_SYMB}
+ Source: modules\{#SYMBOLIC}\sci_gateway\{#SYMBOLIC}_gateway.xml; DestDir: {app}\modules\{#SYMBOLIC}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#SYMBOLIC}\etc\{#SYMBOLIC}.quit; DestDir: {app}\modules\{#SYMBOLIC}\etc; Components: {#COMPN_SYMB}
- Source: modules\{#SYMBOLIC}\etc\{#SYMBOLIC}.start; DestDir: {app}\modules\{#SYMBOLIC}\etc; Components: {#COMPN_SYMB}
+ Source: modules\{#SYMBOLIC}\etc\{#SYMBOLIC}.quit; DestDir: {app}\modules\{#SYMBOLIC}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#SYMBOLIC}\etc\{#SYMBOLIC}.start; DestDir: {app}\modules\{#SYMBOLIC}\etc; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#SYMBOLIC}\includes\*.h; DestDir: {app}\modules\{#SYMBOLIC}\includes; Components: {#COMPN_SYMB}
 -;Source: modules\{#SYMBOLIC}\includes\*.h; DestDir: {app}\modules\{#SYMBOLIC}\includes; Components: {#COMPN_SCILAB}
 -;
 -;Source: modules\{#SYMBOLIC}\macros\lib; DestDir: {app}\modules\{#SYMBOLIC}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -;Source: modules\{#SYMBOLIC}\macros\names; DestDir: {app}\modules\{#SYMBOLIC}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -;Source: modules\{#SYMBOLIC}\macros\*.bin; DestDir: {app}\modules\{#SYMBOLIC}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -;Source: modules\{#SYMBOLIC}\macros\*.sci; DestDir: {app}\modules\{#SYMBOLIC}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#SYMBOLIC}\macros\buildmacros.sce; DestDir: {app}\modules\{#SYMBOLIC}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#SYMBOLIC}\macros\buildmacros.bat; DestDir: {app}\modules\{#SYMBOLIC}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+ Source: modules\{#SYMBOLIC}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SYMBOLIC}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#SYMBOLIC}\macros\lib; DestDir: {app}\modules\{#SYMBOLIC}\macros; Flags: recursesubdirs; Components: {#COMPN_SYMB}
- ;Source: modules\{#SYMBOLIC}\macros\*.sci; DestDir: {app}\modules\{#SYMBOLIC}\macros; Flags: recursesubdirs; Components: {#COMPN_SYMB}
- Source: modules\{#SYMBOLIC}\macros\buildmacros.sce; DestDir: {app}\modules\{#SYMBOLIC}\macros; Flags: recursesubdirs; Components: {#COMPN_SYMB}
- Source: modules\{#SYMBOLIC}\macros\buildmacros.bat; DestDir: {app}\modules\{#SYMBOLIC}\macros; Flags: recursesubdirs; Components: {#COMPN_SYMB}
- Source: modules\{#SYMBOLIC}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SYMBOLIC}\macros; Flags: recursesubdirs; Components: {#COMPN_SYMB}
- ;
- ;Source: modules\{#SYMBOLIC}\demos\*.*; DestDir: {app}\modules\{#SYMBOLIC}\demos; Flags: recursesubdirs; Components: {#COMPN_SYMB}
- ;
- Source: modules\{#SYMBOLIC}\tests\*.*; DestDir: {app}\modules\{#SYMBOLIC}\tests; Flags: recursesubdirs; Components: {#COMPN_SYMB} and {#COMPN_TESTS}
 -;Source: modules\{#SYMBOLIC}\demos\*.*; DestDir: {app}\modules\{#SYMBOLIC}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#SYMBOLIC}\tests\*.*; DestDir: {app}\modules\{#SYMBOLIC}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
  ;
  ;--------------------------------------------------------------------------------------------------------------
@@@ -25,15 -23,14 +25,15 @@@ Source: modules\{#TYPES}\jar\org.scilab
  ;
  Source: modules\{#TYPES}\license.txt; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
  ;
--Source: modules\{#TYPES}\etc\{#TYPES}.quit; DestDir: {app}\modules\{#TYPES}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
--Source: modules\{#TYPES}\etc\{#TYPES}.start; DestDir: {app}\modules\{#TYPES}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
++Source: modules\{#TYPES}\etc\{#TYPES}.quit; DestDir: {app}\modules\{#TYPES}\etc; Components: {#COMPN_SCILAB}
++Source: modules\{#TYPES}\etc\{#TYPES}.start; DestDir: {app}\modules\{#TYPES}\etc; Components: {#COMPN_SCILAB}
  ;
--Source: modules\{#TYPES}\macros\buildmacros.sce; DestDir: {app}\modules\{#TYPES}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
--Source: modules\{#TYPES}\macros\buildmacros.bat; DestDir: {app}\modules\{#TYPES}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
--Source: modules\{#TYPES}\macros\cleanmacros.bat; DestDir: {app}\modules\{#TYPES}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
- Source: modules\{#TYPES}\macros\lib; DestDir: {app}\modules\{#TYPES}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
++Source: modules\{#TYPES}\macros\buildmacros.sce; DestDir: {app}\modules\{#TYPES}\macros; Components: {#COMPN_SCILAB}
++Source: modules\{#TYPES}\macros\buildmacros.bat; DestDir: {app}\modules\{#TYPES}\macros; Components: {#COMPN_SCILAB}
++Source: modules\{#TYPES}\macros\cleanmacros.bat; DestDir: {app}\modules\{#TYPES}\macros; Components: {#COMPN_SCILAB}
++Source: modules\{#TYPES}\macros\lib; DestDir: {app}\modules\{#TYPES}\macros; Components: {#COMPN_SCILAB}
  ;
--;Source: modules\{#TYPES}\tests\*.*; DestDir: {app}\modules\{#TYPES}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
++Source: modules\{#TYPES}\tests\*.*; DestDir: {app}\modules\{#TYPES}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
  ;
  ;
  ;--------------------------------------------------------------------------------------------------------------
  ;
  #define UMFPACK "umfpack"
  ;
- Source: bin\no{#UMFPACK}.dll; DestDir: {app}\bin; DestName: {#UMFPACK}.dll; Components: not ({#COMPN_UMFPACK})
- Source: bin\no{#UMFPACK}.lib; DestDir: {app}\bin; DestName: {#UMFPACK}.lib; Components: not ({#COMPN_UMFPACK})
- Source: bin\lib{#UMFPACK}.dll; DestDir: {app}\bin; Components: {#COMPN_UMFPACK}
- Source: bin\lib{#UMFPACK}.lib; DestDir: {app}\bin; Components: {#COMPN_UMFPACK}
- Source: bin\{#UMFPACK}.dll; DestDir: {app}\bin; Components: {#COMPN_UMFPACK}
- Source: bin\{#UMFPACK}.lib; DestDir: {app}\bin; Components: {#COMPN_UMFPACK}
 -Source: bin\no{#UMFPACK}.dll; DestDir: {app}\bin; DestName: {#UMFPACK}.dll; Components: not ({#COMPN_SCILAB})
+ Source: bin\lib{#UMFPACK}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\{#UMFPACK}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#UMFPACK}\license.txt; DestDir: {app}\modules\{#UMFPACK}; Components: {#COMPN_UMFPACK}
+ Source: modules\{#UMFPACK}\license.txt; DestDir: {app}\modules\{#UMFPACK}; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#UMFPACK}\sci_gateway\{#UMFPACK}_gateway.xml; DestDir: {app}\modules\{#UMFPACK}\sci_gateway; Components: {#COMPN_UMFPACK}
+ Source: modules\{#UMFPACK}\sci_gateway\{#UMFPACK}_gateway.xml; DestDir: {app}\modules\{#UMFPACK}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#UMFPACK}\etc\{#UMFPACK}.quit; DestDir: {app}\modules\{#UMFPACK}\etc; Components: {#COMPN_UMFPACK}
- Source: modules\{#UMFPACK}\etc\{#UMFPACK}.start; DestDir: {app}\modules\{#UMFPACK}\etc; Components: {#COMPN_UMFPACK}
+ Source: modules\{#UMFPACK}\etc\{#UMFPACK}.quit; DestDir: {app}\modules\{#UMFPACK}\etc; Components: {#COMPN_SCILAB}
+ Source: modules\{#UMFPACK}\etc\{#UMFPACK}.start; DestDir: {app}\modules\{#UMFPACK}\etc; Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#UMFPACK}\includes\*.h; DestDir: {app}\modules\{#UMFPACK}\includes; Components: {#COMPN_UMFPACK}
+ ;Source: modules\{#UMFPACK}\includes\*.h; DestDir: {app}\modules\{#UMFPACK}\includes; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#UMFPACK}\macros\buildmacros.sce; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_UMFPACK}
- Source: modules\{#UMFPACK}\macros\buildmacros.bat; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_UMFPACK}
- Source: modules\{#UMFPACK}\macros\cleanmacros.bat; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_UMFPACK}
- Source: modules\{#UMFPACK}\macros\lib; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_UMFPACK}
- Source: modules\{#UMFPACK}\macros\*.sci; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_UMFPACK}
+ Source: modules\{#UMFPACK}\macros\buildmacros.sce; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#UMFPACK}\macros\buildmacros.bat; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#UMFPACK}\macros\cleanmacros.bat; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#UMFPACK}\macros\lib; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#UMFPACK}\macros\names; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_SCILAB}
 -Source: modules\{#UMFPACK}\macros\*.bin; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_SCILAB}
+ Source: modules\{#UMFPACK}\macros\*.sci; DestDir: {app}\modules\{#UMFPACK}\macros; Components: {#COMPN_SCILAB}
  ;
- Source: modules\{#UMFPACK}\examples\*.*; DestDir: {app}\modules\{#UMFPACK}\examples; Flags: recursesubdirs;  Components: {#COMPN_UMFPACK}
+ Source: modules\{#UMFPACK}\examples\*.*; DestDir: {app}\modules\{#UMFPACK}\examples; Flags: recursesubdirs;  Components: {#COMPN_SCILAB}
  ;
- ;Source: modules\{#UMFPACK}\demos\*.*; DestDir: {app}\modules\{#UMFPACK}\demos; Flags: recursesubdirs;  Components: {#COMPN_UMFPACK}
- ;
- Source: modules\{#UMFPACK}\tests\*.*; DestDir: {app}\modules\{#UMFPACK}\tests; Flags: recursesubdirs; Components: {#COMPN_UMFPACK} and {#COMPN_TESTS}
 -;Source: modules\{#UMFPACK}\demos\*.*; DestDir: {app}\modules\{#UMFPACK}\demos; Flags: recursesubdirs;  Components: {#COMPN_SCILAB}
 -;
+ Source: modules\{#UMFPACK}\tests\*.*; DestDir: {app}\modules\{#UMFPACK}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
  ;
  ;--------------------------------------------------------------------------------------------------------------
Simple merge
  //
  //------------------------------------------------------------------------------
  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
++      begin
 +        ModulesXmlFileLines[d] := '';
-     end;
++      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] := ' @date Scilab Enterprises 2013'; 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="types" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="elementary_functions" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="boolean" 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="functions" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="output_stream" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="matio" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="fileio" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="development_tools" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="gui" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="time" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="overloading" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="string" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="scinotes" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="data_structures" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="localization" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="windows_tools" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="jvm" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="helptools" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="hdf5" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="dynamic_link" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="action_binding" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="mexlib" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="history_manager" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="console" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="modules_manager" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="signal_processing" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="linear_algebra" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="statistics" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="differential_equations" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="spreadsheet" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="randlib" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="atoms" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="interpolation" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="cacsd" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="sound" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="umfpack" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="optimization" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="special_functions" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="graphics" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="demo_tools" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="graphic_export" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="operations" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="api_scilab" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="ast" activate="yes"/>'; i := i + 1;
-     ModulesXmlFileLines[i] := '    <module name="polynomials" activate="yes"/>'; i := i + 1;
++    ModulesXmlFileLines[i] := '<module name="core" activate="yes"/>'; i := i + 1;
++    ModulesXmlFileLines[i] := '<module name="api_scilab" activate="yes"/>'; i := i + 1;
++    ModulesXmlFileLines[i] := '<module name="ast" activate="yes"/>'; i := i + 1;
++    ModulesXmlFileLines[i] := '<module name="operations" 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="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="javasci" 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="types" 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;
++    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);
  
  
  
  #define COMPN_SCILAB 'scilab'
- ;
- #define COMPN_GRAPHICS 'scilab\graphics'
- #define COMPN_LINALG 'scilab\linear_algebra'
- #define COMPN_CACSD 'scilab\cacsd'
- #define COMPN_POLY 'scilab\polynomials'
- #define COMPN_SYMB 'scilab\symbolic'
- #define COMPN_SPARSE 'scilab\sparse'
- #define COMPN_EQUDIF 'scilab\differential_equations'
- #define COMPN_STATS 'scilab\statistics'
- ;
- ; by default
- #define COMPN_JVM_MODULE 'scilab\JVM_MODULE'
- #define COMPN_JRE 'JRE_1_6'
 -Name: {#COMPN_SCILAB}; Description: Scilab {#ScilabVersion}; Types: default full custom cli; Flags: fixed;
++Name: {#COMPN_SCILAB}; Description: Scilab {#ScilabVersion}; Types: full custom cli; Flags: fixed;
+ #define COMPN_JVM_MODULE 'JVM_MODULE'
 -#define COMPN_GRAPHICS 'JVM_MODULE\graphics'
 -#define COMPN_XCOS 'JVM_MODULE\xcos'
+ #define COMPN_SCINOTES 'JVM_MODULE\scinotes'
++#define COMPN_GRAPHICS 'JVM_MODULE\graphics'
++#define COMPN_XCOS 'JVM_MODULE\graphics\xcos'
+ #define COMPN_JRE 'JVM_MODULE\JRE_1_6'
 -Name: {#COMPN_JVM_MODULE}; Description: {cm:DescriptionModuleJVM}; Types: default full;
 -Name: {#COMPN_GRAPHICS}; Description: {cm:DescriptionGraphics}; Types: default full;
 -Name: {#COMPN_XCOS}; Description: {cm:DescriptionXcos}; Types: default full;
 -Name: {#COMPN_SCINOTES}; Description:{cm:DescriptionSciNotes}; Types: default full;
++Name: {#COMPN_JVM_MODULE}; Description: {cm:DescriptionModuleJVM}; Types: full;
++Name: {#COMPN_SCINOTES}; Description:{cm:DescriptionSciNotes}; Types: full;
++Name: {#COMPN_GRAPHICS}; Description: {cm:DescriptionGraphics}; Types: full;
++Name: {#COMPN_XCOS}; Description: {cm:DescriptionXcos}; Types: full;
+ #ifndef SCILAB_WITHOUT_JRE
 -Name: {#COMPN_JRE}; Description: {cm:DescriptionJVM} ({#javaUsed}); Types: default full;
++Name: {#COMPN_JRE}; Description: {cm:DescriptionJVM} ({#javaUsed}); Types: full;
+ #endif
  
- ;
  #define COMPN_CPU_OPTIMIZATION 'CPU_OPTIMIZATION'
  #define COMPN_REF_CPU_LIBRARY 'CPU_OPTIMIZATION\CPU_REF'
  #define COMPN_ATLAS_CPU_LIBRARY 'CPU_OPTIMIZATION\ATLAS'
  #define COMPN_MKL_CPU_LIBRARY 'CPU_OPTIMIZATION\MKL'
- ;
- #define COMPN_INTERP 'interpolation'
- #define COMPN_SIGPROC 'signal_processing'
- #define COMPN_OPTIM 'optimization'
- #define COMPN_XCOS 'xcos'
- #define COMPN_ARNOLDI 'arnoldi'
- #define COMPN_TCLSCI 'tclsci'
- #define COMPN_SCINOTES 'scinotes'
- #define COMPN_EXTERNAL_OBJECTS 'external_objects'
- #define COMPN_SOUND 'sound'
- #define COMPN_RANDLIB 'randlib'
- #define COMPN_MEXLIB 'mexlib'
- #define COMPN_M2SCI 'm2sci'
- #define COMPN_INTERSCI 'intersci'
- #define COMPN_FFTW 'FFTW'
- #define COMPN_FFTW_REF_LIBRARY 'FFTW\REF_LIBRARY'
- #define COMPN_FFTW_MKL_LIBRARY 'FFTW\MKL_LIBRARY'
- #define COMPN_UMFPACK 'UMFPACK'
- #define COMPN_COMPATFUNCTIONS 'compatibility_functions'
- #define COMPN_SPREADSHEET 'spreadsheet'
- #define COMPN_DEVTOOLS 'development_tools'
- #define COMPN_TESTS 'tests'
- #define COMPN_TOOLBOX_SKELETON 'toolbox_skeleton'
- #define COMPN_PARAMETERS 'parameters'
- #define COMPN_GENETICALGORITHMS 'genetic_algorithms'
- #define COMPN_SIMANNEALING 'simulated_annealing'
- #define COMPN_MATIO 'matio'
- #define COMPN_ATOMS 'ATOMS'
- #define COMPN_MODULES_MANAGER 'modules_manager'
- #define COMPN_PARALLEL 'parallel'
- #define COMPN_CHM 'chm_scilab'
- ;
- Name: {#COMPN_SCILAB}; Description: Scilab {#ScilabVersion}; Types:  full  ; Flags: fixed;
- ;
- Name: {#COMPN_EQUDIF}; Description: {cm:DescriptionEquDif}; Types:  full  ; Flags: fixed;
- Name: {#COMPN_POLY}; Description: {cm:DescriptionPolynomials}; Types:  full  ; Flags: fixed;
- Name: {#COMPN_SYMB}; Description: {cm:DescriptionSymbolic}; Types:  full  ; Flags: fixed;
- Name: {#COMPN_SPARSE}; Description: {cm:DescriptionSparse}; Types:  full  ; Flags: fixed;
- Name: {#COMPN_LINALG}; Description: {cm:DescriptionLinAlg}; Types:  full  ; Flags: fixed;
- Name: {#COMPN_CACSD}; Description: {cm:DescriptionCacsd}; Types:  full  ; Flags: fixed;
- Name: {#COMPN_STATS}; Description: {cm:DescriptionStats}; Types: full; Flags: fixed;
- Name: {#COMPN_GRAPHICS}; Description: {cm:DescriptionGraphics}; Types: full; Flags: fixed;
- ;
- Name: {#COMPN_JVM_MODULE}; Description: {cm:DescriptionModuleJVM}; Types: full; Flags: fixed;
- ;
- Name: {#COMPN_SCINOTES}; Description:{cm:DescriptionSciNotes}; Types: full; Flags: fixed;
- ;
- Name: {#COMPN_DEVTOOLS}; Description: {cm:DescriptionDevTools}; Types: full; Flags: fixed;
- ;
- Name: {#COMPN_EXTERNAL_OBJECTS}; Description: {cm:DescriptionExternalObjects}; Types: full; Flags: fixed;
- ;
- Name: {#COMPN_ATOMS}; Description: {cm:DescriptionAtoms}; Types: full; Flags: fixed;
- ;
- Name: {#COMPN_CPU_OPTIMIZATION}; Description:{cm:DescriptionCPUOptimization}; Types: full;
- ;
 -Name: {#COMPN_CPU_OPTIMIZATION}; Description:{cm:DescriptionCPUOptimization}; Types: default full custom cli; Flags: fixed;
++Name: {#COMPN_CPU_OPTIMIZATION}; Description:{cm:DescriptionCPUOptimization}; Types: full custom cli; Flags: fixed;
  Name: {#COMPN_MKL_CPU_LIBRARY}; Description:{cm:DescriptionMKLLibrary}; Flags: exclusive
  #ifndef SCILAB_X64
  Name: {#COMPN_ATLAS_CPU_LIBRARY}; Description:{cm:DescriptionATLASLibrary}; Flags: exclusive
  #endif
- ;
  Name: {#COMPN_REF_CPU_LIBRARY}; Description:{cm:DescriptionRefBlasLibrary}; Flags: exclusive
- ;
- Name: {#COMPN_FFTW}; Description: {cm:DescriptionFftwModule}; Types: full ;
+ #define COMPN_FFTW 'FFTW'
+ #define COMPN_FFTW_REF_LIBRARY 'FFTW\REF_LIBRARY'
+ #define COMPN_FFTW_MKL_LIBRARY 'FFTW\MKL_LIBRARY'
 -Name: {#COMPN_FFTW}; Description: {cm:DescriptionFftwModule}; Types: default full custom cli; Flags: fixed;
++Name: {#COMPN_FFTW}; Description: {cm:DescriptionFftwModule}; Types: full custom cli; Flags: fixed;
  Name: {#COMPN_FFTW_MKL_LIBRARY};Description: {cm:DescriptionFftwMKLDownload}; Flags: exclusive
  Name: {#COMPN_FFTW_REF_LIBRARY};Description: {cm:DescriptionRefFftwLibrary}; Flags: exclusive
- ;
- Name: {#COMPN_SIGPROC}; Description: {cm:DescriptionSigProc}; Types: full;
- Name: {#COMPN_INTERP}; Description: {cm:DescriptionInterpolation}; Types:  full;
- Name: {#COMPN_OPTIM}; Description: {cm:DescriptionOptim}; Types:  full ;
- ;
- Name: {#COMPN_XCOS}; Description: {cm:DescriptionXcos}; Types:  full ;
- ;
- Name: {#COMPN_ARNOLDI}; Description: {cm:DescriptionArnoldi}; Types:full;
- Name: {#COMPN_UMFPACK}; Description: {cm:DescriptionUmfpack}; Types:full;
- ;
- Name: {#COMPN_COMPATFUNCTIONS}; Description: {cm:DescriptionCompatFunctions}; Types: full;
- Name: {#COMPN_M2SCI}; Description: {cm:DescriptionM2sci}; Types: full;
- Name: {#COMPN_MATIO}; Description: {cm:DescriptionMatio}; Types: full;
- ;
- Name: {#COMPN_SOUND}; Description: {cm:DescriptionSound}; Types:  full ;
- Name: {#COMPN_RANDLIB}; Description: {cm:DescriptionRandlib}; Types:  full ;
- ;
- Name: {#COMPN_MEXLIB}; Description: {cm:DescriptionMexlib}; Types:  full ;
- Name: {#COMPN_INTERSCI}; Description: {cm:DescriptionIntersci}; Types:  full ;
- ;
- Name: {#COMPN_TCLSCI}; Description: {cm:DescriptionTclTK}; Types: full;
- ;
- Name: {#COMPN_SPREADSHEET}; Description: {cm:DescriptionSpreadsheet}; Types: full;
- ;
+ #define COMPN_DEVTOOLS 'Development_tools'
+ #define COMPN_MODULES_MANAGER 'Development_tools\modules_manager'
+ #define COMPN_TOOLBOX_SKELETON 'Development_tools\toolbox_skeleton'
+ #define COMPN_TESTS 'Development_tools\tests'
+ Name: {#COMPN_DEVTOOLS}; Description: {cm:DescriptionDevTools}; Types: full;
  Name: {#COMPN_MODULES_MANAGER}; Description: {cm:DescriptionModulesManager}; Types: full;
- ;
- #ifndef SCILAB_F2C
- Name: {#COMPN_PARALLEL}; Description: {cm:DescriptionParallel}; Types: full;
- #endif
- ;
- Name: {#COMPN_PARAMETERS}; Description: {cm:DescriptionParametersTlbx}; Types: full;
- Name: {#COMPN_GENETICALGORITHMS}; Description: {cm:DescriptionGeneticTlbx}; Types: full;
- Name: {#COMPN_SIMANNEALING}; Description: {cm:DescriptionSimulAnnealingTlbx}; Types: full;
- ;
- ;
- Name: {#COMPN_TESTS}; Description: {cm:DescriptionTests}; Types: full ; ExtraDiskSpaceRequired: {#TESTS_SIZE}
  Name: {#COMPN_TOOLBOX_SKELETON}; Description: {cm:DescriptionTlbxSkeleton}; Types: full;
- ;
- #ifndef SCILAB_WITHOUT_JRE
- Name: {#COMPN_JRE}; Description: {cm:DescriptionJVM} ({#javaUsed}); Types: full; Flags: fixed;
- #endif
- ;
+ Name: {#COMPN_TESTS}; Description: {cm:DescriptionTests}; Types: full; ExtraDiskSpaceRequired: {#TESTS_SIZE}
+ #define COMPN_TCLSCI 'tclsci'
 -Name: {#COMPN_TCLSCI}; Description: {cm:DescriptionTclTK}; Types: default full;
++Name: {#COMPN_TCLSCI}; Description: {cm:DescriptionTclTK}; Types: full;
+ #define COMPN_CHM 'chm_scilab'
  Name: {#COMPN_CHM}; Description: {cm:DescriptionCHM}; Types: full; ExtraDiskSpaceRequired: {#CHM_SIZE}
- ;
  ;-------------------------------------------------------------------------------
- ;
@@@ -67,7 -69,7 +67,7 @@@
  #include BinariesSourcePath + "\modules\symbolic\symbolic.iss"
  #include BinariesSourcePath + "\modules\interpolation\interpolation.iss"
  #include BinariesSourcePath + "\modules\umfpack\umfpack.iss"
--#include BinariesSourcePath + "\modules\fftw\fftw.iss"
++;#include BinariesSourcePath + "\modules\fftw\fftw.iss"
  #include BinariesSourcePath + "\modules\spreadsheet\spreadsheet.iss"
  #include BinariesSourcePath + "\modules\differential_equations\differential_equations.iss"
  #include BinariesSourcePath + "\modules\compatibility_functions\compatibility_functions.iss"
@@@ -84,9 -86,9 +84,9 @@@
  #include BinariesSourcePath + "\modules\scinotes\scinotes.iss"
  #include BinariesSourcePath + "\modules\xcos\xcos.iss"
  #include BinariesSourcePath + "\modules\graph\graph.iss"
--#ifndef SCILAB_F2C
--#include BinariesSourcePath + "\modules\parallel\parallel.iss"
--#endif
++;#ifndef SCILAB_F2C
++;#include BinariesSourcePath + "\modules\parallel\parallel.iss"
++;#endif
  #include BinariesSourcePath + "\modules\modules_manager\modules_manager.iss"
  #include BinariesSourcePath + "\modules\ui_data\ui_data.iss"
  #include BinariesSourcePath + "\modules\history_browser\history_browser.iss"
  #include BinariesSourcePath + "\modules\xml\xml.iss"
  #include BinariesSourcePath + "\modules\preferences\preferences.iss"
  #include BinariesSourcePath + "\modules\graphic_objects\graphic_objects.iss"
 +#include BinariesSourcePath + "\modules\operations\operations.iss"
 +#include BinariesSourcePath + "\modules\ast\ast.iss"
 +#include BinariesSourcePath + "\modules\functions_manager\functions_manager.iss"
 +#include BinariesSourcePath + "\modules\parse\parse.iss"
 +#include BinariesSourcePath + "\modules\system_env\system_env.iss"
  ;-------------------------------------------------------------------------------
--;
  ;
  ;-------------------------------------------------------------------------------
  
- Name: {commondesktop}\{#ScilabName}; Filename: {code:getExecNameForDesktop};WorkingDir: "{userdocs}";Comment: "Start Scilab - The open source platform for numerical computation"; MinVersion: 4,4; Tasks: desktopicon
- ;
- Name: {group}\{#ScilabName}; Filename: {code:getExecNameForDesktop};WorkingDir: "{userdocs}"
- Name: {group}\{cm:ConsoleIconName}; Filename: {app}\bin\YaSp.exe;WorkingDir: "{userdocs}"
+ Name: {commondesktop}\{#ScilabName}; Filename: {code:getExecNameForDesktop};Parameters: "-nwni";WorkingDir: "{userdocs}";Comment: "Start Scilab - The open source platform for numerical computation"; MinVersion: 4,4; Tasks: desktopicon;Components: not {#COMPN_JVM_MODULE};
+ Name: {commondesktop}\{#ScilabName}; Filename: {code:getExecNameForDesktop};WorkingDir: "{userdocs}";Comment: "Start Scilab - The open source platform for numerical computation"; MinVersion: 4,4; Tasks: desktopicon;Components: {#COMPN_JVM_MODULE};
+ ;
++;shorcut -nwni for minimal install ( without JVM )
+ Name: {group}\{#ScilabName}; Filename: {code:getExecNameForDesktop};Parameters: "-nwni";WorkingDir: "{userdocs}";Components: not {#COMPN_JVM_MODULE};
++;shortcut GUI + nwni for full install
+ Name: {group}\{#ScilabName}; Filename: {code:getExecNameForDesktop};WorkingDir: "{userdocs}";Components: {#COMPN_JVM_MODULE};
 -
 -Name: {group}\{cm:ConsoleIconName}; Filename: {app}\bin\scilex.exe;WorkingDir: "{userdocs}";Components: {#COMPN_JVM_MODULE};
++Name: {group}\{cm:ConsoleIconName}; Filename: {code:getExecNameForDesktop};Parameters: "-nwni";WorkingDir: "{userdocs}";Components: {#COMPN_JVM_MODULE};
  ;
  Name: {group}\{cm:DescriptionHelpScilabCHM}; Filename:"{app}\{cm:ScilabCHM}"; Components: {#COMPN_CHM};
  ;
  
  Name: full; Description: {cm:DescriptionFullInstall}
  ;
- ;Name: default; Description: {cm:DescriptionDefaultInstall}
- ;
- ;Name: custom; Description: {cm:DescriptionCustomInstall}; Flags: iscustom
- ;Name: cli; Description: {cm:DescriptionCLIInstall};
 -Name: default; Description: {cm:DescriptionDefaultInstall}
 -;
+ Name: custom; Description: {cm:DescriptionCustomInstall}; Flags: iscustom
 -
 -Name: cli; Description: {cm:DescriptionCLIInstall};
  ;
++Name: cli; Description: {cm:DescriptionCLIInstall};
  ;-------------------------------------------------------------------------------