update windows installer: remove default installation mode, add installation of VC... 59/12359/3
Antoine ELIAS [Tue, 27 Aug 2013 13:17:13 +0000 (15:17 +0200)]
Change-Id: I471e18be99408159b072c0a071cb72f2ff7a9900

scilab/modules/dynamic_link/macros/windows/dlwIsVc11Pro.sci
scilab/tools/innosetup/Scilab.iss
scilab/tools/innosetup/components.iss
scilab/tools/innosetup/en_US_scilab.isl
scilab/tools/innosetup/files_vcredist.iss [new file with mode: 0644]
scilab/tools/innosetup/fr_FR_scilab.isl
scilab/tools/innosetup/run_vcredist.iss [new file with mode: 0644]
scilab/tools/innosetup/types.iss

index 935073d..84fe58f 100644 (file)
@@ -11,8 +11,7 @@
 function bOK = dlwIsVc11Pro()
     bOK = %f;
     try
-        if winqueryreg('key', 'HKLM', ...
-            'Software\Microsoft\DevDiv\vc\Servicing\11.0') <> []  & ...
+        if winqueryreg('HKLM', 'Software\Microsoft\DevDiv\vs\Servicing\11.0\devenv', "install") == 1  & ...
                 dlwIsVc11Express() == %f then
             bOK = %t;
         end
index 4ac3059..bb220c4 100644 (file)
@@ -53,6 +53,7 @@
 ;-------------------------------------------------------------------------------
 [Files]
 #include BinariesSourcePath + "\tools\innosetup\files.iss"
+#include BinariesSourcePath + "\tools\innosetup\files_vcredist.iss"
 ;
 ;-------------------------------------------------------------------------------
 [Icons]
@@ -76,6 +77,7 @@
 [Run]
 ;-------------------------------------------------------------------------------
 #include BinariesSourcePath + "\tools\innosetup\run.iss"
+#include BinariesSourcePath + "\tools\innosetup\run_vcredist.iss"
 ;-------------------------------------------------------------------------------
 [UninstallDelete]
 #include BinariesSourcePath + "\tools\innosetup\uninstalldelete.iss"
index 7d7a3a2..425ba33 100644 (file)
 
 
 #define COMPN_SCILAB 'scilab'
-Name: {#COMPN_SCILAB}; Description: Scilab {#ScilabVersion}; Types: default full custom cli; Flags: fixed;
+Name: {#COMPN_SCILAB}; Description: Scilab {#ScilabVersion}; Types: full custom cli; Flags: fixed;
 
 #define COMPN_JVM_MODULE 'JVM_MODULE'
 #define COMPN_GRAPHICS 'JVM_MODULE\graphics'
 #define COMPN_XCOS 'JVM_MODULE\xcos'
 #define COMPN_SCINOTES 'JVM_MODULE\scinotes'
 #define COMPN_JRE 'JVM_MODULE\JRE_1_6'
-Name: {#COMPN_JVM_MODULE}; Description: {cm:DescriptionModuleJVM}; Types: default full;
-Name: {#COMPN_GRAPHICS}; Description: {cm:DescriptionGraphics}; Types: default full;
-Name: {#COMPN_XCOS}; Description: {cm:DescriptionXcos}; Types: default full;
-Name: {#COMPN_SCINOTES}; Description:{cm:DescriptionSciNotes}; Types: default full;
+Name: {#COMPN_JVM_MODULE}; Description: {cm:DescriptionModuleJVM}; Types: full;
+Name: {#COMPN_GRAPHICS}; Description: {cm:DescriptionGraphics}; Types: full;
+Name: {#COMPN_XCOS}; Description: {cm:DescriptionXcos}; Types: full;
+Name: {#COMPN_SCINOTES}; Description:{cm:DescriptionSciNotes}; Types: full;
 #ifndef SCILAB_WITHOUT_JRE
-Name: {#COMPN_JRE}; Description: {cm:DescriptionJVM} ({#javaUsed}); Types: default full;
+Name: {#COMPN_JRE}; Description: {cm:DescriptionJVM} ({#javaUsed}); Types: full;
 #endif
 
 #define COMPN_CPU_OPTIMIZATION 'CPU_OPTIMIZATION'
 #define COMPN_REF_CPU_LIBRARY 'CPU_OPTIMIZATION\CPU_REF'
 #define COMPN_ATLAS_CPU_LIBRARY 'CPU_OPTIMIZATION\ATLAS'
 #define COMPN_MKL_CPU_LIBRARY 'CPU_OPTIMIZATION\MKL'
-Name: {#COMPN_CPU_OPTIMIZATION}; Description:{cm:DescriptionCPUOptimization}; Types: default full custom cli; Flags: fixed;
+Name: {#COMPN_CPU_OPTIMIZATION}; Description:{cm:DescriptionCPUOptimization}; Types: full custom cli; Flags: fixed;
 Name: {#COMPN_MKL_CPU_LIBRARY}; Description:{cm:DescriptionMKLLibrary}; Flags: exclusive
 #ifndef SCILAB_X64
 Name: {#COMPN_ATLAS_CPU_LIBRARY}; Description:{cm:DescriptionATLASLibrary}; Flags: exclusive
@@ -44,9 +44,9 @@ Name: {#COMPN_REF_CPU_LIBRARY}; Description:{cm:DescriptionRefBlasLibrary}; Flag
 #define COMPN_FFTW 'FFTW'
 #define COMPN_FFTW_REF_LIBRARY 'FFTW\REF_LIBRARY'
 #define COMPN_FFTW_MKL_LIBRARY 'FFTW\MKL_LIBRARY'
-Name: {#COMPN_FFTW}; Description: {cm:DescriptionFftwModule}; Types: default full custom cli; Flags: fixed;
+Name: {#COMPN_FFTW}; Description: {cm:DescriptionFftwModule}; Types: full custom cli; Flags: fixed;
 Name: {#COMPN_FFTW_MKL_LIBRARY};Description: {cm:DescriptionFftwMKLDownload}; Types: custom cli; Flags: exclusive
-Name: {#COMPN_FFTW_REF_LIBRARY};Description: {cm:DescriptionRefFftwLibrary}; Types: default full custom cli; Flags: exclusive
+Name: {#COMPN_FFTW_REF_LIBRARY};Description: {cm:DescriptionRefFftwLibrary}; Types: full custom cli; Flags: exclusive
 
 #define COMPN_DEVTOOLS 'Development_tools'
 #define COMPN_MODULES_MANAGER 'Development_tools\modules_manager'
@@ -58,7 +58,7 @@ Name: {#COMPN_TOOLBOX_SKELETON}; Description: {cm:DescriptionTlbxSkeleton}; Type
 Name: {#COMPN_TESTS}; Description: {cm:DescriptionTests}; Types: full; ExtraDiskSpaceRequired: {#TESTS_SIZE}
 
 #define COMPN_TCLSCI 'tclsci'
-Name: {#COMPN_TCLSCI}; Description: {cm:DescriptionTclTK}; Types: default full;
+Name: {#COMPN_TCLSCI}; Description: {cm:DescriptionTclTK}; Types: full;
 
 #define COMPN_CHM 'chm_scilab'
 Name: {#COMPN_CHM}; Description: {cm:DescriptionCHM}; Types: full; ExtraDiskSpaceRequired: {#CHM_SIZE}
index 7fbc07f..ce7d248 100644 (file)
@@ -117,6 +117,8 @@ en_US.NextButtonClickwpReadyMsg3 = Impossible to download CHM files (files will
 en_US.DescriptionHelpScilabCHM = Scilab Help
 en_US.ScilabCHM = modules\helptools\chm\scilab_en_US_help.chm
 ;
+en_US.VCREDIST = Installation of Microsoft Visual C++ 2012 Redistributable Package
+
 ;
 ;-------------------------------------------------------------------------------
 ;
diff --git a/scilab/tools/innosetup/files_vcredist.iss b/scilab/tools/innosetup/files_vcredist.iss
new file mode 100644 (file)
index 0000000..5af6af2
--- /dev/null
@@ -0,0 +1,20 @@
+;
+; Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+; Copyright (C) Scilab Enterprises - 2013 - Antoine ELIAS
+;
+; 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.1-en.txt
+;
+;-------------------------------------------------------------------------------
+; Inno Setup Script (5.3 and more) for Scilab (UNICODE version required)
+;
+;-------------------------------------------------------------------------------
+
+#ifdef SCILAB_X64
+Source: tools\innosetup\VCREDIST2012\vcredist_x64.exe; DestDir: {tmp}; Flags: deleteafterinstall ignoreversion
+#else
+Source: tools\innosetup\VCREDIST2012\vcredist_x86.exe; DestDir: {tmp}; Flags: deleteafterinstall ignoreversion
+#endif
index 85a6590..5c3d1d3 100644 (file)
@@ -116,6 +116,8 @@ fr_FR.NextButtonClickwpReadyMsg3 = Impossible de t
 fr_FR.DescriptionHelpScilabCHM = Aide Scilab
 fr_FR.ScilabCHM = modules\helptools\chm\scilab_fr_FR_help.chm
 ;
+fr_FR.VCREDIST = Installation du package redistribuable Microsoft Visual C++ 2012
+
 ;
 ;-------------------------------------------------------------------------------
 ;
diff --git a/scilab/tools/innosetup/run_vcredist.iss b/scilab/tools/innosetup/run_vcredist.iss
new file mode 100644 (file)
index 0000000..bce4258
--- /dev/null
@@ -0,0 +1,20 @@
+;
+; Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+; Copyright (C) Scilab Enterprises - 2013 - Antoine ELIAS
+;
+; 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.1-en.txt
+;
+;-------------------------------------------------------------------------------
+; Inno Setup Script (5.3 and more) for Scilab (UNICODE version required)
+;
+;-------------------------------------------------------------------------------
+
+#ifdef SCILAB_X64
+    Filename: {tmp}\vcredist_x64.exe; Parameters: "/passive"; Description:{cm:VCREDIST}; Flags: waituntilterminated;
+#else
+    Filename: {tmp}\vcredist_x86.exe; Parameters: "/passive"; Description:{cm:VCREDIST}; Flags: waituntilterminated;
+#endif
index 59588fd..173945b 100644 (file)
@@ -12,7 +12,6 @@
 ; Inno Setup Script (5.3 and more) for Scilab (UNICODE version required)
 ;
 ;-------------------------------------------------------------------------------
-Name: default; Description: {cm:DescriptionDefaultInstall}
 Name: full; Description: {cm:DescriptionFullInstall}
 Name: custom; Description: {cm:DescriptionCustomInstall}; Flags: iscustom
 Name: cli; Description: {cm:DescriptionCLIInstall};