Windows Installer: Add CLI configuration (minimal install) 37/1537/2
Pierre MARECHAL [Wed, 4 Aug 2010 12:40:31 +0000 (14:40 +0200)]
Change-Id: Ia0614a473a2f9134c2b05c508d8986db7201f87c

54 files changed:
scilab/CHANGES_5.3.X
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/bin/bin.iss
scilab/modules/action_binding/action_binding.iss
scilab/modules/atoms/atoms.iss
scilab/modules/completion/completion.iss
scilab/modules/console/console.iss
scilab/modules/console/src/noconsole/noconsole.c
scilab/modules/graph/graph.iss
scilab/modules/gui/gui.iss
scilab/modules/gui/src/nogui/nogui.c
scilab/modules/gui/src/nogui/nogui.h
scilab/modules/gui/src/nogui/nogui.rc [new file with mode: 0644]
scilab/modules/gui/src/nogui/nogui.vcproj [new file with mode: 0644]
scilab/modules/hdf5/hdf5.iss
scilab/modules/helptools/helptools.iss
scilab/modules/history_browser/history_browser.iss
scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.c [deleted file]
scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.rc
scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.vcproj
scilab/modules/intersci/intersci.iss
scilab/modules/jvm/jvm.iss
scilab/modules/jvm/src/nojvm/nojvm.c
scilab/modules/jvm/src/nojvm/nojvm.rc [new file with mode: 0644]
scilab/modules/jvm/src/nojvm/nojvm.vcproj [new file with mode: 0644]
scilab/modules/scicos_blocks/scicos_blocks.iss
scilab/modules/types/types.iss
scilab/modules/ui_data/ui_data.iss
scilab/modules/windows_tools/src/c/scilab_windows/console_main.c
scilab/tools/innosetup/Create_ISS.sce
scilab/tools/innosetup/Scilab.iss
scilab/tools/innosetup/base.iss
scilab/tools/innosetup/ca_ES_scilab.isl
scilab/tools/innosetup/code.iss
scilab/tools/innosetup/code_download.iss [new file with mode: 0644]
scilab/tools/innosetup/code_modules.iss [new file with mode: 0644]
scilab/tools/innosetup/components.iss
scilab/tools/innosetup/de_DE_scilab.isl
scilab/tools/innosetup/en_US_scilab.isl
scilab/tools/innosetup/es_ES_scilab.isl
scilab/tools/innosetup/fr_FR_scilab.isl
scilab/tools/innosetup/icons.iss
scilab/tools/innosetup/it_IT_scilab.isl
scilab/tools/innosetup/ja_JP_scilab.isl
scilab/tools/innosetup/pl_PL_scilab.isl
scilab/tools/innosetup/pt_BR_scilab.isl
scilab/tools/innosetup/registry.iss
scilab/tools/innosetup/ru_RU_scilab.isl
scilab/tools/innosetup/run.iss
scilab/tools/innosetup/tasks.iss
scilab/tools/innosetup/types.iss
scilab/tools/innosetup/uk_UA_scilab.isl
scilab/tools/innosetup/zh_CN_scilab.isl

index b8a8fe5..5f8d567 100644 (file)
@@ -31,6 +31,12 @@ Compilation:
 
 * bug 7668 fixed -  Scilab 5.3.0-beta-2 did not build with Visual Studio 2008 Express.
 
+Windows Installer:
+==================
+
+* Add "Command Line - Minimal Installation (no gui)" Configuration.
+  Interpreter in command line without the graphic, java or Tcl/Tk capabilities.
+  Installation requires only 60 Mo on disk.
 
 Bug Fixes:
 ==========
@@ -74,7 +80,6 @@ Bug Fixes:
 * bug 7693 fixed - With a corrupted palettes.xml file, the error message is not
                    coherent with the recovering action.
 
-
          Changes between version 5.3.0-beta-1 and 5.3.0-beta-2 of Scilab
          ===============================================================
 
index a6d9f83..2969c00 100644 (file)
@@ -1258,6 +1258,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "history_browser", "modules\
                {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nolibjvm", "modules\jvm\src\nojvm\nojvm.vcproj", "{889AD61B-12E9-4F85-8525-B83C16C88C3F}"
+       ProjectSection(ProjectDependencies) = postProject
+               {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nogui", "modules\gui\src\nogui\nogui.vcproj", "{58A50B97-FA8D-4700-9E4A-C4993638EB7A}"
+       ProjectSection(ProjectDependencies) = postProject
+               {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nohistory_browser", "modules\history_browser\src\nohistory_browser\nohistory_browser.vcproj", "{6EA99B1F-99B4-4528-8195-7508EF70CFED}"
+       ProjectSection(ProjectDependencies) = postProject
+               {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
+               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2422,6 +2440,30 @@ Global
                {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|Win32.Build.0 = Release|Win32
                {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|x64.ActiveCfg = Release|x64
                {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.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
+               {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
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 0d4832c..751ea8a 100644 (file)
@@ -1256,6 +1256,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "history_browser", "modules\
                {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nolibjvm", "modules\jvm\src\nojvm\nojvm.vcproj", "{889AD61B-12E9-4F85-8525-B83C16C88C3F}"
+       ProjectSection(ProjectDependencies) = postProject
+               {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nogui", "modules\gui\src\nogui\nogui.vcproj", "{58A50B97-FA8D-4700-9E4A-C4993638EB7A}"
+       ProjectSection(ProjectDependencies) = postProject
+               {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nohistory_browser", "modules\history_browser\src\nohistory_browser\nohistory_browser.vcproj", "{6EA99B1F-99B4-4528-8195-7508EF70CFED}"
+       ProjectSection(ProjectDependencies) = postProject
+               {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
+               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2420,6 +2438,30 @@ Global
                {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|Win32.Build.0 = Release|Win32
                {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|x64.ActiveCfg = Release|x64
                {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.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
+               {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
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index ecfbe47..6947215 100644 (file)
@@ -58,13 +58,10 @@ Source: bin\hashtable.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\doublylinkedlist.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\lapack.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\libf2c.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\libjvm.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\LibScilab.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\scilab_windows.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\libxml2.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\MALLOC.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\time.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\intersci.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\pcre.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\pcreposix.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
@@ -72,12 +69,12 @@ Source: bin\MALLOC.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\libf2c.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\lapack.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\LibScilab.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\intersci.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+
 Source: bin\scilab_windows.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\hashtable.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
 Source: bin\Scilex.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\WScilex.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\WScilex.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: bin\Dumpexts.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\f2c.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
index 70ac930..88598a9 100644 (file)
 ;
 #define ACTION_BINDING "action_binding"
 ;
-Source: bin\sciaction_binding.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\sciaction_binding.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#ACTION_BINDING}\jar\org.scilab.modules.{#ACTION_BINDING}.jar;DestDir: {app}\modules\{#ACTION_BINDING}\jar; Components: {#COMPN_SCILAB}
+Source: modules\{#ACTION_BINDING}\jar\org.scilab.modules.{#ACTION_BINDING}.jar;DestDir: {app}\modules\{#ACTION_BINDING}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
 ;Source: bin\no{#ACTION_BINDING}.dll; DestDir: {app}\bin; DestName: sci{#ACTION_BINDING}.dll; Components: not ({#COMPN_ACTION_BINDING})
 ;
-Source: modules\{#ACTION_BINDING}\changelog.txt; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB};
-Source: modules\{#ACTION_BINDING}\license.txt; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB}
-Source: modules\{#ACTION_BINDING}\readme.txt; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB}
-Source: modules\{#ACTION_BINDING}\version.xml; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB}
+Source: modules\{#ACTION_BINDING}\changelog.txt; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#ACTION_BINDING}\license.txt; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#ACTION_BINDING}\readme.txt; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#ACTION_BINDING}\version.xml; DestDir: {app}\modules\{#ACTION_BINDING}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#ACTION_BINDING}\sci_gateway\{#ACTION_BINDING}_gateway.xml; DestDir: {app}\modules\{#ACTION_BINDING}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#ACTION_BINDING}\sci_gateway\{#ACTION_BINDING}_gateway.xml; DestDir: {app}\modules\{#ACTION_BINDING}\sci_gateway; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-;Source: modules\{#ACTION_BINDING}\includes\*.h; DestDir: {app}\modules\{#ACTION_BINDING}\includes; Components: {#COMPN_SCILAB}
+;Source: modules\{#ACTION_BINDING}\includes\*.h; DestDir: {app}\modules\{#ACTION_BINDING}\includes; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#ACTION_BINDING}\etc\{#ACTION_BINDING}.quit; DestDir: {app}\modules\{#ACTION_BINDING}\etc; Components: {#COMPN_SCILAB}
-Source: modules\{#ACTION_BINDING}\etc\{#ACTION_BINDING}.start; DestDir: {app}\modules\{#ACTION_BINDING}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#ACTION_BINDING}\etc\{#ACTION_BINDING}.quit; DestDir: {app}\modules\{#ACTION_BINDING}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#ACTION_BINDING}\etc\{#ACTION_BINDING}.start; DestDir: {app}\modules\{#ACTION_BINDING}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#ACTION_BINDING}\macros\buildmacros.sce; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#ACTION_BINDING}\macros\buildmacros.bat; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#ACTION_BINDING}\macros\cleanmacros.bat; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#ACTION_BINDING}\macros\*.bin; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#ACTION_BINDING}\macros\*.sci; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#ACTION_BINDING}\macros\lib; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#ACTION_BINDING}\macros\names; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#ACTION_BINDING}\macros\buildmacros.sce; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#ACTION_BINDING}\macros\buildmacros.bat; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#ACTION_BINDING}\macros\cleanmacros.bat; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+;Source: modules\{#ACTION_BINDING}\macros\*.bin; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+;Source: modules\{#ACTION_BINDING}\macros\*.sci; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+;Source: modules\{#ACTION_BINDING}\macros\lib; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+;Source: modules\{#ACTION_BINDING}\macros\names; DestDir: {app}\modules\{#ACTION_BINDING}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-;Source: modules\{#ACTION_BINDING}\demos\*.*; DestDir: {app}\modules\{#ACTION_BINDING}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+;Source: modules\{#ACTION_BINDING}\demos\*.*; DestDir: {app}\modules\{#ACTION_BINDING}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#ACTION_BINDING}\tests\*.*; DestDir: {app}\modules\{#ACTION_BINDING}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
+Source: modules\{#ACTION_BINDING}\tests\*.*; DestDir: {app}\modules\{#ACTION_BINDING}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
 ;--------------------------------------------------------------------------------------------------------------
index 68e224a..30d5829 100644 (file)
@@ -27,7 +27,7 @@ Source: modules\{#ATOMS}\changelog.txt; DestDir: {app}\modules\{#ATOMS}; Compone
 Source: modules\{#ATOMS}\etc\{#ATOMS}.quit; DestDir: {app}\modules\{#ATOMS}\etc; Components: {#COMPN_ATOMS}
 Source: modules\{#ATOMS}\etc\{#ATOMS}.start; DestDir: {app}\modules\{#ATOMS}\etc; Components: {#COMPN_ATOMS}
 Source: modules\{#ATOMS}\etc\repositories; DestDir: {app}\modules\{#ATOMS}\etc; Components: {#COMPN_ATOMS}
-Source: modules\{#ATOMS}\images\icons\*.png; DestDir: {app}\modules\{#ATOMS}\images\icons; Components: {#COMPN_SCILAB}
+Source: modules\{#ATOMS}\images\icons\*.png; DestDir: {app}\modules\{#ATOMS}\images\icons; 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\names; DestDir: {app}\modules\{#ATOMS}\macros; Flags: recursesubdirs; Components: {#COMPN_ATOMS}
index 75091f4..6b9689b 100644 (file)
@@ -21,7 +21,7 @@
 Source: bin\sci{#COMPLETION}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\sci{#COMPLETION}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#COMPLETION}\jar\org.scilab.modules.{#COMPLETION}.jar;DestDir: {app}\modules\{#COMPLETION}\jar; Components: {#COMPN_SCILAB}
+Source: modules\{#COMPLETION}\jar\org.scilab.modules.{#COMPLETION}.jar;DestDir: {app}\modules\{#COMPLETION}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
 ;Source: bin\nosci{#COMPLETION}.dll; DestDir: {app}\bin; DestName: sci{#COMPLETION}.dll; Components: not ({#COMPN_SCILAB})
 ;
index 40997dc..deda4ec 100644 (file)
 ;
 #define CONSOLE "console"
 ;
-Source: bin\sci{#CONSOLE}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\sci{#CONSOLE}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#CONSOLE}\jar\org.scilab.modules.{#CONSOLE}.jar;DestDir: {app}\modules\{#CONSOLE}\jar; Components: {#COMPN_SCILAB}
-Source: thirdparty\jrosetta-engine.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\jrosetta-API.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: modules\{#CONSOLE}\etc\configuration.xml; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB};
+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}
+Source: thirdparty\jrosetta-API.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#CONSOLE}\etc\configuration.xml; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-;Source: bin\no{#CONSOLE}.dll; DestDir: {app}\bin; DestName: sci{#CONSOLE}.dll; Components: not ({#COMPN_CONSOLE})
+Source: bin\no{#CONSOLE}.dll; DestDir: {app}\bin; DestName: sci{#CONSOLE}.dll; Components: not ({#COMPN_JVM_MODULE})
 ;
-Source: modules\{#CONSOLE}\changelog.txt; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB};
-Source: modules\{#CONSOLE}\license.txt; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB}
-Source: modules\{#CONSOLE}\readme.txt; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB}
-Source: modules\{#CONSOLE}\version.xml; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB}
+Source: modules\{#CONSOLE}\changelog.txt; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#CONSOLE}\license.txt; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#CONSOLE}\readme.txt; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#CONSOLE}\version.xml; DestDir: {app}\modules\{#CONSOLE}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-;Source: modules\{#CONSOLE}\sci_gateway\{#CONSOLE}_gateway.xml; DestDir: {app}\modules\{#CONSOLE}\sci_gateway; Components: {#COMPN_SCILAB}
+;Source: modules\{#CONSOLE}\sci_gateway\{#CONSOLE}_gateway.xml; DestDir: {app}\modules\{#CONSOLE}\sci_gateway; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-;Source: modules\{#CONSOLE}\includes\*.h; DestDir: {app}\modules\{#CONSOLE}\includes; Components: {#COMPN_SCILAB}
+;Source: modules\{#CONSOLE}\includes\*.h; DestDir: {app}\modules\{#CONSOLE}\includes; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#CONSOLE}\etc\{#CONSOLE}.quit; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB}
-Source: modules\{#CONSOLE}\etc\{#CONSOLE}.start; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#CONSOLE}\etc\{#CONSOLE}.quit; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#CONSOLE}\etc\{#CONSOLE}.start; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#CONSOLE}\etc\configuration.xml; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#CONSOLE}\etc\configuration.xml; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#CONSOLE}\macros\buildmacros.sce; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#CONSOLE}\macros\buildmacros.bat; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#CONSOLE}\macros\cleanmacros.bat; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#CONSOLE}\macros\*.bin; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#CONSOLE}\macros\*.sci; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#CONSOLE}\macros\lib; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB}
-;Source: modules\{#CONSOLE}\macros\names; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#CONSOLE}\macros\buildmacros.sce; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#CONSOLE}\macros\buildmacros.bat; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#CONSOLE}\macros\cleanmacros.bat; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+;Source: modules\{#CONSOLE}\macros\*.bin; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+;Source: modules\{#CONSOLE}\macros\*.sci; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+;Source: modules\{#CONSOLE}\macros\lib; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+;Source: modules\{#CONSOLE}\macros\names; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-;Source: modules\{#CONSOLE}\demos\*.*; DestDir: {app}\modules\{#CONSOLE}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+;Source: modules\{#CONSOLE}\demos\*.*; DestDir: {app}\modules\{#CONSOLE}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-;Source: modules\{#CONSOLE}\tests\*.*; DestDir: {app}\modules\{#CONSOLE}\tests; Flags: recursesubdirs; Components:  {#COMPN_SCILAB} and {#COMPN_TESTS}
+Source: modules\{#CONSOLE}\tests\*.*; DestDir: {app}\modules\{#CONSOLE}\tests; Flags: recursesubdirs; Components:  {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
 ;
 ;--------------------------------------------------------------------------------------------------------------
index f5e7cd9..719a152 100644 (file)
 #include "PromptToHome.h"
 #include "MALLOC.h"
 #include "GetCharWithoutOutput.h"
+#include "ConsoleIsWaitingForInput.h"
 /*--------------------------------------------------------------------------*/
 char *ConsoleRead(void)
 {
-       return NULL;
+    return NULL;
 }
 /*--------------------------------------------------------------------------*/
 int ConsolePrintf(char *line)
 {
-       int len = 0;
-       return len;
+    int len = 0;
+    return len;
 }
 /*--------------------------------------------------------------------------*/
 BOOL ClearConsolePart(int nbLines)
 {
-       return FALSE;
+    return FALSE;
 }
 /*--------------------------------------------------------------------------*/
 BOOL ClearConsole(void)
 {
-       return FALSE;
+    return FALSE;
 }
 /*--------------------------------------------------------------------------*/
 int GetCharWithoutOutput()
@@ -51,21 +52,21 @@ int GetCharWithoutOutput()
 /*--------------------------------------------------------------------------*/
 BOOL PromptToHome(void)
 {
-       return FALSE;
+    return FALSE;
 }
 /*--------------------------------------------------------------------------*/
 BOOL SetConsolePrompt(char *Sci_prompt)
 {
-       return FALSE;
+    return FALSE;
 }
 /*--------------------------------------------------------------------------*/
 BOOL InitializeConsole(void)
 {
-       return FALSE;
+    return FALSE;
 }
 /*--------------------------------------------------------------------------*/
 BOOL ConsoleIsWaitingForInput(void)
 {
-       return FALSE;
+    return FALSE;
 }
 /*--------------------------------------------------------------------------*/
index 599cb67..ab2d86b 100644 (file)
 ;
 #define GRAPH "graph"
 ;
-Source: thirdparty\jgraphx.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
+Source: thirdparty\jgraphx.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#GRAPH}\jar\org.scilab.modules.{#GRAPH}.jar;DestDir: {app}\modules\{#GRAPH}\jar; Components: {#COMPN_SCILAB}
+Source: modules\{#GRAPH}\jar\org.scilab.modules.{#GRAPH}.jar;DestDir: {app}\modules\{#GRAPH}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#GRAPH}\VERSION.xml; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB}
-Source: modules\{#GRAPH}\readme.txt; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB}
-Source: modules\{#GRAPH}\license.txt; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB}
-Source: modules\{#GRAPH}\changelog.txt; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB}
+Source: modules\{#GRAPH}\VERSION.xml; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GRAPH}\readme.txt; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GRAPH}\license.txt; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GRAPH}\changelog.txt; DestDir: {app}\modules\{#GRAPH}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#GRAPH}\etc\{#GRAPH}.quit; DestDir: {app}\modules\{#GRAPH}\etc; Components: {#COMPN_SCILAB}
-Source: modules\{#GRAPH}\etc\{#GRAPH}.start; DestDir: {app}\modules\{#GRAPH}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#GRAPH}\etc\{#GRAPH}.quit; DestDir: {app}\modules\{#GRAPH}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GRAPH}\etc\{#GRAPH}.start; DestDir: {app}\modules\{#GRAPH}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#GRAPH}\macros\buildmacros.sce; DestDir: {app}\modules\{#GRAPH}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#GRAPH}\macros\buildmacros.bat; DestDir: {app}\modules\{#GRAPH}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#GRAPH}\macros\cleanmacros.bat; DestDir: {app}\modules\{#GRAPH}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#GRAPH}\macros\buildmacros.sce; DestDir: {app}\modules\{#GRAPH}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GRAPH}\macros\buildmacros.bat; DestDir: {app}\modules\{#GRAPH}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GRAPH}\macros\cleanmacros.bat; DestDir: {app}\modules\{#GRAPH}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-;Source: modules\{#GRAPH}\tests\*.*; DestDir: {app}\modules\{#GRAPH}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
+;Source: modules\{#GRAPH}\tests\*.*; DestDir: {app}\modules\{#GRAPH}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
 ;
 ;
 ;--------------------------------------------------------------------------------------------------------------
index d5e4d6b..22eee11 100644 (file)
 ;
 #define GUI "gui"
 ;
-Source: bin\sci{#GUI}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\sci{#GUI}.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: modules\{#GUI}\jar\org.scilab.modules.{#GUI}.jar; DestDir: {app}\modules\{#GUI}\jar; Components: {#COMPN_SCILAB}
+
+Source: modules\{#GUI}\jar\org.scilab.modules.{#GUI}.jar; DestDir: {app}\modules\{#GUI}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: thirdparty\flexdock-0.5.1.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\commons-logging-1.1.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\looks-2.1.1.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\skinlf.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
+Source: thirdparty\flexdock-0.5.1.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\commons-logging-1.1.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\looks-2.1.1.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\skinlf.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#GUI}\VERSION.xml; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB}
-Source: modules\{#GUI}\readme.txt; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB}
-Source: modules\{#GUI}\license.txt; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB}
-Source: modules\{#GUI}\changelog.txt; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB}
+Source: modules\{#GUI}\VERSION.xml; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GUI}\readme.txt; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GUI}\license.txt; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GUI}\changelog.txt; DestDir: {app}\modules\{#GUI}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#GUI}\sci_gateway\{#GUI}_gateway.xml; DestDir: {app}\modules\{#GUI}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#GUI}\sci_gateway\{#GUI}_gateway.xml; DestDir: {app}\modules\{#GUI}\sci_gateway; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#GUI}\etc\{#GUI}.quit; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB}
-Source: modules\{#GUI}\etc\{#GUI}.start; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#GUI}\etc\{#GUI}.quit; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GUI}\etc\{#GUI}.start; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#GUI}\etc\*.xml; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB}
-Source: modules\{#GUI}\images\icons\*.png; DestDir: {app}\modules\{#GUI}\images\icons; Components: {#COMPN_SCILAB}
+Source: modules\{#GUI}\etc\*.xml; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GUI}\images\icons\*.png; DestDir: {app}\modules\{#GUI}\images\icons; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-;Source: modules\{#GUI}\includes\*.h; DestDir: {app}\modules\{#GUI}\includes; Components: {#COMPN_SCILAB}
+;Source: modules\{#GUI}\includes\*.h; DestDir: {app}\modules\{#GUI}\includes; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#GUI}\macros\lib; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
-Source: modules\{#GUI}\macros\names; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
-Source: modules\{#GUI}\macros\*.bin; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
-Source: modules\{#GUI}\macros\*.sci; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
-Source: modules\{#GUI}\macros\buildmacros.sce; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
-Source: modules\{#GUI}\macros\buildmacros.bat; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
-Source: modules\{#GUI}\macros\cleanmacros.bat; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#GUI}\macros\lib; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GUI}\macros\names; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GUI}\macros\*.bin; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GUI}\macros\*.sci; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GUI}\macros\buildmacros.sce; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GUI}\macros\buildmacros.bat; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GUI}\macros\cleanmacros.bat; DestDir: {app}\modules\{#GUI}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#GUI}\demos\*.*; DestDir: {app}\modules\{#GUI}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#GUI}\demos\*.*; DestDir: {app}\modules\{#GUI}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#GUI}\tests\*.*; DestDir: {app}\modules\{#GUI}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
+Source: modules\{#GUI}\tests\*.*; DestDir: {app}\modules\{#GUI}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
 ;
 ;--------------------------------------------------------------------------------------------------------------
index 218e657..5e0e767 100644 (file)
@@ -2,6 +2,7 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2006 - INRIA - Allan CORNET
  * Copyright (C) 2007 - INRIA - Sylvestre LEDRU
+ * Copyright (C) 2010 - DIGITEO - Sylvestre LEDRU
  * 
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  *
  */
 
+#ifndef _MSC_VER
 #include <errno.h>
 #include <stdio.h> /* fileno */
 #include <sys/select.h> /* fd_set */
-#include "Scierror.h"
+#include "core_math.h" /* Max */
 #include "sciprint.h"
+#endif
 #include "nogui.h"
+#include "Scierror.h"
 #include "localization.h"
-#include "core_math.h" /* Max */
+/*--------------------------------------------------------------------------*/
+BOOL InitializeGUI(void)
+{
+    return TRUE;
+}
 /*--------------------------------------------------------------------------*/
 int gw_gui()
 {
-       Scierror(999,_("Scilab '%s' module not installed.\n"), "GUI");
-       return 0;
+    Scierror(999,_("Scilab '%s' module not installed.\n"), "GUI");
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 BOOL TerminateGUI(void)
 {
-       return TRUE;
+    return TRUE;
+}
+/*--------------------------------------------------------------------------*/
+#ifdef _MSC_VER
+void setVisibleMainWindow(BOOL newVisibleState) {}
+/*--------------------------------------------------------------------------*/
+BOOL isVisibleMainWindow(void)
+{
+    return TRUE;
 }
 /*--------------------------------------------------------------------------*/
+void deiconifyMainWindow(void) {}
+/*--------------------------------------------------------------------------*/
+void iconifyMainWindow(void) {}
+/*--------------------------------------------------------------------------*/
+void maximizeMainWindow(void) {}
+/*--------------------------------------------------------------------------*/
+void normalMainWindow(void) {}
+/*--------------------------------------------------------------------------*/
+#else
 int XClearScreenConsole(char *fname)
 {
-       sciprint(_("%s: Only available under 'STANDARD' mode.\n"), fname);
-       return 0;
+    sciprint(_("%s: Only available under 'STANDARD' mode.\n"), fname);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 void str_to_xterm ( register char * string, int nbytes){
@@ -46,7 +71,7 @@ void Click_menu(int n){
 }
 /*--------------------------------------------------------------------------*/
 int GetScreenProperty(char *prop, char *value){
-       return 0;
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 #define LF                    0x000a
@@ -54,85 +79,82 @@ int GetScreenProperty(char *prop, char *value){
 with some stuff removed (TCL/TK and a few other things)
 */
 int Xorgetchar(int interrupt){
-       int i;
-       int inter_max_plus1 = 0;
-       static fd_set Select_mask_ref;
-       static fd_set select_mask;
-       static fd_set Write_mask_ref;
-       static fd_set write_mask;
-       static struct timeval select_timeout;
-       static int fd_in=0,fd_out=0,fd_err=0 ;
-  static int state = 0;
-  fd_in = fileno(stdin) ;
-  fd_out = fileno(stdout);
-  fd_err = fileno(stderr);
+    int i;
+    int inter_max_plus1 = 0;
+    static fd_set Select_mask_ref;
+    static fd_set select_mask;
+    static fd_set Write_mask_ref;
+    static fd_set write_mask;
+    static struct timeval select_timeout;
+    static int fd_in=0,fd_out=0,fd_err=0 ;
+    static int state = 0;
+    fd_in = fileno(stdin) ;
+    fd_out = fileno(stdout);
+    fd_err = fileno(stderr);
 
-  FD_ZERO(&Select_mask_ref);
-  FD_SET(fd_in , &Select_mask_ref);
-  FD_ZERO(&Write_mask_ref);
+    FD_ZERO(&Select_mask_ref);
+    FD_SET(fd_in , &Select_mask_ref);
+    FD_ZERO(&Write_mask_ref);
 
-  inter_max_plus1 = fd_in;
+    inter_max_plus1 = fd_in;
 
-  inter_max_plus1 = Max(fd_out,inter_max_plus1);
-  inter_max_plus1 = Max(fd_err,inter_max_plus1);
-  inter_max_plus1++;
+    inter_max_plus1 = Max(fd_out,inter_max_plus1);
+    inter_max_plus1 = Max(fd_err,inter_max_plus1);
+    inter_max_plus1++;
 
-         for( ; ; ) {
-    fflush(stdout);
-    fflush(stderr);
+    for( ; ; ) {
+        fflush(stdout);
+        fflush(stderr);
 
-    /* Initialize masks  */
-    select_mask = Select_mask_ref;
-    write_mask  = Write_mask_ref;
+        /* Initialize masks  */
+        select_mask = Select_mask_ref;
+        write_mask  = Write_mask_ref;
 
-    select_timeout.tv_sec = 0;
-    select_timeout.tv_usec = 10;
-    i = select(inter_max_plus1, &select_mask, &write_mask, (fd_set *)NULL, &select_timeout);
-    if (i < 0) {
-               if (errno != EINTR) /* EINTR  A signal was caught. */
-       {
-         sciprint(_("Error. A signal has been caught.\n"));
-         exit(0);
-         continue;
-       }
-    }
+        select_timeout.tv_sec = 0;
+        select_timeout.tv_usec = 10;
+        i = select(inter_max_plus1, &select_mask, &write_mask, (fd_set *)NULL, &select_timeout);
+        if (i < 0) {
+            if (errno != EINTR) /* EINTR  A signal was caught. */
+            {
+                sciprint(_("Error. A signal has been caught.\n"));
+                exit(0);
+                continue;
+            }
+        }
 
-    /* if there's something to output */
-    if ( FD_ISSET(fd_out,&write_mask)) {
-      fflush(stdout);
-    }
-    if ( FD_ISSET(fd_err,&write_mask)) {
-      fflush(stderr);
-    }
+        /* if there's something to output */
+        if ( FD_ISSET(fd_out,&write_mask)) {
+            fflush(stdout);
+        }
+        if ( FD_ISSET(fd_err,&write_mask)) {
+            fflush(stderr);
+        }
 
-    /* if there's something to read */
-    if (FD_ISSET(fd_in,&select_mask))
-      state=1;
+        /* if there's something to read */
+        if (FD_ISSET(fd_in,&select_mask))
+            state=1;
 
-    if (state) {
-               i=getchar();
-      if (i==LF) state=0;
-      return(i);
-    }
+        if (state) {
+            i=getchar();
+            if (i==LF) state=0;
+            return(i);
+        }
 
-    if (interrupt&&(ismenu()==1)) return(-1);
+        if (interrupt&&(ismenu()==1)) return(-1);
 
-  }
+    }
 }
 /*--------------------------------------------------------------------------*/
 int XEvorgetchar(int interrupt){
-       return 0;
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 void main_sci (char *startup, int lstartup,int memory){
-       Scierror(999,_("Scilab '%s' module not installed.\n"), "GUI");
+    Scierror(999,_("Scilab '%s' module not installed.\n"), "GUI");
 }
 /*--------------------------------------------------------------------------*/
 void InitXsession(void){
-       Scierror(999,_("Scilab '%s' module not installed.\n"), "GUI");
+    Scierror(999,_("Scilab '%s' module not installed.\n"), "GUI");
 }
 /*--------------------------------------------------------------------------*/
-BOOL InitializeGUI(void)
-{
-  return TRUE;
-}
+#endif /* not  _MSC_VER */
index 0af1834..9e7f368 100644 (file)
@@ -1,6 +1,7 @@
 /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2007 - INRIA - Sylvestre Ledru
+ * Copyright (C) 2010 - DIGITEO - Allan CORNET
  * 
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  *
  */
 
+#ifndef __NOGUI_H__
+#define __NOGUI_H__
+
+#ifdef _MSC_VER
+#include "dynlib_gui.h"
+#include "BOOL.h"
+
+GUI_IMPEXP BOOL InitializeGUI(void);
+
+GUI_IMPEXP int gw_gui(void);
+
+GUI_IMPEXP BOOL TerminateGUI(void);
+
 /**
- * This function is a wrapper / fake when Scilab is compiled without thegraphic
- * graphic Interface
- *
- * @return 0
- */
+* set Main Window visibility
+* @param[in] new state
+*/
+GUI_IMPEXP void setVisibleMainWindow(BOOL newVisibleState);
+
+/**
+* isVisibleMainWindow
+* @return current state
+*/
+GUI_IMPEXP BOOL isVisibleMainWindow(void);
+
+GUI_IMPEXP void deiconifyMainWindow(void);
+
+/**
+* Iconify Main Window
+*/
+GUI_IMPEXP void iconifyMainWindow(void);
+
+/**
+* Maximize Main Window
+*/
+GUI_IMPEXP void maximizeMainWindow(void);
+
+/**
+* Main Window is in the "normal" state.
+*/
+GUI_IMPEXP void normalMainWindow(void);
+
+#else
+
+BOOL InitializeGUI(void);
+
+/**
+* This function is a wrapper / fake when Scilab is compiled without thegraphic
+* graphic Interface
+*
+* @return 0
+*/
 int gw_gui(void);
 
 /**
- * This function is a wrapper when /fake Scilab is compiled without the 
- * graphic Interface
- *
- * @return TRUE
- */
+* This function is a wrapper when /fake Scilab is compiled without the 
+* graphic Interface
+*
+* @return TRUE
+*/
 BOOL TerminateGUI(void);
 
 /**
- * This function is a wrapper when /fake Scilab is compiled without the 
- * graphic Interface
- * @param fname unused (just reproduce the profile)
- * @return 0
- */
+* This function is a wrapper when /fake Scilab is compiled without the 
+* graphic Interface
+* @param fname unused (just reproduce the profile)
+* @return 0
+*/
+
 int XClearScreenConsole(char *fname);
 
 /**
- * This function is a wrapper when /fake Scilab is compiled without the 
- * graphic Interface
- * @param string unused (just reproduce the profile)
- * @param nbytes unused (just reproduce the profile)
- */
+* This function is a wrapper when /fake Scilab is compiled without the 
+* graphic Interface
+* @param string unused (just reproduce the profile)
+* @param nbytes unused (just reproduce the profile)
+*/
 void str_to_xterm ( register char * string, int nbytes);
 
 
 /**
- * This function is a wrapper when /fake Scilab is compiled without the 
- * graphic Interface
- * @param n unused (just reproduce the profile)
- */
+* This function is a wrapper when /fake Scilab is compiled without the 
+* graphic Interface
+* @param n unused (just reproduce the profile)
+*/
 void Click_menu(int n);
 
 
 /**
- * This function is a wrapper when /fake Scilab is compiled without the 
- * graphic Interface
- * @param prop unused (just reproduce the profile)
- * @param value unused (just reproduce the profile)
- * @return 0
- */
+* This function is a wrapper when /fake Scilab is compiled without the 
+* graphic Interface
+* @param prop unused (just reproduce the profile)
+* @param value unused (just reproduce the profile)
+* @return 0
+*/
 int GetScreenProperty(char *prop, char *value);
 
 
 /**
- * Read the next character
- * This function is really used here !
- * @param interrupt  unused (just reproduce the profile)
- * @return the result of getchar
- */
+* Read the next character
+* This function is really used here !
+* @param interrupt  unused (just reproduce the profile)
+* @return the result of getchar
+*/
 int Xorgetchar(int interrupt);
 
 
 /**
- * This function is a wrapper when /fake Scilab is compiled without the 
- * graphic Interface
- * @param interrupt  unused (just reproduce the profile)
- * @return 0
- */
+* This function is a wrapper when /fake Scilab is compiled without the 
+* graphic Interface
+* @param interrupt  unused (just reproduce the profile)
+* @return 0
+*/
 int XEvorgetchar(int interrupt);
 
 /**
- * This function is a wrapper when /fake Scilab is compiled without the 
- * graphic Interface
- * @param startup   unused (just reproduce the profile)
- * @param lstartup  unused (just reproduce the profile)
- * @param memory    unused (just reproduce the profile)
- */
+* This function is a wrapper when /fake Scilab is compiled without the 
+* graphic Interface
+* @param startup   unused (just reproduce the profile)
+* @param lstartup  unused (just reproduce the profile)
+* @param memory    unused (just reproduce the profile)
+*/
 void main_sci (char *startup, int lstartup,int memory);
 
 /**
- * This function is a wrapper when /fake Scilab is compiled without the 
- * graphic Interface
- */
+* This function is a wrapper when /fake Scilab is compiled without the 
+* graphic Interface
+*/
 void InitXsession(void);
+
+#endif /* #ifndef _MSC_VER */
+
+#endif /* __NOGUI_H__ */
diff --git a/scilab/modules/gui/src/nogui/nogui.rc b/scilab/modules/gui/src/nogui/nogui.rc
new file mode 100644 (file)
index 0000000..12c2f59
--- /dev/null
@@ -0,0 +1,97 @@
+// Microsoft Visual C++ generated resource script.
+//
+
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+//#include "afxres.h"
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// French (France) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+#ifdef _WIN32
+LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 5,3,0,0
+ PRODUCTVERSION 5,3,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x0L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040c04b0"
+        BEGIN
+            VALUE "FileDescription", "nogui module"
+            VALUE "FileVersion", "5, 3, 0, 0"
+            VALUE "InternalName", "nogui module"
+            VALUE "LegalCopyright", "Copyright (C) 2010"
+            VALUE "OriginalFilename", "noscigui.dll"
+            VALUE "ProductName", " nogui"
+            VALUE "ProductVersion", "5, 3, 0, 0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x40c, 1200
+    END
+END
+
+#endif    // French (France) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/scilab/modules/gui/src/nogui/nogui.vcproj b/scilab/modules/gui/src/nogui/nogui.vcproj
new file mode 100644 (file)
index 0000000..f9586ff
--- /dev/null
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9,00"
+       Name="nogui"
+       ProjectGUID="{58A50B97-FA8D-4700-9E4A-C4993638EB7A}"
+       RootNamespace="nogui"
+       Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)bin\"
+                       IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=""
+                               Optimization="0"
+                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine=""
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="../../../../bin/libintl.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile=""
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)bin\"
+                       IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine=""
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="../../../../bin/libintl.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile=""
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="17"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)bin\"
+                       IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=""
+                               InlineFunctionExpansion="1"
+                               FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="0"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine=""
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="../../../../bin/libintl.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile=""
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="$(SolutionDir)bin\"
+                       IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               InlineFunctionExpansion="1"
+                               FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="0"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine=""
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="../../../../bin/libintl.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile=""
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="17"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+                       <File
+                               RelativePath=".\nogui.c"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+                       >
+               </Filter>
+               <Filter
+                       Name="Resource Files"
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+                       >
+                       <File
+                               RelativePath=".\nogui.rc"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Libraries Dependencies"
+                       >
+               </Filter>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
index 6d8736d..cece572 100644 (file)
@@ -19,7 +19,7 @@
 ;
 Source: bin\{#HDF5}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#HDF5}\jar\org.scilab.modules.{#HDF5}.jar;DestDir: {app}\modules\{#HDF5}\jar; Components: {#COMPN_SCILAB}
+Source: modules\{#HDF5}\jar\org.scilab.modules.{#HDF5}.jar;DestDir: {app}\modules\{#HDF5}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
 ;Source: bin\nohdf5.dll; DestDir: {app}\bin; DestName: scihdf5.dll; Components: not ({#COMPN_SCILAB})
 ;
@@ -35,7 +35,7 @@ Source: modules\{#HDF5}\sci_gateway\{#HDF5}_gateway.xml; DestDir: {app}\modules\
 Source: modules\{#HDF5}\etc\{#HDF5}.quit; DestDir: {app}\modules\{#HDF5}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#HDF5}\etc\{#HDF5}.start; DestDir: {app}\modules\{#HDF5}\etc; Components: {#COMPN_SCILAB}
 ;
-Source: thirdparty\j{#HDF5}.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
+Source: thirdparty\j{#HDF5}.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
 ;Source: modules\{#HDF5}\macros\buildmacros.sce; DestDir: {app}\modules\{#HDF5}\macros; Components: {#COMPN_SCILAB}
 ;Source: modules\{#HDF5}\macros\buildmacros.bat; DestDir: {app}\modules\{#HDF5}\macros; Components: {#COMPN_SCILAB}
index 01b28c2..175f0d3 100644 (file)
 ;
 #define HELPTOOLS "helptools"
 
-Source: bin\{#HELPTOOLS}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: modules\{#HELPTOOLS}\jar\*.jar; DestDir: {app}\modules\{#HELPTOOLS}\jar; Components: {#COMPN_SCILAB}
+Source: bin\{#HELPTOOLS}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HELPTOOLS}\jar\*.jar; DestDir: {app}\modules\{#HELPTOOLS}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 
 #ifdef WITH_CHM
 Source: modules\{#HELPTOOLS}\chm\*.chm; DestDir: {app}\modules\{#HELPTOOLS}\chm; Components: {#COMPN_SCILAB}
 #endif
 
-Source: modules\{#HELPTOOLS}\sci_gateway\{#HELPTOOLS}_gateway.xml; DestDir: {app}\modules\{#HELPTOOLS}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#HELPTOOLS}\sci_gateway\{#HELPTOOLS}_gateway.xml; DestDir: {app}\modules\{#HELPTOOLS}\sci_gateway; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: thirdparty\docbook\*.*;DestDir: {app}\thirdparty\docbook; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: thirdparty\docbook\*.*;DestDir: {app}\thirdparty\docbook; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: thirdparty\jhall.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\avalon-framework.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\avalon-framework.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\avalon-framework.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\batik.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\batik.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\commons-io.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\commons-io.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\commons-io.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\commons-logging.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\commons-logging.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\commons-logging.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\docbook-xsl-saxon.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\fop-hyph.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\fop-hyph.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\fop-hyph.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\fop.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\fop.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\fop.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\jeuclid-core.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\jeuclid.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\jeuclid.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\saxon.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\saxon.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\saxon.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\xml-apis.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\xml-apis-ext.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\xmlgraphics-commons-1.3.1.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\xmlgraphics-commons.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\xmlgraphics-commons.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\xalan.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
-Source: thirdparty\batik-all-1.7.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
+Source: thirdparty\jhall.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\avalon-framework.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\avalon-framework.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\avalon-framework.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\batik.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\batik.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\commons-io.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\commons-io.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\commons-io.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\commons-logging.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\commons-logging.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\commons-logging.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\docbook-xsl-saxon.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\fop-hyph.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\fop-hyph.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\fop-hyph.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\fop.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\fop.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\fop.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\jeuclid-core.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\jeuclid.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\jeuclid.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\saxon.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\saxon.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\saxon.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\xml-apis.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\xml-apis-ext.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\xmlgraphics-commons-1.3.1.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\xmlgraphics-commons.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\xmlgraphics-commons.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\xalan.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: thirdparty\batik-all-1.7.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#HELPTOOLS}\VERSION.xml; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB}
-Source: modules\{#HELPTOOLS}\readme.txt; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB}
-Source: modules\{#HELPTOOLS}\license.txt; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB}
-Source: modules\{#HELPTOOLS}\changelog.txt; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB}
+Source: modules\{#HELPTOOLS}\VERSION.xml; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HELPTOOLS}\readme.txt; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HELPTOOLS}\license.txt; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HELPTOOLS}\changelog.txt; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-;Source: modules\{#HELPTOOLS}\*.xsl; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB}
-;Source: modules\{#HELPTOOLS}\help.dtd; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB}
+;Source: modules\{#HELPTOOLS}\*.xsl; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+;Source: modules\{#HELPTOOLS}\help.dtd; DestDir: {app}\modules\{#HELPTOOLS}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#HELPTOOLS}\css\*.*; DestDir: {app}\modules\{#HELPTOOLS}\css; Components: {#COMPN_SCILAB}
-Source: modules\{#HELPTOOLS}\doc\*.*; DestDir: {app}\modules\{#HELPTOOLS}\doc; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
-Source: modules\{#HELPTOOLS}\schema\*.*; DestDir: {app}\modules\{#HELPTOOLS}\schema; Components: {#COMPN_SCILAB}
-Source: modules\{#HELPTOOLS}\xsl\*.*; DestDir: {app}\modules\{#HELPTOOLS}\xsl; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#HELPTOOLS}\css\*.*; DestDir: {app}\modules\{#HELPTOOLS}\css; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HELPTOOLS}\doc\*.*; DestDir: {app}\modules\{#HELPTOOLS}\doc; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HELPTOOLS}\schema\*.*; DestDir: {app}\modules\{#HELPTOOLS}\schema; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HELPTOOLS}\xsl\*.*; DestDir: {app}\modules\{#HELPTOOLS}\xsl; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#HELPTOOLS}\etc\{#HELPTOOLS}.quit; DestDir: {app}\modules\{#HELPTOOLS}\etc; Components: {#COMPN_SCILAB}
-Source: modules\{#HELPTOOLS}\etc\{#HELPTOOLS}.start; DestDir: {app}\modules\{#HELPTOOLS}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#HELPTOOLS}\etc\{#HELPTOOLS}.quit; DestDir: {app}\modules\{#HELPTOOLS}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HELPTOOLS}\etc\{#HELPTOOLS}.start; DestDir: {app}\modules\{#HELPTOOLS}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#HELPTOOLS}\macros\buildmacros.sce; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#HELPTOOLS}\macros\buildmacros.bat; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#HELPTOOLS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#HELPTOOLS}\macros\lib; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#HELPTOOLS}\macros\names; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#HELPTOOLS}\macros\*.bin; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#HELPTOOLS}\macros\*.sci; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#HELPTOOLS}\macros\buildmacros.sce; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HELPTOOLS}\macros\buildmacros.bat; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HELPTOOLS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HELPTOOLS}\macros\lib; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HELPTOOLS}\macros\names; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HELPTOOLS}\macros\*.bin; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HELPTOOLS}\macros\*.sci; DestDir: {app}\modules\{#HELPTOOLS}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#HELPTOOLS}\examples\*.*; DestDir: {app}\modules\{#HELPTOOLS}\examples; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#HELPTOOLS}\examples\*.*; DestDir: {app}\modules\{#HELPTOOLS}\examples; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#HELPTOOLS}\tests\*.*; DestDir: {app}\modules\{#HELPTOOLS}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
+Source: modules\{#HELPTOOLS}\tests\*.*; DestDir: {app}\modules\{#HELPTOOLS}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
 ;
 ;--------------------------------------------------------------------------------------------------------------
index 4de6215..e000fc1 100644 (file)
 ;
 #define HISTORY_BROWSER "history_browser"
 ;
-Source: bin\{#HISTORY_BROWSER}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\{#HISTORY_BROWSER}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: bin\no{#HISTORY_BROWSER}.dll; DestDir: {app}\bin; DestName: {#HISTORY_BROWSER}.dll; Components: not ({#COMPN_JVM_MODULE})
 ;
-Source: modules\{#HISTORY_BROWSER}\jar\org.scilab.modules.{#HISTORY_BROWSER}.jar;DestDir: {app}\modules\{#HISTORY_BROWSER}\jar; Components: {#COMPN_SCILAB}
+Source: modules\{#HISTORY_BROWSER}\jar\org.scilab.modules.{#HISTORY_BROWSER}.jar;DestDir: {app}\modules\{#HISTORY_BROWSER}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#HISTORY_BROWSER}\VERSION.xml; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB}
-Source: modules\{#HISTORY_BROWSER}\readme.txt; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB}
-Source: modules\{#HISTORY_BROWSER}\license.txt; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB}
-Source: modules\{#HISTORY_BROWSER}\changelog.txt; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB}
+Source: modules\{#HISTORY_BROWSER}\VERSION.xml; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HISTORY_BROWSER}\readme.txt; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HISTORY_BROWSER}\license.txt; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HISTORY_BROWSER}\changelog.txt; DestDir: {app}\modules\{#HISTORY_BROWSER}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#HISTORY_BROWSER}\etc\{#HISTORY_BROWSER}.quit; DestDir: {app}\modules\{#HISTORY_BROWSER}\etc; Components: {#COMPN_SCILAB}
-Source: modules\{#HISTORY_BROWSER}\etc\{#HISTORY_BROWSER}.start; DestDir: {app}\modules\{#HISTORY_BROWSER}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#HISTORY_BROWSER}\etc\{#HISTORY_BROWSER}.quit; DestDir: {app}\modules\{#HISTORY_BROWSER}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HISTORY_BROWSER}\etc\{#HISTORY_BROWSER}.start; DestDir: {app}\modules\{#HISTORY_BROWSER}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#HISTORY_BROWSER}\macros\buildmacros.sce; DestDir: {app}\modules\{#HISTORY_BROWSER}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#HISTORY_BROWSER}\macros\buildmacros.bat; DestDir: {app}\modules\{#HISTORY_BROWSER}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#HISTORY_BROWSER}\macros\cleanmacros.bat; DestDir: {app}\modules\{#HISTORY_BROWSER}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#HISTORY_BROWSER}\macros\buildmacros.sce; DestDir: {app}\modules\{#HISTORY_BROWSER}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HISTORY_BROWSER}\macros\buildmacros.bat; DestDir: {app}\modules\{#HISTORY_BROWSER}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#HISTORY_BROWSER}\macros\cleanmacros.bat; DestDir: {app}\modules\{#HISTORY_BROWSER}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#HISTORY_BROWSER}\tests\*.*; DestDir: {app}\modules\{#HISTORY_BROWSER}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
+Source: modules\{#HISTORY_BROWSER}\tests\*.*; DestDir: {app}\modules\{#HISTORY_BROWSER}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
 ;
 ;
 ;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.c b/scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.c
deleted file mode 100644 (file)
index 28fb4e4..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007-2008 - INRIA - Allan CORNET
- *
- * 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
- *
- */
-
-/*--------------------------------------------------------------------------*/
-#include "gw_history_manager.h"
-#include "HistoryManager.h"
-#include "InitializeHistoryManager.h"
-#include "TerminateHistoryManager.h"
-#include "MALLOC.h"
-#include "Scierror.h"
-#include "localization.h"
-/*--------------------------------------------------------------------------*/
-int gw_history_manager(void)
-{
-       Scierror(999,_("Scilab history_manager module not installed.\n"));
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
-BOOL historyIsEnabled(void)
-{
-       return FALSE;
-}
-/*--------------------------------------------------------------------------*/
-BOOL InitializeHistoryManager(void)
-{
-       return TRUE;
-}
-/*--------------------------------------------------------------------------*/
-BOOL TerminateHistoryManager(void)
-{
-       return TRUE;
-}
-/*--------------------------------------------------------------------------*/
-BOOL appendLineToScilabHistory(char *line)
-{
-       return FALSE;
-}
-/*--------------------------------------------------------------------------*/
-BOOL appendLinesToScilabHistory(char **lines,int numberoflines)
-{
-       return FALSE;
-}
-/*--------------------------------------------------------------------------*/
-void displayScilabHistory(void)
-{
-
-}
-/*--------------------------------------------------------------------------*/
-BOOL writeScilabHistoryToFile(char *filename)
-{
-       return FALSE;
-}
-/*--------------------------------------------------------------------------*/
-BOOL loadScilabHistoryFromFile(char *filename)
-{
-       return FALSE;
-}
-/*--------------------------------------------------------------------------*/
-BOOL setFilenameScilabHistory(char *filename)
-{
-       return FALSE;
-}
-/*--------------------------------------------------------------------------*/
-char *getFilenameScilabHistory(void)
-{
-       return NULL;
-}
-/*--------------------------------------------------------------------------*/
-BOOL setDefaultFilenameScilabHistory(void)
-{
-       return FALSE;
-}
-/*--------------------------------------------------------------------------*/
-void resetScilabHistory(void)
-{
-
-}
-/*--------------------------------------------------------------------------*/
-char **getAllLinesOfScilabHistory(void)
-{
-       return FALSE;
-}
-/*--------------------------------------------------------------------------*/
-int getSizeAllLinesOfScilabHistory(void)
-{
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
-BOOL setSearchedTokenInScilabHistory(char *token)
-{
-       return FALSE;
-}
-/*--------------------------------------------------------------------------*/
-BOOL resetSearchedTokenInScilabHistory(void)
-{
-       return FALSE;
-}
-/*--------------------------------------------------------------------------*/
-char *getSearchedTokenInScilabHistory(void)
-{
-       return NULL;
-}
-/*--------------------------------------------------------------------------*/
-char *getPreviousLineInScilabHistory(void)
-{
-       return NULL;
-}
-/*--------------------------------------------------------------------------*/
-char *getNextLineInScilabHistory(void)
-{
-       return NULL;
-}
-/*--------------------------------------------------------------------------*/
-int getNumberOfLinesInScilabHistory(void)
-{
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
-void setSaveConsecutiveDuplicateLinesInScilabHistory(BOOL doit)
-{
-
-}
-/*--------------------------------------------------------------------------*/
-BOOL getSaveConsecutiveDuplicateLinesInScilabHistory(void)
-{
-       return FALSE;
-}
-/*--------------------------------------------------------------------------*/
-void setAfterHowManyLinesScilabHistoryIsSaved(int num)
-{
-
-}
-/*--------------------------------------------------------------------------*/
-int getAfterHowManyLinesScilabHistoryIsSaved(void)
-{
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
-char *getNthLineInScilabHistory(int N)
-{
-       return NULL;
-}
-/*--------------------------------------------------------------------------*/
-BOOL deleteNthLineScilabHistory(int N)
-{
-       return FALSE;
-}
-/*--------------------------------------------------------------------------*/
-int getSizeScilabHistory(void)
-{
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
index 56fe00b..8138122 100644 (file)
@@ -65,12 +65,12 @@ BEGIN
     BEGIN
         BLOCK "040c04b0"
         BEGIN
-            VALUE "FileDescription", "nohistory_manager module"
+            VALUE "FileDescription", "nohistory_browser module"
             VALUE "FileVersion", "5, 3, 0, 0"
-            VALUE "InternalName", "nohistory_manager module"
+            VALUE "InternalName", "nohistory_browser module"
             VALUE "LegalCopyright", "Copyright (C) 2010"
-            VALUE "OriginalFilename", "nohistory_manager.dll"
-            VALUE "ProductName", " nohistory_manager"
+            VALUE "OriginalFilename", "nohistory_browser.dll"
+            VALUE "ProductName", " nohistory_browser"
             VALUE "ProductVersion", "5, 3, 0, 0"
         END
     END
index b39dabd..3abbfa2 100644 (file)
@@ -3,7 +3,7 @@
        ProjectType="Visual C++"
        Version="9,00"
        Name="nohistory_browser"
-       ProjectGUID="{68F65DC6-AF8B-442F-A21A-108E1E501BE6}"
+       ProjectGUID="{6EA99B1F-99B4-4528-8195-7508EF70CFED}"
        RootNamespace="nohistory_browser"
        Keyword="Win32Proj"
        TargetFrameworkVersion="0"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
                        <File
-                               RelativePath=".\nohistory_browser.c"
+                               RelativePath=".\CommandHistory_Wrap_Fake.c"
                                >
                        </File>
                </Filter>
index 3b7559d..77ce495 100644 (file)
@@ -18,6 +18,9 @@
 ;
 #define INTERSCI "intersci"
 ;
+Source: bin\{#INTERSCI}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\{#INTERSCI}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+;
 Source: modules\{#INTERSCI}\VERSION.xml; DestDir: {app}\modules\{#INTERSCI}; Components: {#COMPN_INTERSCI}
 Source: modules\{#INTERSCI}\readme.txt; DestDir: {app}\modules\{#INTERSCI}; Components: {#COMPN_INTERSCI}
 Source: modules\{#INTERSCI}\license.txt; DestDir: {app}\modules\{#INTERSCI}; Components: {#COMPN_INTERSCI}
index 7e848bd..935f703 100644 (file)
 ;
 #DEFINE JVM "jvm"
 ;
-Source: bin\lib{#JVM}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\lib{#JVM}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\lib{#JVM}.lib; DestDir: {app}\bin; Components: {#COMPN_JVM_MODULE}
 ;
-Source: etc\classpath.xml; DestDir: {app}\etc; Components: {#COMPN_SCILAB}
-Source: etc\librarypath.xml; DestDir: {app}\etc; Components: {#COMPN_SCILAB}
-Source: etc\{#JVM}_options.xml; DestDir: {app}\etc; Components: {#COMPN_SCILAB}
+Source: bin\lib{#JVM}.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: modules\{#JVM}\xml\*.dtd; DestDir: {app}\modules\{#JVM}\xml; Components: {#COMPN_SCILAB}
+Source: etc\classpath.xml; DestDir: {app}\etc; Components: {#COMPN_JVM_MODULE}
+Source: etc\librarypath.xml; DestDir: {app}\etc; Components: {#COMPN_JVM_MODULE}
+Source: etc\{#JVM}_options.xml; DestDir: {app}\etc; Components: {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#JVM}\jar\org.scilab.modules.{#JVM}.jar;DestDir: {app}\modules\{#JVM}\jar; Components: {#COMPN_SCILAB}
+Source: modules\{#JVM}\xml\*.dtd; DestDir: {app}\modules\{#JVM}\xml; Components: {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#JVM}\license.txt; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\readme.txt; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\VERSION.xml; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\changelog.txt; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_SCILAB}
+Source: modules\{#JVM}\jar\org.scilab.modules.{#JVM}.jar;DestDir: {app}\modules\{#JVM}\jar; Components: {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#JVM}\sci_gateway\{#JVM}_gateway.xml; DestDir: {app}\modules\{#JVM}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#JVM}\license.txt; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\readme.txt; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\VERSION.xml; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\changelog.txt; DestDir: {app}\modules\{#JVM}; Components: {#COMPN_JVM_MODULE}
 ;
-;Source: modules\{#JVM}\includes\*.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\includes\getScilabJavaVM.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\includes\getScilabJNIEnv.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\includes\addToClasspath.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\includes\addToLibrarypath.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\includes\getScilabObject.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\includes\dynlib_jvm.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_SCILAB}
+Source: modules\{#JVM}\sci_gateway\{#JVM}_gateway.xml; DestDir: {app}\modules\{#JVM}\sci_gateway; Components: {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#JVM}\etc\{#JVM}.quit; DestDir: {app}\modules\{#JVM}\etc; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\etc\{#JVM}.start; DestDir: {app}\modules\{#JVM}\etc; Components: {#COMPN_SCILAB}
+;Source: modules\{#JVM}\includes\*.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\includes\getScilabJavaVM.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\includes\getScilabJNIEnv.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\includes\addToClasspath.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\includes\addToLibrarypath.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\includes\getScilabObject.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\includes\dynlib_jvm.h; DestDir: {app}\modules\{#JVM}\includes; Components: {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#JVM}\macros\buildmacros.sce; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\macros\buildmacros.bat; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\macros\cleanmacros.bat; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\macros\lib; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\macros\names; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\macros\*.bin; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_SCILAB}
-Source: modules\{#JVM}\macros\*.sci; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#JVM}\etc\{#JVM}.quit; DestDir: {app}\modules\{#JVM}\etc; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\etc\{#JVM}.start; DestDir: {app}\modules\{#JVM}\etc; Components: {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#JVM}\tests\*.*; DestDir: {app}\modules\{#JVM}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
+Source: modules\{#JVM}\macros\buildmacros.sce; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\macros\buildmacros.bat; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\macros\cleanmacros.bat; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\macros\lib; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\macros\names; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\macros\*.bin; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
+Source: modules\{#JVM}\macros\*.sci; DestDir: {app}\modules\{#JVM}\macros; Components: {#COMPN_JVM_MODULE}
+;
+Source: modules\{#JVM}\tests\*.*; DestDir: {app}\modules\{#JVM}\tests; Flags: recursesubdirs; Components: {#COMPN_JVM_MODULE} and {#COMPN_TESTS}
 ;
 ;--------------------------------------------------------------------------------------------------------------
index 871a439..8689173 100644 (file)
@@ -1,50 +1,69 @@
 /*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Allan CORNET
- * 
- * 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
- *
- */
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) INRIA - Allan CORNET
+* Copyright (C) DIGITEO - 2010 - Allan CORNET
+* 
+* 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
+*
+*/
 
 /*--------------------------------------------------------------------------*/ 
+#ifdef _MSC_VER
+#include <jni.h> /* JavaVM */
+#endif
 #include "Scierror.h"
-#include "with_java.h"
+#include "gw_jvm.h"
+#include "dynlib_jvm.h"
 #include "InitializeJVM.h"
 #include "TerminateJVM.h"
 #include "loadBackGroundClassPath.h"
+#include "loadOnUseClassPath.h"
 #include "localization.h"
-
 /*--------------------------------------------------------------------------*/ 
-/* not using gw_jvm.h */
-int gw_jvm(void);
+#ifdef _MSC_VER
+JVM_IMPEXP JavaVM *getScilabJavaVM(void)
+{
+    return NULL;
+}
+/*--------------------------------------------------------------------------*/ 
+JVM_IMPEXP jobject getScilabObject(void)
+{
+    return NULL;
+}
+/*--------------------------------------------------------------------------*/ 
+JVM_IMPEXP JNIEnv *getScilabJNIEnv(void)
+{
+    return NULL;
+}
+#endif
 /*--------------------------------------------------------------------------*/ 
 int gw_jvm(void)
 {
-       Scierror(999,_("Scilab Java module not installed.\n"));
-       return 0;
+    Scierror(999,_("Scilab Java module not installed.\n"));
+    return 0;
 }
 /*--------------------------------------------------------------------------*/ 
 BOOL InitializeJVM(void)
 {
-       return FALSE;
+    return FALSE;
 }
 /*--------------------------------------------------------------------------*/ 
 BOOL TerminateJVM(void)
 {
-       return FALSE;
+    return FALSE;
 }
 /*--------------------------------------------------------------------------*/ 
-BOOL with_java(void)
+BOOL loadBackGroundClassPath(void)
 {
-       return FALSE;   
+    return FALSE;
 }
-/*--------------------------------------------------------------------------*/ 
-BOOL loadBackGroundClassPath(void)
+/*--------------------------------------------------------------------------*/
+BOOL loadOnUseClassPath(char *tag)
 {
-       return FALSE;
+    return FALSE;
 }
 /*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/jvm/src/nojvm/nojvm.rc b/scilab/modules/jvm/src/nojvm/nojvm.rc
new file mode 100644 (file)
index 0000000..5a8badf
--- /dev/null
@@ -0,0 +1,97 @@
+// Microsoft Visual C++ generated resource script.
+//
+
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+//#include "afxres.h"
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// French (France) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+#ifdef _WIN32
+LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 5,3,0,0
+ PRODUCTVERSION 5,3,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x0L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040c04b0"
+        BEGIN
+            VALUE "FileDescription", "nojvm module"
+            VALUE "FileVersion", "5, 3, 0, 0"
+            VALUE "InternalName", "nojvm module"
+            VALUE "LegalCopyright", "Copyright (C) 2010"
+            VALUE "OriginalFilename", "nolibjvm.dll"
+            VALUE "ProductName", " nojvm"
+            VALUE "ProductVersion", "5, 3, 0, 0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x40c, 1200
+    END
+END
+
+#endif    // French (France) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/scilab/modules/jvm/src/nojvm/nojvm.vcproj b/scilab/modules/jvm/src/nojvm/nojvm.vcproj
new file mode 100644 (file)
index 0000000..66df8c8
--- /dev/null
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9,00"
+       Name="nolibjvm"
+       ProjectGUID="{889AD61B-12E9-4F85-8525-B83C16C88C3F}"
+       RootNamespace="nolibjvm"
+       Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)bin\"
+                       IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=""
+                               Optimization="0"
+                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine=""
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="../../../../bin/libintl.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile=""
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)bin\"
+                       IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine=""
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="../../../../bin/libintl.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile=""
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="17"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)bin\"
+                       IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=""
+                               InlineFunctionExpansion="1"
+                               FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="0"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine=""
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="../../../../bin/libintl.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile=""
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="$(SolutionDir)bin\"
+                       IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               InlineFunctionExpansion="1"
+                               FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../../libs/intl;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;;LIBJVM_EXPORTS"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="0"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine=""
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="../../../../bin/libintl.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile=""
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="17"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+                       <File
+                               RelativePath=".\nojvm.c"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+                       >
+               </Filter>
+               <Filter
+                       Name="Resource Files"
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+                       >
+                       <File
+                               RelativePath=".\nojvm.rc"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Libraries Dependencies"
+                       >
+               </Filter>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
index 3c89144..39bc774 100644 (file)
@@ -28,7 +28,7 @@ Source: bin\{#SCICOS_BLOCKS}_f.lib; DestDir: {app}\bin; Components: {#COMPN_XCOS
 Source: modules\{#SCICOS_BLOCKS}\VERSION.xml; DestDir: {app}\modules\{#SCICOS_BLOCKS}; Components: {#COMPN_XCOS}
 Source: modules\{#SCICOS_BLOCKS}\readme.txt; DestDir: {app}\modules\{#SCICOS_BLOCKS}; Components: {#COMPN_XCOS}
 Source: modules\{#SCICOS_BLOCKS}\license.txt; DestDir: {app}\modules\{#SCICOS_BLOCKS}; Components: {#COMPN_XCOS}
-Source: modules\{#SCICOS_BLOCKS}\changelog.txt; DestDir: {app}\modules\{#SCICOS_BLOCKS; Components: {#COMPN_XCOS}
+Source: modules\{#SCICOS_BLOCKS}\changelog.txt; DestDir: {app}\modules\{#SCICOS_BLOCKS}; Components: {#COMPN_XCOS}
 ;
 Source: modules\{#SCICOS_BLOCKS}\etc\{#SCICOS_BLOCKS}.quit; DestDir: {app}\modules\{#SCICOS_BLOCKS}\etc; Components: {#COMPN_XCOS}
 Source: modules\{#SCICOS_BLOCKS}\etc\{#SCICOS_BLOCKS}.start; DestDir: {app}\modules\{#SCICOS_BLOCKS}\etc; Components: {#COMPN_XCOS}
index 263adf4..43dd38c 100644 (file)
 ;
 #define TYPES "types"
 ;
-Source: modules\{#TYPES}\jar\org.scilab.modules.{#TYPES}.jar;DestDir: {app}\modules\{#TYPES}\jar; Components: {#COMPN_SCILAB}
+Source: modules\{#TYPES}\jar\org.scilab.modules.{#TYPES}.jar;DestDir: {app}\modules\{#TYPES}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#TYPES}\VERSION.xml; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB}
-Source: modules\{#TYPES}\readme.txt; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB}
-Source: modules\{#TYPES}\license.txt; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB}
-Source: modules\{#TYPES}\changelog.txt; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB}
+Source: modules\{#TYPES}\VERSION.xml; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#TYPES}\readme.txt; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#TYPES}\license.txt; DestDir: {app}\modules\{#TYPES}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#TYPES}\changelog.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}
-Source: modules\{#TYPES}\etc\{#TYPES}.start; DestDir: {app}\modules\{#TYPES}\etc; Components: {#COMPN_SCILAB}
+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}\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\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}\tests\*.*; DestDir: {app}\modules\{#TYPES}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
+;Source: modules\{#TYPES}\tests\*.*; DestDir: {app}\modules\{#TYPES}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
 ;
 ;
 ;--------------------------------------------------------------------------------------------------------------
index 8a6cd09..7133bf9 100644 (file)
 ;
 #define UI_DATA "ui_data"
 ;
-Source: bin\sci{#UI_DATA}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: modules\{#UI_DATA}\jar\org.scilab.modules.{#UI_DATA}.jar;DestDir: {app}\modules\{#UI_DATA}\jar; Components: {#COMPN_SCILAB}
+Source: bin\sci{#UI_DATA}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#UI_DATA}\jar\org.scilab.modules.{#UI_DATA}.jar;DestDir: {app}\modules\{#UI_DATA}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#UI_DATA}\etc\{#UI_DATA}.start;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB}
-Source: modules\{#UI_DATA}\etc\{#UI_DATA}.quit;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB}
-Source: modules\{#UI_DATA}\etc\variablebrowser_menubar.xml;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB}
-Source: modules\{#UI_DATA}\etc\variableeditor_menubar.xml;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#UI_DATA}\etc\{#UI_DATA}.start;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#UI_DATA}\etc\{#UI_DATA}.quit;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#UI_DATA}\etc\variablebrowser_menubar.xml;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#UI_DATA}\etc\variableeditor_menubar.xml;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#UI_DATA}\sci_gateway\{#UI_DATA}_gateway.xml; DestDir: {app}\modules\{#UI_DATA}\sci_gateway; Components: {#COMPN_SCILAB}
+Source: modules\{#UI_DATA}\sci_gateway\{#UI_DATA}_gateway.xml; DestDir: {app}\modules\{#UI_DATA}\sci_gateway; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#UI_DATA}\version.xml; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB}
-Source: modules\{#UI_DATA}\readme.txt; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB}
-Source: modules\{#UI_DATA}\license.txt; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB}
-Source: modules\{#UI_DATA}\changelog.txt; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB}
+Source: modules\{#UI_DATA}\version.xml; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#UI_DATA}\readme.txt; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#UI_DATA}\license.txt; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#UI_DATA}\changelog.txt; DestDir: {app}\modules\{#UI_DATA}; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-Source: modules\{#UI_DATA}\images\icons\*.gif; DestDir: {app}\modules\{#UI_DATA}\images\icons; Components: {#COMPN_SCILAB}
+Source: modules\{#UI_DATA}\images\icons\*.gif; DestDir: {app}\modules\{#UI_DATA}\images\icons; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-;Source: modules\{#UI_DATA}\demos\*.*; DestDir: {app}\modules\{#UI_DATA}\demos; Flags: recursesubdirs;  Components: {#COMPN_SCILAB}
+;Source: modules\{#UI_DATA}\demos\*.*; DestDir: {app}\modules\{#UI_DATA}\demos; Flags: recursesubdirs;  Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
-;Source: modules\{#UI_DATA}\tests\*.*; DestDir: {app}\modules\{#UI_DATA}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
+;Source: modules\{#UI_DATA}\tests\*.*; DestDir: {app}\modules\{#UI_DATA}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} and {#COMPN_JVM_MODULE}
 ;
 ;--------------------------------------------------------------------------------------------------------------
index f31c8bd..34669bc 100644 (file)
@@ -29,6 +29,8 @@
 #include "WndThread.h"
 #include "localization.h"
 #include "LanguagePreferences_Windows.h"
+#include "with_module.h"
+
 /*--------------------------------------------------------------------------*/ 
 #define MIN_STACKSIZE 180000
 /*--------------------------------------------------------------------------*/ 
@@ -81,7 +83,10 @@ int Console_Main(int argc, char **argv)
     while (argcount > 0)
     {
         argcount--;
-        if (_stricmp (my_argv[argcount], "-NW") == 0) nowin = 1;
+        if (_stricmp (my_argv[argcount], "-NW") == 0) 
+        {
+            nowin = 1;
+        }
         else if (_stricmp (my_argv[argcount], "-NS") == 0) startupf = 1;
         else if ( _stricmp(my_argv[argcount],"-NB") == 0) { sci_show_banner = 0; }
         else if (_stricmp (my_argv[argcount], "-NWNI") == 0)
@@ -147,6 +152,12 @@ int Console_Main(int argc, char **argv)
         }
     }
 
+    if (!with_module("jvm")) 
+    {
+        /* no module jvm then we force NWNI mode */
+        setScilabMode(SCILAB_NWNI);
+    }
+
     if (getScilabMode() != SCILAB_NWNI) CreateScilabHiddenWndThread();
 
     if ( (getScilabMode() == SCILAB_NWNI) || (getScilabMode() == SCILAB_NW) )
index ec96758..934274b 100644 (file)
@@ -41,6 +41,23 @@ function [StrFlux, retour] = FindAndReplace(StrFlux, StrFind, StrReplace)
     end
 endfunction
 //------------------------------------------------------------------------------
+function s = getTestsSize()
+  modules = getmodules();
+  total = 0;
+  for i=1:size(modules,'*')
+    files_nonregs = SCI + '/modules/' + modules(i) + '/tests/nonreg_tests/' + findfiles(SCI + '/modules/' + modules(i) + '/tests/nonreg_tests','*.*');
+    files_unit = SCI + '/modules/' + modules(i) + '/tests/unit_tests' + findfiles(SCI + '/modules/' + modules(i) + '/tests/unit_tests','*.*');
+    files_module = [files_nonregs;files_unit];
+    files_nonregs = [];
+    files_unit = [];
+    for j = 1:size(files_module, '*')
+      info = fileinfo(files_module(j));
+      total = total + info(1);
+    end
+  end
+  s = total / 10;
+endfunction
+//------------------------------------------------------------------------------
 function ret = Update_Script_Innosetup(ISSFilenameSource)
 
     printf("Please Waiting ...\n");
@@ -51,6 +68,13 @@ function ret = Update_Script_Innosetup(ISSFilenameSource)
     v = getversion("scilab");
     vstr = getversion();
 
+    [SciFile, err] = FindAndReplace(SciFile, "#define TESTS_SIZE", "#define TESTS_SIZE " + sprintf("%20d",getTestsSize()));
+    if err == %F then
+        ret = err;
+        return;
+    end;
+
+
     [SciFile, err] = FindAndReplace(SciFile, "#define BinariesSourcePath", "#define BinariesSourcePath """ + WSCI + """");
     if err == %F then
         ret = err;
index 1491fbd..ec4bd93 100644 (file)
@@ -19,6 +19,7 @@
 #define ScilabVersion "5.3.0"
 #define CurrentYear "2010"
 #define javaSpecificationVersion "1.6"
+#define TESTS_SIZE 14364741
 ;#define WITH_MODELICAC
 ;#define WITH_CHM
 ;#define SCILAB_X64
@@ -63,6 +64,8 @@
 #include BinariesSourcePath + "\tools\innosetup\registry.iss"
 ;-------------------------------------------------------------------------------
 [Code]
+#include BinariesSourcePath + "\tools\innosetup\code_download.iss"
+#include BinariesSourcePath + "\tools\innosetup\code_modules.iss"
 #include BinariesSourcePath + "\tools\innosetup\code.iss"
 [Run]
 ;-------------------------------------------------------------------------------
index 5ced645..0c9b4f9 100644 (file)
@@ -43,9 +43,6 @@ Source: ACKNOWLEDGEMENTS; DestDir: {app}; Components: {#COMPN_SCILAB}
 ; contrib directory
 Source: contrib\loader.sce; DestDir: {app}\contrib; Components: {#COMPN_SCILAB}
 ;
-; modules directory
-;Source: etc\modules.xml; DestDir: {app}\etc; Flags: onlyifdestfileexists; Components: {#COMPN_SCILAB}
-;
 ; locale directory
 Source: locale\en_US\LC_MESSAGES\scilab.mo ; DestDir: {app}\locale\en_US\LC_MESSAGES; Components: {#COMPN_SCILAB}
 Source: locale\fr_FR\LC_MESSAGES\scilab.mo ; DestDir: {app}\locale\fr_FR\LC_MESSAGES; Components: {#COMPN_SCILAB}
@@ -63,12 +60,9 @@ Source: locale\pl_PL\LC_MESSAGES\scilab.mo ; DestDir: {app}\locale\pl_PL\LC_MESS
 ;
 ; libs directory
 #include BinariesSourcePath + "\libs\libs.iss"
-;
 ; java directory
-; by default
-;Source: java\JRE\*.*; DestDir: {app}\java\JRE; Flags: recursesubdirs; Components: {#COMPN_JRE}
 #ifndef SCILAB_WITHOUT_JRE
-Source: java\JRE\*.*; DestDir: {app}\java\JRE; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: java\JRE\*.*; DestDir: {app}\java\JRE; Flags: recursesubdirs; Components: {#COMPN_JRE}
 #endif
 ;
 ;-------------------------------------------------------------------------------
index 1a7307b..d6fe8e8 100644 (file)
@@ -86,6 +86,7 @@ ca_ES.DescriptionSciNotes = SciNotes: Editor for Scilab
 ca_ES.DescriptionXcos = XCos 1.1
 ca_ES.DescriptionParallel = Parallel Computing with Scilab
 ca_ES.DescriptionModulesManager = Tools for management of extern modules 
+ca_ES.DescriptionModuleJVM = JVM Module
 ;
 ca_ES.ConsoleIconName =Scilab Console
 ;
@@ -120,6 +121,7 @@ ca_ES.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scila
 ca_ES.DescriptionDefaultInstall =Installation (Default)
 ca_ES.DescriptionFullInstall =Full installation
 ca_ES.DescriptionCustomInstall =Custom installation
+ca_ES.DescriptionCLIInstall =Command Line Minimal Installation (no gui)
 ;
 ca_ES.DescriptionCPUOptimization =CPU Optimization for Scilab
 ca_ES.DescriptionATLASLibrary =Atlas Library for Scilab
index 6e0eb2b..a8794c8 100644 (file)
 function IsProcessorFeaturePresent(ProcessorFeature: DWORD): Boolean;
 external 'IsProcessorFeaturePresent@kernel32.dll stdcall';
 
-function isxdl_Download(hWnd: Integer; URL, Filename: PAnsiChar): Integer;
-external 'isxdl_Download@files:isxdl.dll stdcall';
-
-procedure isxdl_AddFile(URL, Filename: PAnsiChar);
-external 'isxdl_AddFile@files:isxdl.dll stdcall';
-
-procedure isxdl_AddFileSize(URL, Filename: PAnsiChar; Size: Cardinal);
-external 'isxdl_AddFileSize@files:isxdl.dll stdcall';
-
-function isxdl_DownloadFiles(hWnd: Integer): Integer;
-external 'isxdl_DownloadFiles@files:isxdl.dll stdcall';
-
-procedure isxdl_ClearFiles;
-external 'isxdl_ClearFiles@files:isxdl.dll stdcall';
-
-function isxdl_IsConnected: Integer;
-external 'isxdl_IsConnected@files:isxdl.dll stdcall';
-
-function isxdl_SetOption(Option, Value: PAnsiChar): Integer;
-external 'isxdl_SetOption@files:isxdl.dll stdcall';
-
-function isxdl_GetFileName(URL: PAnsiChar): PAnsiChar;
-external 'isxdl_GetFileName@files:isxdl.dll stdcall';
-
 function GetModuleHandle(lpModuleName: LongInt): LongInt;
 external 'GetModuleHandleA@kernel32.dll stdcall';
 
 var
         AboutModulesButton: TButton;
-
 //------------------------------------------------------------------------------
-function checkMD5Files(MD5File: String): Boolean;
-    var
-        TmpDirName: String;
-        MD5sumFromTxt: String;
-        MD5sumFromFile: String;
-        filename: String;
-        S: TArrayOfString;
-        L,i: Longint;
-        bOK: Boolean;
-        MD5Compare: Integer;
-
+function isCLIType(): Boolean;
     begin
         Result := true;
-        TmpDirName := ExpandConstant('{tmp}') + '\';
-        if FileExists(MD5File) then
+        if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}'))) then
             begin
-                bOK := LoadStringsFromFile(MD5File, S);
-                if (bOK = true) then
-                    begin
-                        L := GetArrayLength(S);
-                        for i := 0 to L - 1 do
-                            begin
-                                MD5sumFromTxt := Copy(S[i], 0,Pos('|',S[i]) - 1 );
-                                filename := Copy(S[i],Pos('|',S[i]) + 1, Length(S[i]) - Pos('|',S[i]));
-                                if FileExists( TmpDirName + filename ) then
-                                    begin
-                                        MD5sumFromFile := GetMD5OfFile(TmpDirName + filename);
-                                        MD5Compare := CompareText(MD5sumFromTxt, MD5sumFromFile);
-                                        if (MD5Compare <> 0) then Result:= false;
-                                    end
-                                else
-                                    begin
-                                        Result:= false;
-                                    end;
-                            end;
-                    end
-                else begin
-                    Result := false;
-                end;
-            end else begin
                 Result := false;
             end;
     end;
 //------------------------------------------------------------------------------
-function checkMD5Files_MKL: Boolean;
-    begin
-        Result := checkMD5Files(ExpandConstant('{tmp}') + '\' + 'md5-mkl.txt');
-    end;
-//------------------------------------------------------------------------------
-function checkMD5Files_MKL_FFTW: Boolean;
-    begin
-        Result := checkMD5Files(ExpandConstant('{tmp}') + '\' + 'md5-mkl-fftw.txt');
-    end;
-//------------------------------------------------------------------------------
-function Install_MKL: Boolean;
-    var
-        TmpDirNameMKL: String;
-        DestinationDir: String;
-
-        bOK: Boolean;
-
-    begin
-        Result := false;
-
-        TmpDirNameMKL := ExpandConstant('{tmp}') + '\';
-        bOK := true;
-
-        if not FileExists( TmpDirNameMKL + 'blasplus.dll' ) then bOK:= false;
-        if not FileExists( TmpDirNameMKL + 'lapack.dll' ) then bOK:= false;
-        if not FileExists( TmpDirNameMKL + 'readme-mkl.txt' ) then bOK:= false;
-
-        if (bOK = true) then
-            begin
-                Result := true;
-                DestinationDir := ExpandConstant('{app}') + '\bin\';
-
-                bOK := FileCopy(TmpDirNameMKL + 'blasplus.dll', DestinationDir + 'blasplus.dll', false);
-                if (bOK = false) then Result := false;
-
-                bOK := FileCopy(TmpDirNameMKL + 'lapack.dll', DestinationDir + 'lapack.dll', false);
-                if (bOK = false) then Result := false;
-
-                bOK := FileCopy(TmpDirNameMKL + 'readme-mkl.txt', DestinationDir + 'readme-mkl.txt', false);
-                if (bOK = false) then Result := false;
-            end;
-    end;
-//------------------------------------------------------------------------------
-function Install_MKL_FFTW: Boolean;
-    var
-        TmpDirNameMKL_FFTW: String;
-        DestinationDir: String;
-
-        bOK: Boolean;
-
+function getExecNameForDesktop(Param: String): String;
     begin
-        Result := false;
-
-        TmpDirNameMKL_FFTW := ExpandConstant('{tmp}') + '\';
-        bOK := true;
-
-        if not FileExists( TmpDirNameMKL_FFTW + 'libfftw3-3.dll' ) then bOK:= false;
-        if not FileExists( TmpDirNameMKL_FFTW + 'readme.txt' ) then bOK:= false;
-
-        if (bOK = true) then
-            begin
-                Result := true;
-                DestinationDir := ExpandConstant('{app}') + '\bin\fftw\';
-                bOK := CreateDir(DestinationDir);
-                if (bOK = false) then Result := false;
-
-                bOK := FileCopy(TmpDirNameMKL_FFTW + 'libfftw3-3.dll', DestinationDir + 'libfftw3-3.dll', false);
-                if (bOK = false) then Result := false;
-
-                bOK := FileCopy(TmpDirNameMKL_FFTW + 'readme.txt', DestinationDir + 'readme-fftw.txt', false);
-                if (bOK = false) then Result := false;
-            end;
-    end;
-//------------------------------------------------------------------------------
-function Download_MKL: Boolean;
-    var
-        hWnd: Integer;
-        URL, DestinationTmpDirNameMKL: String;
-        r : Integer;
-    begin
-        Result := False;
-
-        isxdl_SetOption('label', CustomMessage('DownloadMKLLabel'));
-        isxdl_SetOption('description', CustomMessage('DownloadMKLDescription'));
-        isxdl_SetOption('resume', 'false');
-
-        #ifdef SCILAB_X64
-        URL := ExpandConstant('{#MKL_DOWNLOAD_HTTP}') +'/x64/';
-        #else
-        URL := ExpandConstant('{#MKL_DOWNLOAD_HTTP}')+ '/x86/';
-        #endif
-
-        DestinationTmpDirNameMKL := ExpandConstant('{tmp}') + '\';
-
-        r := isxdl_IsConnected();
-        if (r = 1) then
-            begin
-                isxdl_AddFile(URL + 'blasplus.dll', DestinationTmpDirNameMKL + 'blasplus.dll');
-                isxdl_AddFile(URL + 'lapack.dll', DestinationTmpDirNameMKL + 'lapack.dll');
-                isxdl_AddFile(URL + 'readme-mkl.txt', DestinationTmpDirNameMKL + 'readme-mkl.txt');
-                isxdl_AddFile(URL + 'md5-mkl.txt', DestinationTmpDirNameMKL + 'md5-mkl.txt');
-
-                hWnd := StrToInt(ExpandConstant('{wizardhwnd}'));
-                if isxdl_DownloadFiles(hWnd) = 0 then
-                    begin
-                        Result := false;
-                end else begin
-                        Result := True;
-                    end;
-            end;
-    end;
-//------------------------------------------------------------------------------
-function Download_MKL_FFTW: Boolean;
-    var
-        hWnd: Integer;
-        URL, DestinationTmpDirNameMKL_FFTW: String;
-        r : Integer;
-    begin
-        Result := False;
-
-        isxdl_SetOption('label', CustomMessage('DownloadMKLFFTWLabel'));
-        isxdl_SetOption('description', CustomMessage('DownloadMKLDescription'));
-        isxdl_SetOption('resume', 'false');
-
-        #ifdef SCILAB_X64
-        URL := ExpandConstant('{#MKL_FFTW_DOWNLOAD_HTTP}') +'/x64/';
-        #else
-        URL := ExpandConstant('{#MKL_FFTW_DOWNLOAD_HTTP}')+ '/x86/';
-        #endif
-
-        DestinationTmpDirNameMKL_FFTW := ExpandConstant('{tmp}') + '\';
-
-        r := isxdl_IsConnected();
-        if (r = 1) then
-            begin
-                isxdl_AddFile(URL + 'libfftw3-3.dll', DestinationTmpDirNameMKL_FFTW + 'libfftw3-3.dll');
-                isxdl_AddFile(URL + 'md5-mkl-fftw.txt', DestinationTmpDirNameMKL_FFTW + 'md5-mkl-fftw.txt');
-                isxdl_AddFile(URL + 'readme.txt', DestinationTmpDirNameMKL_FFTW + 'readme.txt');
-
-                hWnd := StrToInt(ExpandConstant('{wizardhwnd}'));
-                if isxdl_DownloadFiles(hWnd) = 0 then
-                    begin
-                        Result := false;
-                end else begin
-                        Result := True;
-                    end;
-            end;
-    end;
-//------------------------------------------------------------------------------
-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[i] := '';
-          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 Allan CORNET'; i := i + 1;
-        ModulesXmlFileLines[i] := ' @date DIGITEO 2010'; 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;
-                ModulesXmlFileLines[i] := '<module name="helptools" activate="yes"/>'; i := i + 1;
-                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_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="shell" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="action_binding" 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="gui" 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="interpolation" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="io" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="output_stream" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="intersci" activate="yes"/>'; i := i + 1;
-                ModulesXmlFileLines[i] := '<module name="jvm" 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="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;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_OPTIM}') ) 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_POLY}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="polynomials" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SIGPROC}') ) then
+        if (isCLIType() = true) then
             begin
-                ModulesXmlFileLines[i] := '<module name="signal_processing" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SPARSE}') ) 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_SYMB}') ) 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_STATS}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="statistics" activate="yes"/>'; i := i + 1;
-            end;
-
-        ModulesXmlFileLines[i] := '<!-- comments -->'; i := i + 1;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_ARNOLDI}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="arnoldi" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_COMPATFUNCTIONS}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="compatibility_functions" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_JAVASCI}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="javasci" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_MAP2SCI}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="maple2scilab" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_M2SCI}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="m2sci" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_MEXLIB}') ) 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_TEXMACS}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="texmacs" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SOUND}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="sound" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_RANDLIB}') ) 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_SPREADSHEET}') ) 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_PVM}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="pvm" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_FFTW}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="fftw" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_UMFPACK}') ) 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;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_MATIO}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="matio" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_ATOMS}') ) 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] := '<module name="types" activate="yes"/>'; i := i + 1;
-        ModulesXmlFileLines[i] := '<module name="hdf5" activate="yes"/>'; i := i + 1;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_SCINOTES}') ) then
-            begin
-                ModulesXmlFileLines[i] := '<module name="scinotes" activate="yes"/>'; i := i + 1;
-            end;
-
-        if IsComponentSelected( ExpandConstant('{#COMPN_PARALLEL}') ) then
+                Result := ExpandConstant('{app}') + '\bin\scilex.exe';
+            end
+        else
             begin
-                ModulesXmlFileLines[i] := '<module name="parallel" activate="yes"/>'; i := i + 1;
+                Result := ExpandConstant('{app}') + '\bin\wscilex.exe';
             end;
-
-        ModulesXmlFileLines[i] := '</modules>'; i := i + 1;
-
-    Result := SaveStringsToFile(ModuleFileName, ModulesXmlFileLines, False);
-
     end;
 //------------------------------------------------------------------------------
 function DoTasksJustAfterInstall: Boolean;
@@ -703,14 +243,14 @@ end;
 
         if (CurPageId = wpSelectComponents) then
             begin
-//              if ( IsComponentSelected( ExpandConstant('{#COMPN_JRE}') ) = false ) then
-//                  begin
-//                      bRes := VerifyJREVersion();
-//                      if ( bRes = false ) then
-//                          begin
-//                              Result := false;
-//                          end;
-//                  end;
+              if ( IsComponentSelected( ExpandConstant('{#COMPN_JRE}') ) = false ) then
+                  begin
+                      bRes := VerifyJREVersion();
+                      if ( bRes = false ) then
+                          begin
+                              Result := false;
+                          end;
+                  end;
 
                 if ( (IsComponentSelected( ExpandConstant('{#COMPN_DEVTOOLS}') ) = false) and (IsComponentSelected( ExpandConstant('{#COMPN_TOOLBOX_SKELETON}') ) = true) ) then
                     begin
diff --git a/scilab/tools/innosetup/code_download.iss b/scilab/tools/innosetup/code_download.iss
new file mode 100644 (file)
index 0000000..78785e1
--- /dev/null
@@ -0,0 +1,232 @@
+//
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) DIGITEO - 2010 - Allan CORNET
+//
+// 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
+//
+//------------------------------------------------------------------------------
+// Inno Setup Script (5.3 and more) for Scilab (UNICODE version required)
+//
+//------------------------------------------------------------------------------
+
+function isxdl_Download(hWnd: Integer; URL, Filename: PAnsiChar): Integer;
+external 'isxdl_Download@files:isxdl.dll stdcall';
+
+procedure isxdl_AddFile(URL, Filename: PAnsiChar);
+external 'isxdl_AddFile@files:isxdl.dll stdcall';
+
+procedure isxdl_AddFileSize(URL, Filename: PAnsiChar; Size: Cardinal);
+external 'isxdl_AddFileSize@files:isxdl.dll stdcall';
+
+function isxdl_DownloadFiles(hWnd: Integer): Integer;
+external 'isxdl_DownloadFiles@files:isxdl.dll stdcall';
+
+procedure isxdl_ClearFiles;
+external 'isxdl_ClearFiles@files:isxdl.dll stdcall';
+
+function isxdl_IsConnected: Integer;
+external 'isxdl_IsConnected@files:isxdl.dll stdcall';
+
+function isxdl_SetOption(Option, Value: PAnsiChar): Integer;
+external 'isxdl_SetOption@files:isxdl.dll stdcall';
+
+function isxdl_GetFileName(URL: PAnsiChar): PAnsiChar;
+external 'isxdl_GetFileName@files:isxdl.dll stdcall';
+//------------------------------------------------------------------------------
+function checkMD5Files(MD5File: String): Boolean;
+    var
+        TmpDirName: String;
+        MD5sumFromTxt: String;
+        MD5sumFromFile: String;
+        filename: String;
+        S: TArrayOfString;
+        L,i: Longint;
+        bOK: Boolean;
+        MD5Compare: Integer;
+
+    begin
+        Result := true;
+        TmpDirName := ExpandConstant('{tmp}') + '\';
+        if FileExists(MD5File) then
+            begin
+                bOK := LoadStringsFromFile(MD5File, S);
+                if (bOK = true) then
+                    begin
+                        L := GetArrayLength(S);
+                        for i := 0 to L - 1 do
+                            begin
+                                MD5sumFromTxt := Copy(S[i], 0,Pos('|',S[i]) - 1 );
+                                filename := Copy(S[i],Pos('|',S[i]) + 1, Length(S[i]) - Pos('|',S[i]));
+                                if FileExists( TmpDirName + filename ) then
+                                    begin
+                                        MD5sumFromFile := GetMD5OfFile(TmpDirName + filename);
+                                        MD5Compare := CompareText(MD5sumFromTxt, MD5sumFromFile);
+                                        if (MD5Compare <> 0) then Result:= false;
+                                    end
+                                else
+                                    begin
+                                        Result:= false;
+                                    end;
+                            end;
+                    end
+                else begin
+                    Result := false;
+                end;
+            end else begin
+                Result := false;
+            end;
+    end;
+//------------------------------------------------------------------------------
+function checkMD5Files_MKL: Boolean;
+    begin
+        Result := checkMD5Files(ExpandConstant('{tmp}') + '\' + 'md5-mkl.txt');
+    end;
+//------------------------------------------------------------------------------
+function checkMD5Files_MKL_FFTW: Boolean;
+    begin
+        Result := checkMD5Files(ExpandConstant('{tmp}') + '\' + 'md5-mkl-fftw.txt');
+    end;
+//------------------------------------------------------------------------------
+function Install_MKL: Boolean;
+    var
+        TmpDirNameMKL: String;
+        DestinationDir: String;
+
+        bOK: Boolean;
+
+    begin
+        Result := false;
+
+        TmpDirNameMKL := ExpandConstant('{tmp}') + '\';
+        bOK := true;
+
+        if not FileExists( TmpDirNameMKL + 'blasplus.dll' ) then bOK:= false;
+        if not FileExists( TmpDirNameMKL + 'lapack.dll' ) then bOK:= false;
+        if not FileExists( TmpDirNameMKL + 'readme-mkl.txt' ) then bOK:= false;
+
+        if (bOK = true) then
+            begin
+                Result := true;
+                DestinationDir := ExpandConstant('{app}') + '\bin\';
+
+                bOK := FileCopy(TmpDirNameMKL + 'blasplus.dll', DestinationDir + 'blasplus.dll', false);
+                if (bOK = false) then Result := false;
+
+                bOK := FileCopy(TmpDirNameMKL + 'lapack.dll', DestinationDir + 'lapack.dll', false);
+                if (bOK = false) then Result := false;
+
+                bOK := FileCopy(TmpDirNameMKL + 'readme-mkl.txt', DestinationDir + 'readme-mkl.txt', false);
+                if (bOK = false) then Result := false;
+            end;
+    end;
+//------------------------------------------------------------------------------
+function Install_MKL_FFTW: Boolean;
+    var
+        TmpDirNameMKL_FFTW: String;
+        DestinationDir: String;
+
+        bOK: Boolean;
+
+    begin
+        Result := false;
+
+        TmpDirNameMKL_FFTW := ExpandConstant('{tmp}') + '\';
+        bOK := true;
+
+        if not FileExists( TmpDirNameMKL_FFTW + 'libfftw3-3.dll' ) then bOK:= false;
+        if not FileExists( TmpDirNameMKL_FFTW + 'readme.txt' ) then bOK:= false;
+
+        if (bOK = true) then
+            begin
+                Result := true;
+                DestinationDir := ExpandConstant('{app}') + '\bin\fftw\';
+                bOK := CreateDir(DestinationDir);
+                if (bOK = false) then Result := false;
+
+                bOK := FileCopy(TmpDirNameMKL_FFTW + 'libfftw3-3.dll', DestinationDir + 'libfftw3-3.dll', false);
+                if (bOK = false) then Result := false;
+
+                bOK := FileCopy(TmpDirNameMKL_FFTW + 'readme.txt', DestinationDir + 'readme-fftw.txt', false);
+                if (bOK = false) then Result := false;
+            end;
+    end;
+//------------------------------------------------------------------------------
+function Download_MKL: Boolean;
+    var
+        hWnd: Integer;
+        URL, DestinationTmpDirNameMKL: String;
+        r : Integer;
+    begin
+        Result := False;
+
+        isxdl_SetOption('label', CustomMessage('DownloadMKLLabel'));
+        isxdl_SetOption('description', CustomMessage('DownloadMKLDescription'));
+        isxdl_SetOption('resume', 'false');
+
+        #ifdef SCILAB_X64
+        URL := ExpandConstant('{#MKL_DOWNLOAD_HTTP}') +'/x64/';
+        #else
+        URL := ExpandConstant('{#MKL_DOWNLOAD_HTTP}')+ '/x86/';
+        #endif
+
+        DestinationTmpDirNameMKL := ExpandConstant('{tmp}') + '\';
+
+        r := isxdl_IsConnected();
+        if (r = 1) then
+            begin
+                isxdl_AddFile(URL + 'blasplus.dll', DestinationTmpDirNameMKL + 'blasplus.dll');
+                isxdl_AddFile(URL + 'lapack.dll', DestinationTmpDirNameMKL + 'lapack.dll');
+                isxdl_AddFile(URL + 'readme-mkl.txt', DestinationTmpDirNameMKL + 'readme-mkl.txt');
+                isxdl_AddFile(URL + 'md5-mkl.txt', DestinationTmpDirNameMKL + 'md5-mkl.txt');
+
+                hWnd := StrToInt(ExpandConstant('{wizardhwnd}'));
+                if isxdl_DownloadFiles(hWnd) = 0 then
+                    begin
+                        Result := false;
+                end else begin
+                        Result := True;
+                    end;
+            end;
+    end;
+//------------------------------------------------------------------------------
+function Download_MKL_FFTW: Boolean;
+    var
+        hWnd: Integer;
+        URL, DestinationTmpDirNameMKL_FFTW: String;
+        r : Integer;
+    begin
+        Result := False;
+
+        isxdl_SetOption('label', CustomMessage('DownloadMKLFFTWLabel'));
+        isxdl_SetOption('description', CustomMessage('DownloadMKLDescription'));
+        isxdl_SetOption('resume', 'false');
+
+        #ifdef SCILAB_X64
+        URL := ExpandConstant('{#MKL_FFTW_DOWNLOAD_HTTP}') +'/x64/';
+        #else
+        URL := ExpandConstant('{#MKL_FFTW_DOWNLOAD_HTTP}')+ '/x86/';
+        #endif
+
+        DestinationTmpDirNameMKL_FFTW := ExpandConstant('{tmp}') + '\';
+
+        r := isxdl_IsConnected();
+        if (r = 1) then
+            begin
+                isxdl_AddFile(URL + 'libfftw3-3.dll', DestinationTmpDirNameMKL_FFTW + 'libfftw3-3.dll');
+                isxdl_AddFile(URL + 'md5-mkl-fftw.txt', DestinationTmpDirNameMKL_FFTW + 'md5-mkl-fftw.txt');
+                isxdl_AddFile(URL + 'readme.txt', DestinationTmpDirNameMKL_FFTW + 'readme.txt');
+
+                hWnd := StrToInt(ExpandConstant('{wizardhwnd}'));
+                if isxdl_DownloadFiles(hWnd) = 0 then
+                    begin
+                        Result := false;
+                end else begin
+                        Result := True;
+                    end;
+            end;
+    end;
+//------------------------------------------------------------------------------
diff --git a/scilab/tools/innosetup/code_modules.iss b/scilab/tools/innosetup/code_modules.iss
new file mode 100644 (file)
index 0000000..ea74620
--- /dev/null
@@ -0,0 +1,326 @@
+//
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) DIGITEO - 2010 - Allan CORNET
+//
+// 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
+//
+//------------------------------------------------------------------------------
+// Inno Setup Script (5.3 and more) for Scilab (UNICODE version required)
+//
+//------------------------------------------------------------------------------
+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[i] := '';
+          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 Allan CORNET'; i := i + 1;
+        ModulesXmlFileLines[i] := ' @date DIGITEO 2010'; 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_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="shell" 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;
+                ModulesXmlFileLines[i] := '<module name="console" 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;
+            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;
+            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;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_INTERSCI}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="intersci" activate="yes"/>'; i := i + 1;
+            end;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_INTERP}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="interpolation" activate="yes"/>'; i := i + 1;
+            end;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_OPTIM}') ) 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_POLY}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="polynomials" activate="yes"/>'; i := i + 1;
+            end;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_SIGPROC}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="signal_processing" activate="yes"/>'; i := i + 1;
+            end;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_SPARSE}') ) 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_SYMB}') ) 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_STATS}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="statistics" activate="yes"/>'; i := i + 1;
+            end;
+
+        ModulesXmlFileLines[i] := '<!-- comments -->'; i := i + 1;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_ARNOLDI}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="arnoldi" activate="yes"/>'; i := i + 1;
+            end;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_COMPATFUNCTIONS}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="compatibility_functions" activate="yes"/>'; i := i + 1;
+            end;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_JAVASCI}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="javasci" activate="yes"/>'; i := i + 1;
+            end;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_MAP2SCI}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="maple2scilab" activate="yes"/>'; i := i + 1;
+            end;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_M2SCI}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="m2sci" activate="yes"/>'; i := i + 1;
+            end;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_MEXLIB}') ) 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_TEXMACS}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="texmacs" activate="yes"/>'; i := i + 1;
+            end;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_SOUND}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="sound" activate="yes"/>'; i := i + 1;
+            end;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_RANDLIB}') ) 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_SPREADSHEET}') ) 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_PVM}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="pvm" activate="yes"/>'; i := i + 1;
+            end;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_FFTW}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="fftw" activate="yes"/>'; i := i + 1;
+            end;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_UMFPACK}') ) 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;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_MATIO}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="matio" activate="yes"/>'; i := i + 1;
+            end;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_ATOMS}') ) 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;
+
+        if (IsComponentSelected( ExpandConstant('{#COMPN_JVM_MODULE}') )) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="types" activate="yes"/>'; i := i + 1;
+            end;
+
+        ModulesXmlFileLines[i] := '<module name="hdf5" activate="yes"/>'; i := i + 1;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_SCINOTES}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="scinotes" activate="yes"/>'; i := i + 1;
+            end;
+
+        if IsComponentSelected( ExpandConstant('{#COMPN_PARALLEL}') ) then
+            begin
+                ModulesXmlFileLines[i] := '<module name="parallel" activate="yes"/>'; i := i + 1;
+            end;
+
+        ModulesXmlFileLines[i] := '</modules>'; i := i + 1;
+
+    Result := SaveStringsToFile(ModuleFileName, ModulesXmlFileLines, False);
+
+    end;
+//------------------------------------------------------------------------------
index 05bc266..8a0f20f 100644 (file)
 #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'
+
+;
 #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'
 ;
-; by default
-;#define COMPN_JRE 'JRE_1_6_0'
-;
 #define COMPN_INTERP 'interpolation'
 #define COMPN_SIGPROC 'signal_processing'
 
 #define COMPN_PARALLEL 'parallel'
 
 ;
-Name: {#COMPN_SCILAB}; Description: Scilab {#ScilabVersion}; Types: default full custom; Flags: fixed;
+Name: {#COMPN_SCILAB}; Description: Scilab {#ScilabVersion}; Types: default full custom cli; Flags: fixed;
 ;
-Name: {#COMPN_EQUDIF}; Description: {cm:DescriptionEquDif}; Types: default full custom; Flags: fixed;
-Name: {#COMPN_POLY}; Description: {cm:DescriptionPolynomials}; Types: default full custom; Flags: fixed;
-Name: {#COMPN_SYMB}; Description: {cm:DescriptionSymbolic}; Types: default full custom; Flags: fixed;
-Name: {#COMPN_SPARSE}; Description: {cm:DescriptionSparse}; Types: default full custom; Flags: fixed;
-Name: {#COMPN_LINALG}; Description: {cm:DescriptionLinAlg}; Types: default full custom; Flags: fixed;
-Name: {#COMPN_CACSD}; Description: {cm:DescriptionCacsd}; Types: default full custom; Flags: fixed;
+Name: {#COMPN_EQUDIF}; Description: {cm:DescriptionEquDif}; Types: default full custom cli; Flags: fixed;
+Name: {#COMPN_POLY}; Description: {cm:DescriptionPolynomials}; Types: default full custom cli; Flags: fixed;
+Name: {#COMPN_SYMB}; Description: {cm:DescriptionSymbolic}; Types: default full custom cli; Flags: fixed;
+Name: {#COMPN_SPARSE}; Description: {cm:DescriptionSparse}; Types: default full custom cli; Flags: fixed;
+Name: {#COMPN_LINALG}; Description: {cm:DescriptionLinAlg}; Types: default full custom cli; Flags: fixed;
+Name: {#COMPN_CACSD}; Description: {cm:DescriptionCacsd}; Types: default full custom cli; Flags: fixed;
+Name: {#COMPN_STATS}; Description: {cm:DescriptionStats}; Types: default full custom cli; Flags: fixed;
 Name: {#COMPN_GRAPHICS}; Description: {cm:DescriptionGraphics}; Types: default full custom; Flags: fixed;
-Name: {#COMPN_STATS}; Description: {cm:DescriptionStats}; Types: default full custom; Flags: fixed;
+;
+Name: {#COMPN_JVM_MODULE}; Description: {cm:DescriptionModuleJVM}; Types: default full custom; Flags: fixed;
 ;
 Name: {#COMPN_SCINOTES}; Description:{cm:DescriptionSciNotes}; Types: default full custom; Flags: fixed;
 ;
-Name: {#COMPN_CPU_OPTIMIZATION}; Description:{cm:DescriptionCPUOptimization}; Types: default full custom;
+Name: {#COMPN_CPU_OPTIMIZATION}; Description:{cm:DescriptionCPUOptimization}; Types: default full custom cli;
 ;
 Name: {#COMPN_MKL_CPU_LIBRARY}; Description:{cm:DescriptionMKLLibrary}; Flags: exclusive
 ;
@@ -97,7 +101,7 @@ Name: {#COMPN_ATLAS_CPU_LIBRARY}; Description:{cm:DescriptionATLASLibrary}; Flag
 ;
 Name: {#COMPN_REF_CPU_LIBRARY}; Description:{cm:DescriptionRefBlasLibrary}; Flags: exclusive
 ;
-Name: {#COMPN_FFTW}; Description: {cm:DescriptionFftwModule}; Types: default full custom;
+Name: {#COMPN_FFTW}; Description: {cm:DescriptionFftwModule}; Types: default full custom cli;
 Name: {#COMPN_FFTW_MKL_LIBRARY};Description: {cm:DescriptionFftwMKLDownload}; Flags: exclusive
 Name: {#COMPN_FFTW_REF_LIBRARY};Description: {cm:DescriptionRefFftwLibrary}; Flags: exclusive
 ;
@@ -126,11 +130,8 @@ Name: {#COMPN_MAP2SCI}; Description: {cm:DescriptionMaple2sci}; Types: default f
 Name: {#COMPN_TCLSCI}; Description: {cm:DescriptionTclTK}; Types: default full custom;
 ;
 Name: {#COMPN_SPREADSHEET}; Description: {cm:DescriptionSpreadsheet}; Types: default full custom;
-;Name: {#COMPN_PVM}; Description: {cm:DescriptionPvm}; Types: default full custom;
 ;
-#ifdef SCILAB_X64
-;Name: {#COMPN_JRE}; Description: {cm:DescriptionJVM} 1.6.0_18; Types: default full custom;
-#endif
+;Name: {#COMPN_PVM}; Description: {cm:DescriptionPvm}; Types: default full custom;
 ;
 Name: {#COMPN_ATOMS}; Description: {cm:DescriptionAtoms}; Types: default full custom;
 Name: {#COMPN_MODULES_MANAGER}; Description: {cm:DescriptionModulesManager}; Types: default full custom;
@@ -144,8 +145,12 @@ Name: {#COMPN_SIMANNEALING}; Description: {cm:DescriptionSimulAnnealingTlbx}; Ty
 Name: {#COMPN_DEVTOOLS}; Description: {cm:DescriptionDevTools}; Types: full custom;
 ;
 ;
-Name: {#COMPN_TESTS}; Description: {cm:DescriptionTests}; Types: full custom;
+Name: {#COMPN_TESTS}; Description: {cm:DescriptionTests}; Types: full custom; ExtraDiskSpaceRequired: {#TESTS_SIZE}
 Name: {#COMPN_TOOLBOX_SKELETON}; Description: {cm:DescriptionTlbxSkeleton}; Types: full custom;
 ;
+#ifndef SCILAB_WITHOUT_JRE
+Name: {#COMPN_JRE}; Description: {cm:DescriptionJVM} (1.6.0_18); Types: default full custom; Flags: fixed;
+#endif
+;
 ;-------------------------------------------------------------------------------
 ;
index 60fb2e1..829d119 100644 (file)
@@ -85,6 +85,7 @@ de_DE.DescriptionSciNotes = SciNotes: Editor for Scilab
 de_DE.DescriptionXcos = XCos 1.1
 de_DE.DescriptionParallel = Parallel Computing with Scilab
 de_DE.DescriptionModulesManager = Tools for management of extern modules 
+de_DE.DescriptionModuleJVM = JVM Module
 ;
 de_DE.ConsoleIconName =Scilab Console
 ;
@@ -119,6 +120,7 @@ de_DE.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scila
 de_DE.DescriptionDefaultInstall =Installation (Default)
 de_DE.DescriptionFullInstall =Full installation
 de_DE.DescriptionCustomInstall =Custom installation
+de_DE.DescriptionCLIInstall =Command Line Minimal Installation (no gui)
 ;
 de_DE.DescriptionCPUOptimization =CPU Optimization for Scilab
 de_DE.DescriptionATLASLibrary =Atlas Library for Scilab
index b1964c1..f18330a 100644 (file)
@@ -86,6 +86,7 @@ en_US.DescriptionSciNotes = SciNotes: Editor for Scilab
 en_US.DescriptionXcos = XCos 1.1
 en_US.DescriptionParallel = Parallel Computing with Scilab
 en_US.DescriptionModulesManager = Tools for management of extern modules 
+en_US.DescriptionModuleJVM = JVM Module
 ;
 en_US.ConsoleIconName =Scilab Console
 ;
@@ -120,6 +121,7 @@ en_US.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scila
 en_US.DescriptionDefaultInstall =Installation (Default)
 en_US.DescriptionFullInstall =Full installation
 en_US.DescriptionCustomInstall =Custom installation
+en_US.DescriptionCLIInstall =Command Line Minimal Installation (no gui)
 ;
 en_US.DescriptionCPUOptimization =CPU Optimization for Scilab
 en_US.DescriptionATLASLibrary =Atlas Library for Scilab
index 5b7e94f..abd4f53 100644 (file)
@@ -86,6 +86,7 @@ es_ES.DescriptionSciNotes = SciNotes: Editor for Scilab
 es_ES.DescriptionXcos = XCos 1.1
 es_ES.DescriptionParallel = Parallel Computing with Scilab
 es_ES.DescriptionModulesManager = Tools for management of extern modules 
+es_ES.DescriptionModuleJVM = JVM Module
 ;
 es_ES.ConsoleIconName =Scilab Console
 ;
@@ -120,6 +121,7 @@ es_ES.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scila
 es_ES.DescriptionDefaultInstall =Installation (Default)
 es_ES.DescriptionFullInstall =Full installation
 es_ES.DescriptionCustomInstall =Custom installation
+es_ES.DescriptionCLIInstall =Command Line Minimal Installation (no gui)
 ;
 es_ES.DescriptionCPUOptimization =CPU Optimization for Scilab
 es_ES.DescriptionATLASLibrary =Atlas Library for Scilab
index c1c40c1..561d30b 100644 (file)
@@ -70,7 +70,7 @@ fr_FR.DescriptionTclTK =TCL/TK pour Scilab
 fr_FR.DescriptionScipad =Scipad Editeur pour Scilab
 fr_FR.DescriptionSpreadsheet =Boite à outils Feuille de Calculs
 fr_FR.DescriptionPvm =Boite à outils PVM Calcul Parallele
-fr_FR.DescriptionJVM =Java Runtime 1.6.0_18
+fr_FR.DescriptionJVM =Java Runtime
 fr_FR.DescriptionAtlas =Librairie Atlas 3.8.0 optimisée selon le CPU
 fr_FR.DescriptionFftwModule = Interface avec la librairie FFTW3 pour Scilab
 fr_FR.DescriptionFftwMKLDownload = Telecharger la librairie FFTW3 optimisée par Intel Math Kernel Library
@@ -86,6 +86,7 @@ fr_FR.DescriptionSciNotes = SciNotes : Editeur de Texte pour Scilab
 fr_FR.DescriptionXcos = XCos 1.1
 fr_FR.DescriptionParallel = Calculs Parallele avec Scilab
 fr_FR.DescriptionModulesManager = Outils pour créer des modules externes
+fr_FR.DescriptionModuleJVM = JVM Module
 ;
 fr_FR.ConsoleIconName =Console Scilab
 ;
@@ -120,6 +121,7 @@ fr_FR.DescriptionAssociateScicos =Associer les fichiers *.xcos *.cos *.cosf avec
 fr_FR.DescriptionDefaultInstall =Installation (Par défaut)
 fr_FR.DescriptionFullInstall =Installation Complete
 fr_FR.DescriptionCustomInstall =Installation avancée
+fr_FR.DescriptionCLIInstall =Ligne de commandes uniquement (sans interface graphique)
 ;
 fr_FR.DescriptionCPUOptimization =Optimisation CPU pour Scilab
 fr_FR.DescriptionATLASLibrary =Librairie Atlas pourScilab
index 2e60463..840a4fe 100644 (file)
@@ -13,9 +13,9 @@
 ;
 ;-------------------------------------------------------------------------------
 
-Name: {commondesktop}\{#ScilabName}; Filename: {app}\bin\wscilex.exe;WorkingDir: "{app}";Comment: "Start Scilab - The open source platform for numerical computation"; MinVersion: 4,4; Tasks: desktopicon
-Name: {group}\{#ScilabName}; Filename: {app}\bin\wscilex.exe;WorkingDir: "{app}"
-
+Name: {commondesktop}\{#ScilabName}; Filename: {code:getExecNameForDesktop};WorkingDir: "{app}";Comment: "Start Scilab - The open source platform for numerical computation"; MinVersion: 4,4; Tasks: desktopicon
+;
+Name: {group}\{#ScilabName}; Filename: {code:getExecNameForDesktop};WorkingDir: "{app}"
 Name: {group}\{cm:ConsoleIconName}; Filename: {app}\bin\scilex.exe;WorkingDir: "{app}"
 
 #ifdef WITH_CHM
@@ -24,11 +24,7 @@ Name: {group}\{cm:DescriptionHelpScilabCHM}; Filename:"{app}\{cm:ScilabCHM}";
 
 Name: "{group}\{cm:WebIconScilab}"; Filename: "{app}\scilabwebsite.url";
 
-;Name: {group}\{cm:ReadMeIcon}; Filename: {app}\README_Windows.txt;
-
 Name: {group}\{cm:UnInstallIcon}; Filename: {uninstallexe};
-
-; Cree un raccourci sur la "Quick Launch Bar"
-Name: {commonappdata}\Microsoft\Internet Explorer\Quick Launch\Scilab; Filename: {app}\bin\wscilex.exe; Tasks: Quicklaunch
+;
 ;-------------------------------------------------------------------------------
 ;
index 59792a3..798b6e8 100644 (file)
@@ -86,6 +86,7 @@ it_IT.DescriptionSciNotes = SciNotes: Editor for Scilab
 it_IT.DescriptionXcos = XCos 1.1
 it_IT.DescriptionParallel = Parallel Computing with Scilab
 it_IT.DescriptionModulesManager = Tools for management of extern modules 
+it_IT.DescriptionModuleJVM = JVM Module
 ;
 it_IT.ConsoleIconName =Scilab Console
 ;
@@ -120,6 +121,7 @@ it_IT.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scila
 it_IT.DescriptionDefaultInstall =Installation (Default)
 it_IT.DescriptionFullInstall =Full installation
 it_IT.DescriptionCustomInstall =Custom installation
+it_IT.DescriptionCLIInstall =Command Line Minimal Installation (no gui)
 ;
 it_IT.DescriptionCPUOptimization =CPU Optimization for Scilab
 it_IT.DescriptionATLASLibrary =Atlas Library for Scilab
index b42d4c9..7a7366a 100644 (file)
@@ -86,6 +86,7 @@ ja_JP.DescriptionSciNotes = SciNotes: Editor for Scilab
 ja_JP.DescriptionXcos = XCos 1.1
 ja_JP.DescriptionParallel = Parallel Computing with Scilab
 ja_JP.DescriptionModulesManager = Tools for management of extern modules 
+ja_JP.DescriptionModuleJVM = JVM Module
 ;
 ja_JP.ConsoleIconName =Scilab Console
 ;
@@ -120,6 +121,7 @@ ja_JP.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scila
 ja_JP.DescriptionDefaultInstall =Installation (Default)
 ja_JP.DescriptionFullInstall =Full installation
 ja_JP.DescriptionCustomInstall =Custom installation
+ja_JP.DescriptionCLIInstall =Command Line Minimal Installation (no gui)
 ;
 ja_JP.DescriptionCPUOptimization =CPU Optimization for Scilab
 ja_JP.DescriptionATLASLibrary =Atlas Library for Scilab
index 5167a97..a9ab833 100644 (file)
@@ -86,6 +86,7 @@ pl_PL.DescriptionSciNotes = SciNotes: Editor for Scilab
 pl_PL.DescriptionXcos = XCos 1.1
 pl_PL.DescriptionParallel = Parallel Computing with Scilab
 pl_PL.DescriptionModulesManager = Tools for management of extern modules 
+pl_PL.DescriptionModuleJVM = JVM Module
 ;
 pl_PL.ConsoleIconName =Scilab Console
 ;
@@ -120,6 +121,7 @@ pl_PL.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scila
 pl_PL.DescriptionDefaultInstall =Installation (Default)
 pl_PL.DescriptionFullInstall =Full installation
 pl_PL.DescriptionCustomInstall =Custom installation
+pl_PL.DescriptionCLIInstall =Command Line Minimal Installation (no gui)
 ;
 pl_PL.DescriptionCPUOptimization =CPU Optimization for Scilab
 pl_PL.DescriptionATLASLibrary =Atlas Library for Scilab
index 90d678b..cbc9144 100644 (file)
@@ -85,6 +85,7 @@ pt_BR.DescriptionSciNotes = SciNotes: Editor for Scilab
 pt_BR.DescriptionXcos = XCos 1.1
 pt_BR.DescriptionParallel = Parallel Computing with Scilab
 pt_BR.DescriptionModulesManager = Tools for management of extern modules 
+pt_BR.DescriptionModuleJVM = JVM Module
 ;
 pt_BR.ConsoleIconName =Scilab Console
 ;
@@ -119,6 +120,7 @@ pt_BR.DescriptionAssociateScicos =Associate *.cos *.cosf files with scilab
 pt_BR.DescriptionDefaultInstall =Installation (Default)
 pt_BR.DescriptionFullInstall =Full installation
 pt_BR.DescriptionCustomInstall =Custom installation
+pt_BR.DescriptionCLIInstall =Command Line Minimal Installation (no gui)
 ;
 pt_BR.DescriptionCPUOptimization =CPU Optimization for Scilab
 pt_BR.DescriptionATLASLibrary =Atlas Library for Scilab
index 5b5cee2..9bc4676 100644 (file)
@@ -153,34 +153,6 @@ Root: HKCR; Subkey: {#APPLICATION_EXTENSION_COSF}\DefaultIcon; ValueType: string
 Root: HKCR; Subkey: {#APPLICATION_EXTENSION_COSF}\shell\{cm:RegKeyRunWith} {#ScilabName}\command; ValueType: string; ValueData: """{app}\bin\wscilex.exe"" {#ARGUMENT_ACTION_RUN} ""%1"""; Flags: deletekey uninsdeletekey noerror; Tasks: AssociateSCICOS;
 ;
 ;-------------------------------------------------------------------------------
-;Files .sav
-#define APPLICATION_EXTENSION_SAV "Scilab5.sav"
-#define SAV_ENTRY ".sav"
-#define ICON_SAV_POS 6
-;
-Root: HKCR; Subkey: {#SAV_ENTRY}; ValueType: string; ValueData: {#APPLICATION_EXTENSION_SAV}; Flags: deletekey uninsdeletekey noerror; Tasks: AssociateBINSAV
-;
-Root: HKCR; Subkey: {#APPLICATION_EXTENSION_SAV}; ValueType: string; ValueData: "{#ScilabName} Application"; Flags: deletekey uninsdeletekey noerror; Tasks: AssociateBINSAV
-;
-Root: HKCR; Subkey: {#APPLICATION_EXTENSION_SAV}\DefaultIcon; ValueType: string; ValueData: {app}\bin\wscilex.exe,{#ICON_SAV_POS}; Flags: deletekey uninsdeletekey noerror; Tasks: AssociateBINSAV
-;
-Root: HKCR; Subkey: {#APPLICATION_EXTENSION_SAV}\shell\open\command; ValueType: string; ValueData: """{app}\bin\wscilex.exe"" {#ARGUMENT_ACTION_OPEN} ""%1"""; Flags: deletekey uninsdeletekey noerror; Tasks: AssociateBINSAV
-;
-;-------------------------------------------------------------------------------
-;Files .bin
-#define APPLICATION_EXTENSION_BIN "Scilab5.bin"
-#define BIN_ENTRY ".bin"
-#define ICON_BIN_POS 6
-;
-Root: HKCR; Subkey: {#BIN_ENTRY}; ValueType: string; ValueData: {#APPLICATION_EXTENSION_BIN}; Flags: deletekey uninsdeletekey noerror; Tasks: AssociateBINSAV
-;
-Root: HKCR; Subkey: {#APPLICATION_EXTENSION_BIN}; ValueType: string; ValueData: "{#ScilabName} Application"; Flags: deletekey uninsdeletekey noerror; Tasks: AssociateBINSAV
-;
-Root: HKCR; Subkey: {#APPLICATION_EXTENSION_BIN}\DefaultIcon; ValueType: string; ValueData: {app}\bin\wscilex.exe,{#ICON_SAV_POS}; Flags: deletekey uninsdeletekey noerror; Tasks: AssociateBINSAV
-;
-Root: HKCR; Subkey: {#APPLICATION_EXTENSION_BIN}\shell\open\command; ValueType: string; ValueData: """{app}\bin\wscilex.exe"" {#ARGUMENT_ACTION_OPEN} ""%1"""; Flags: deletekey uninsdeletekey noerror; Tasks: AssociateBINSAV
-;
-;-------------------------------------------------------------------------------
 Root: HKCU; Subkey: SOFTWARE\Scilab\{#ScilabName}\Settings; ValueType: string; ValueData: {cm:LANGUAGE}; Flags: createvalueifdoesntexist uninsdeletekey noerror; ValueName: LANGUAGE
 ;
 ;-------------------------------------------------------------------------------
index 7acfb2c..d6dbf8b 100644 (file)
@@ -86,6 +86,7 @@ ru_RU.DescriptionSciNotes = SciNotes: Editor for Scilab
 ru_RU.DescriptionXcos = XCos 1.1
 ru_RU.DescriptionParallel = Parallel Computing with Scilab
 ru_RU.DescriptionModulesManager = Tools for management of extern modules 
+ru_RU.DescriptionModuleJVM = JVM Module
 ;
 ru_RU.ConsoleIconName =Scilab Console
 ;
@@ -120,6 +121,7 @@ ru_RU.DescriptionAssociateScicos =Associate *.cos *.cosf files with scilab
 ru_RU.DescriptionDefaultInstall =Installation (Default)
 ru_RU.DescriptionFullInstall =Full installation
 ru_RU.DescriptionCustomInstall =Custom installation
+ru_RU.DescriptionCLIInstall =Command Line Minimal Installation (no gui)
 ;
 ru_RU.DescriptionCPUOptimization =CPU Optimization for Scilab
 ru_RU.DescriptionATLASLibrary =Atlas Library for Scilab
index d5db7eb..6920e6c 100644 (file)
@@ -16,6 +16,6 @@
 #ifndef SCILAB_X64
 Filename: {app}\bin\SetupAtlas.exe; Description:{cm:DescriptionConfigureAtlas}; Flags: nowait; Components: {#COMPN_ATLAS_CPU_LIBRARY}
 #endif
-Filename: {app}\bin\wscilex.exe; Description: {cm:DescriptionLaunchScilab}; Flags: nowait postinstall skipifsilent;
+Filename: {code:getExecNameForDesktop}; Description: {cm:DescriptionLaunchScilab}; Flags: nowait postinstall skipifsilent;
 ;-------------------------------------------------------------------------------
 ;
index 1c0f6fa..a820a6b 100644 (file)
 
 Name: desktopicon; Description:{cm:DescriptionCreateDesktopIcon}; GroupDescription: Additional icons:; MinVersion: 4,4
 ;
-Name: Quicklaunch; Description:{cm:DescriptionQuickLaunch}; GroupDescription: Additional icons:; MinVersion: 4,4
-;
 Name: AssociateSCESCI; Description:{cm:DescriptionAssociateSceSci}; GroupDescription: Files Association:; Components: {#COMPN_SCINOTES}
 ;
 Name: AssociateTSTDEM; Description:{cm:DescriptionAssociateTstDem}; GroupDescription: Files Association:; Components: {#COMPN_SCINOTES}
 ;
-Name: AssociateBINSAV; Description:{cm:DescriptionAssociateBinSav}; GroupDescription: Files Association:; Flags: unchecked
-;
 Name: AssociateSCICOS; Description:{cm:DescriptionAssociateScicos}; GroupDescription: Files Association:; Components: {#COMPN_XCOS}
 ;
 ;-------------------------------------------------------------------------------
index dfd6f49..df8c3c2 100644 (file)
@@ -18,5 +18,7 @@ Name: full; Description: {cm:DescriptionFullInstall}
 Name: default; Description: {cm:DescriptionDefaultInstall}
 ;
 Name: custom; Description: {cm:DescriptionCustomInstall}; Flags: iscustom
+
+Name: cli; Description: {cm:DescriptionCLIInstall};
 ;
 ;-------------------------------------------------------------------------------
index f2c4382..b0f5981 100644 (file)
@@ -86,6 +86,7 @@ uk_UA.DescriptionSciNotes = SciNotes: Editor for Scilab
 uk_UA.DescriptionXcos = XCos 1.1
 uk_UA.DescriptionParallel = Parallel Computing with Scilab
 uk_UA.DescriptionModulesManager = Tools for management of extern modules 
+uk_UA.DescriptionModuleJVM = JVM Module
 ;
 uk_UA.ConsoleIconName =Scilab Console
 ;
@@ -120,6 +121,7 @@ uk_UA.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scila
 uk_UA.DescriptionDefaultInstall =Installation (Default)
 uk_UA.DescriptionFullInstall =Full installation
 uk_UA.DescriptionCustomInstall =Custom installation
+uk_UA.DescriptionCLIInstall =Command Line Minimal Installation (no gui)
 ;
 uk_UA.DescriptionCPUOptimization =CPU Optimization for Scilab
 uk_UA.DescriptionATLASLibrary =Atlas Library for Scilab
index 2017501..5662752 100644 (file)
@@ -85,6 +85,7 @@ zh_CN.DescriptionSciNotes = SciNotes: Editor for Scilab
 zh_CN.DescriptionXcos = XCos 1.1
 zh_CN.DescriptionParallel = Parallel Computing with Scilab
 zh_CN.DescriptionModulesManager = Tools for management of extern modules 
+zh_CN.DescriptionModuleJVM = JVM Module
 ;
 zh_CN.ConsoleIconName =Scilab Console
 ;
@@ -119,6 +120,7 @@ zh_CN.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scila
 zh_CN.DescriptionDefaultInstall =Installation (Default)
 zh_CN.DescriptionFullInstall =Full installation
 zh_CN.DescriptionCustomInstall =Custom installation
+zh_CN.DescriptionCLIInstall =Command Line Minimal Installation (no gui)
 ;
 zh_CN.DescriptionCPUOptimization =CPU Optimization for Scilab
 zh_CN.DescriptionATLASLibrary =Atlas Library for Scilab