add coverage in Windows installer 33/17433/2
Antoine ELIAS [Fri, 6 Nov 2015 11:06:48 +0000 (12:06 +0100)]
Change-Id: I2ed8e398edc2079be03a5b1a782385e6d6c84c10

scilab/modules/coverage/coverage.iss
scilab/modules/slint/slint.iss
scilab/tools/innosetup/code_modules.iss
scilab/tools/innosetup/files.iss

index c76703e..aeb02a0 100644 (file)
@@ -12,7 +12,7 @@
 ; Inno Setup Script (5.3 and more) for Scilab (UNICODE version required)
 ;
 ;--------------------------------------------------------------------------------------------------------------
-; optimization module
+; coverage module
 ;--------------------------------------------------------------------------------------------------------------
 ;
 #define COVERAGE "coverage"
@@ -22,11 +22,8 @@ Source: bin\{#COVERAGE}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#COVERAGE}\data\*.*; DestDir: {app}\modules\{#COVERAGE}\data; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#COVERAGE}\sci_gateway\{#COVERAGE}_gateway.xml; DestDir: {app}\modules\{#COVERAGE}\sci_gateway; Components: {#COMPN_SCILAB}
-;
 Source: modules\{#COVERAGE}\etc\{#COVERAGE}.quit; DestDir: {app}\modules\{#COVERAGE}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#COVERAGE}\etc\{#COVERAGE}.start; DestDir: {app}\modules\{#COVERAGE}\etc; Components: {#COMPN_SCILAB}
-Source: modules\{#COVERAGE}\etc\{#COVERAGE}.xml; DestDir: {app}\modules\{#COVERAGE}\etc; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#COVERAGE}\macros\buildmacros.sce; DestDir: {app}\modules\{#COVERAGE}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#COVERAGE}\macros\buildmacros.bat; DestDir: {app}\modules\{#COVERAGE}\macros; Components: {#COMPN_SCILAB}
@@ -37,6 +34,6 @@ Source: modules\{#COVERAGE}\macros\cleanmacros.bat; DestDir: {app}\modules\{#COV
 ;
 ;Source: modules\{#COVERAGE}\demos\*.*; DestDir: {app}\modules\{#COVERAGE}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#COVERAGE}\tests\*.*; DestDir: {app}\modules\{#COVERAGE}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB}  and {#COMPN_TESTS}
+;Source: modules\{#COVERAGE}\tests\*.*; DestDir: {app}\modules\{#COVERAGE}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB}  and {#COMPN_TESTS}
 ;
 ;--------------------------------------------------------------------------------------------------------------
index 0d45103..101e103 100644 (file)
@@ -25,7 +25,7 @@ Source: modules\{#SLINT}\sci_gateway\{#SLINT}_gateway.xml; DestDir: {app}\module
 Source: modules\{#SLINT}\etc\{#SLINT}.quit; DestDir: {app}\modules\{#SLINT}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#SLINT}\etc\{#SLINT}.start; DestDir: {app}\modules\{#SLINT}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#SLINT}\etc\{#SLINT}.xml; DestDir: {app}\modules\{#SLINT}\etc; Components: {#COMPN_SCILAB}
-S
+;
 Source: modules\{#SLINT}\macros\buildmacros.sce; DestDir: {app}\modules\{#SLINT}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#SLINT}\macros\buildmacros.bat; DestDir: {app}\modules\{#SLINT}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#SLINT}\macros\cleanmacros.bat; DestDir: {app}\modules\{#SLINT}\macros; Components: {#COMPN_SCILAB}
index 9309c38..9f74018 100644 (file)
@@ -96,6 +96,7 @@ begin
     ModulesXmlFileLines[i] := '<module name="types" activate="yes"/>'; i := i + 1;
     ModulesXmlFileLines[i] := '<module name="fftw" activate="yes"/>'; i := i + 1;
     ModulesXmlFileLines[i] := '<module name="slint" activate="yes"/>'; i := i + 1;
+    ModulesXmlFileLines[i] := '<module name="coverage" activate="yes"/>'; i := i + 1;
 
 #ifndef SCILAB_F2C
     //ModulesXmlFileLines[i] := '<module name="parallel" activate="yes"/>'; i := i + 1;
index 816ab37..928517d 100644 (file)
 #include BinariesSourcePath + "\modules\functions_manager\functions_manager.iss"
 #include BinariesSourcePath + "\modules\mpi\mpi.iss"
 #include BinariesSourcePath + "\modules\slint\slint.iss"
+#include BinariesSourcePath + "\modules\coverage\coverage.iss"
 ;-------------------------------------------------------------------------------