fix windows installer to support non admin user account 33/12433/2
Antoine ELIAS [Thu, 5 Sep 2013 12:57:14 +0000 (14:57 +0200)]
fix windows installer after integration of external_objects_java

Change-Id: Ie3d01738f02184f56285de7982b521aa0db430ad

scilab/bin/bin.iss
scilab/modules/external_objects_java/external_objects_java.iss
scilab/tools/innosetup/Scilab.iss
scilab/tools/innosetup/code_modules.iss
scilab/tools/innosetup/en_US_scilab.isl
scilab/tools/innosetup/files.iss
scilab/tools/innosetup/files_vcredist.iss [deleted file]
scilab/tools/innosetup/fr_FR_scilab.isl
scilab/tools/innosetup/run_vcredist.iss [deleted file]

index fb1845d..39db8a0 100644 (file)
 Source: bin\blasplus.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\blasplus.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
+
 #ifndef SCILAB_X64
-; JRE x86 requires this files
-Source: bin\msvcr71.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\iconv.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 #endif
-;
-#ifdef SCILAB_X64
-Source: bin\msvcrt.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-;
-;used by libifcoremd
-Source: bin\msvcr80.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\msvcm80.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\msvcp80.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\Microsoft.VC80.CRT.manifest; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-#endif
-;
-Source: bin\msvcr100.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\msvcp100.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-;
+
+;Visual C++ 2012 redist libraries
+Source: bin\msvcp110.DLL; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\msvcr110.DLL; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\vccorlib110.DLL; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+
+;Visual C++ 2010 redist libraries
+Source: bin\msvcr100.DLL; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\msvcp100.DLL; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+
+
+;MKL
 Source: bin\LIBMMD.DLL; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\libifcoremd.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\libifcorertd.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
index b88e2c8..0498d38 100644 (file)
 ; EXTERNAL_OBJECTS_JAVA module
 ;--------------------------------------------------------------------------------------------------------------
 ;
-#define EXTERNAL_OBJECTS_JAVA_JAVA "EXTERNAL_OBJECTS_JAVA_java"
+#define EXTERNAL_OBJECTS_JAVA "external_objects_java"
 ;
-Source: bin\EXTERNAL_OBJECTS_JAVA.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
-Source: bin\EXTERNAL_OBJECTS_JAVA.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: bin\{#EXTERNAL_OBJECTS_JAVA}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: bin\{#EXTERNAL_OBJECTS_JAVA}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
 Source: thirdparty\ecj.jar; DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\jar\org.scilab.modules.{#EXTERNAL_OBJECTS_JAVA}.jar;DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+;
 Source: modules\{#EXTERNAL_OBJECTS_JAVA}\sci_gateway\{#EXTERNAL_OBJECTS_JAVA}_gateway.xml; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\sci_gateway; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
 Source: modules\{#EXTERNAL_OBJECTS_JAVA}\includes\*.h; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\includes; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
-Source: modules\{#EXTERNAL_OBJECTS_JAVA}\includes\*.hxx; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\includes; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
 Source: modules\{#EXTERNAL_OBJECTS_JAVA}\etc\{#EXTERNAL_OBJECTS_JAVA}.quit; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: modules\{#EXTERNAL_OBJECTS_JAVA}\etc\{#EXTERNAL_OBJECTS_JAVA}.start; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
@@ -33,16 +34,9 @@ Source: modules\{#EXTERNAL_OBJECTS_JAVA}\etc\{#EXTERNAL_OBJECTS_JAVA}.start; Des
 Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\buildmacros.sce; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\buildmacros.bat; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\cleanmacros.bat; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
-Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\*.bin; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
-Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\*.sci; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
-Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\lib; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
-Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\names; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
-;
-Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\lib; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
-Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\names; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
-Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\*.sci; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
-Source: modules\{#EXTERNAL_OBJECTS_JAVA}\macros\*.bin; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
 Source: modules\{#EXTERNAL_OBJECTS_JAVA}\tests\*.*; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE} and {#COMPN_TESTS}
+;
+Source: modules\{#EXTERNAL_OBJECTS_JAVA}\examples\com\foo\*.java; DestDir: {app}\modules\{#EXTERNAL_OBJECTS_JAVA}\examples\com\foo; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE} and {#COMPN_TESTS}
 
 ;--------------------------------------------------------------------------------------------------------------
index bb220c4..4ac3059 100644 (file)
@@ -53,7 +53,6 @@
 ;-------------------------------------------------------------------------------
 [Files]
 #include BinariesSourcePath + "\tools\innosetup\files.iss"
-#include BinariesSourcePath + "\tools\innosetup\files_vcredist.iss"
 ;
 ;-------------------------------------------------------------------------------
 [Icons]
@@ -77,7 +76,6 @@
 [Run]
 ;-------------------------------------------------------------------------------
 #include BinariesSourcePath + "\tools\innosetup\run.iss"
-#include BinariesSourcePath + "\tools\innosetup\run_vcredist.iss"
 ;-------------------------------------------------------------------------------
 [UninstallDelete]
 #include BinariesSourcePath + "\tools\innosetup\uninstalldelete.iss"
index 2c0989d..76f4a00 100644 (file)
@@ -115,6 +115,7 @@ begin
         ModulesXmlFileLines[i] := '<module name="graph" activate="yes"/>'; i := i + 1;
         ModulesXmlFileLines[i] := '<module name="javasci" activate="yes"/>'; i := i + 1;
         ModulesXmlFileLines[i] := '<module name="types" activate="yes"/>'; i := i + 1;
+        ModulesXmlFileLines[i] := '<module name="external_objects_java" activate="yes"/>'; i := i + 1;
     end;
 
     ModulesXmlFileLines[i] := '<!-- Scinotes dependencies -->'; i := i + 1;
index ce7d248..7ef0579 100644 (file)
@@ -117,8 +117,5 @@ 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
-
-;
 ;-------------------------------------------------------------------------------
 ;
index 9aa255e..d494dd8 100644 (file)
@@ -51,6 +51,7 @@
 #include BinariesSourcePath + "\modules\renderer\renderer.iss"
 #include BinariesSourcePath + "\modules\graphic_export\graphic_export.iss"
 #include BinariesSourcePath + "\modules\external_objects\external_objects.iss"
+#include BinariesSourcePath + "\modules\external_objects_java\external_objects_java.iss"
 #include BinariesSourcePath + "\modules\sound\sound.iss"
 #include BinariesSourcePath + "\modules\tclsci\tclsci.iss"
 #include BinariesSourcePath + "\modules\arnoldi\arnoldi.iss"
diff --git a/scilab/tools/innosetup/files_vcredist.iss b/scilab/tools/innosetup/files_vcredist.iss
deleted file mode 100644 (file)
index 5af6af2..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-;
-; 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 5c3d1d3..0cf53e2 100644 (file)
@@ -116,8 +116,5 @@ 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
deleted file mode 100644 (file)
index bce4258..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-;
-; 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