update inno setup scritp, thread module and others 66/4466/2
Allan CORNET [Wed, 13 Jul 2011 06:35:20 +0000 (08:35 +0200)]
Change-Id: Icc68c91538d282f20a4fa0beac630b0000fce063

scilab/modules/action_binding/action_binding.iss
scilab/modules/core/core.iss
scilab/modules/dynamic_link/dynamic_link.iss
scilab/modules/threads/threads.iss [new file with mode: 0644]
scilab/tools/innosetup/files.iss

index 57dd9a9..a384005 100644 (file)
@@ -20,6 +20,7 @@
 #define ACTION_BINDING "action_binding"
 ;
 Source: bin\sciaction_binding.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: bin\sciaction_binding_gw.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} and {#COMPN_JVM_MODULE}
 ;
index 42b5fdf..781fff3 100644 (file)
@@ -53,8 +53,6 @@ Source: modules\{#CORE}\includes\stackinfo.h; DestDir: {app}\modules\{#CORE}\inc
 Source: modules\{#CORE}\includes\stackTypeVariable.h; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\includes\version.h; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\includes\getversion.h; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
-Source: modules\{#CORE}\includes\Thread_Wrapper.h; DestDir: {app}\modules\{#CORE}\includes; Components: {#COMPN_SCILAB}
-
 ;
 Source: modules\{#CORE}\macros\buildmacros.sce; DestDir: {app}\modules\{#CORE}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#CORE}\macros\buildmacros.bat; DestDir: {app}\modules\{#CORE}\macros; Components: {#COMPN_SCILAB}
index fa03ab3..a3f45d8 100644 (file)
@@ -19,6 +19,7 @@
 #define DYNAMIC_LINK "dynamic_link"
 ;
 Source: bin\{#DYNAMIC_LINK}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\{#DYNAMIC_LINK}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\{#DYNAMIC_LINK}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\{#DYNAMIC_LINK}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\{#DYNAMIC_LINK}_f.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
@@ -37,7 +38,7 @@ Source: modules\{#DYNAMIC_LINK}\src\scripts\Makefile.incl.mak; DestDir: {app}\mo
 ;
 Source: modules\{#DYNAMIC_LINK}\includes\*.h; DestDir: {app}\modules\{#DYNAMIC_LINK}\includes; Components: {#COMPN_SCILAB}
 ;
-;Source: modules\{#DYNAMIC_LINK}\macros\lib; DestDir: {app}\modules\{#DYNAMIC_LINK}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+Source: modules\{#DYNAMIC_LINK}\macros\lib; DestDir: {app}\modules\{#DYNAMIC_LINK}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#DYNAMIC_LINK}\macros\*.sci; DestDir: {app}\modules\{#DYNAMIC_LINK}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#DYNAMIC_LINK}\macros\buildmacros.sce; DestDir: {app}\modules\{#DYNAMIC_LINK}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 Source: modules\{#DYNAMIC_LINK}\macros\buildmacros.bat; DestDir: {app}\modules\{#DYNAMIC_LINK}\macros; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
diff --git a/scilab/modules/threads/threads.iss b/scilab/modules/threads/threads.iss
new file mode 100644 (file)
index 0000000..240475e
--- /dev/null
@@ -0,0 +1,44 @@
+;
+; Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+; Copyright (C) DIGITEO - 2011 - 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)
+;
+;--------------------------------------------------------------------------------------------------------------
+; threads module
+;--------------------------------------------------------------------------------------------------------------
+;
+#define THREADS "threads"
+;
+Source: bin\{#THREADS}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+;Source: bin\{#THREADS}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+;
+;Source: modules\{#THREADS}\license.txt; DestDir: {app}\modules\{#THREADS}; Components: {#COMPN_SCILAB}
+;
+;Source: modules\{#THREADS}\sci_gateway\{#THREADS}_gateway.xml; DestDir: {app}\modules\{#THREADS}\sci_gateway; Components: {#COMPN_SCILAB}
+;
+;Source: modules\{#THREADS}\etc\{#THREADS}.quit; DestDir: {app}\modules\{#THREADS}\etc; Components: {#COMPN_SCILAB}
+;Source: modules\{#THREADS}\etc\{#THREADS}.start; DestDir: {app}\modules\{#THREADS}\etc; Components: {#COMPN_SCILAB}
+;
+Source: modules\{#THREADS}\includes\dynlib_threads.h; DestDir: {app}\modules\{#THREADS}\includes; Components: {#COMPN_SCILAB}
+Source: modules\{#THREADS}\includes\Thread_Wrapper.h; DestDir: {app}\modules\{#THREADS}\includes; Components: {#COMPN_SCILAB}
+;
+;Source: modules\{#THREADS}\macros\buildmacros.sce; DestDir: {app}\modules\{#THREADS}\macros; Components: {#COMPN_SCILAB}
+;Source: modules\{#THREADS}\macros\buildmacros.bat; DestDir: {app}\modules\{#THREADS}\macros; Components: {#COMPN_SCILAB}
+;Source: modules\{#THREADS}\macros\cleanmacros.bat; DestDir: {app}\modules\{#THREADS}\macros; Components: {#COMPN_SCILAB}
+;Source: modules\{#THREADS}\macros\lib; DestDir: {app}\modules\{#THREADS}\macros; Components: {#COMPN_SCILAB}
+;Source: modules\{#THREADS}\macros\*.sci; DestDir: {app}\modules\{#THREADS}\macros; Components: {#COMPN_SCILAB}
+;
+;Source: modules\{#THREADS}\demos\*.*; DestDir: {app}\modules\{#THREADS}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+;
+;
+;Source: modules\{#THREADS}\tests\*.*; DestDir: {app}\modules\{#THREADS}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
+;
+;--------------------------------------------------------------------------------------------------------------
index 9910a6c..9f07874 100644 (file)
@@ -93,5 +93,6 @@
 #include BinariesSourcePath + "\modules\modules_manager\modules_manager.iss"
 #include BinariesSourcePath + "\modules\ui_data\ui_data.iss"
 #include BinariesSourcePath + "\modules\history_browser\history_browser.iss"
+#include BinariesSourcePath + "\modules\threads\threads.iss"
 ;-------------------------------------------------------------------------------
 ;