summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2012-04-12 12:03:58 +0200
committerVincent COUVERT <vincent.couvert@scilab.org>2012-04-12 13:59:13 +0200
commit2bbb9c46a8bb774c67481be3ccec71b991fabf03 (patch)
treeec3ff00fccde0dd4d4b9176bb41a53e4a2bb0953
parentb1a957c4f5720697b98641425862438ecc69294f (diff)
downloadscilab-graphic.zip
scilab-graphic.tar.gz
fix install on windowsgraphic
Change-Id: I693acb27ff5141d4177d72ed7c0fd88651edcc78
-rw-r--r--scilab/modules/graphic_objects/graphic_objects.iss8
-rw-r--r--scilab/modules/renderer/renderer.iss2
-rw-r--r--scilab/tools/innosetup/code_modules.iss1
-rw-r--r--scilab/tools/innosetup/files.iss1
4 files changed, 10 insertions, 2 deletions
diff --git a/scilab/modules/graphic_objects/graphic_objects.iss b/scilab/modules/graphic_objects/graphic_objects.iss
index 322e1cf..06ea270 100644
--- a/scilab/modules/graphic_objects/graphic_objects.iss
+++ b/scilab/modules/graphic_objects/graphic_objects.iss
@@ -1,6 +1,6 @@
1;############################################################################################################## 1;##############################################################################################################
2; Scilab ( http://mwww.scilab.org/ ) - This file is part of Scilab 2; Scilab ( http://mwww.scilab.org/ ) - This file is part of Scilab
3; Copyright (C) 2010 - DIGITEO - Allan CORNET 3; Copyright (C) 2012 - DIGITEO - Allan CORNET
4; 4;
5; This file must be used under the terms of the CeCILL. 5; This file must be used under the terms of the CeCILL.
6; This source file is licensed as described in the file COPYING, which 6; This source file is licensed as described in the file COPYING, which
@@ -14,6 +14,10 @@
14; 14;
15#define GRAPHIC_OBJECTS "graphic_objects" 15#define GRAPHIC_OBJECTS "graphic_objects"
16; 16;
17Source: bin\graphic_objects.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHIC_OBJECTS} 17Source: bin\sci{#GRAPHIC_OBJECTS}.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
18Source: modules\{#GRAPHIC_OBJECTS}\jar\org.scilab.modules.{#GRAPHIC_OBJECTS}.jar;DestDir: {app}\modules\{#GRAPHIC_OBJECTS}\jar; Components: {#COMPN_GRAPHICS}
19;
20Source: modules\{#GRAPHIC_OBJECTS}\etc\{#GRAPHIC_OBJECTS}.quit; DestDir: {app}\modules\{#GRAPHIC_OBJECTS}\etc; Components: {#COMPN_GRAPHICS}
21Source: modules\{#GRAPHIC_OBJECTS}\etc\{#GRAPHIC_OBJECTS}.start; DestDir: {app}\modules\{#GRAPHIC_OBJECTS}\etc; Components: {#COMPN_GRAPHICS}
18; 22;
19;-------------------------------------------------------------------------------------------------------------- 23;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/modules/renderer/renderer.iss b/scilab/modules/renderer/renderer.iss
index 67ba73b..555bcf7 100644
--- a/scilab/modules/renderer/renderer.iss
+++ b/scilab/modules/renderer/renderer.iss
@@ -29,6 +29,8 @@ Source: bin\sci{#RENDERER}.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS
29Source: thirdparty\gluegen-rt.jar; DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS} 29Source: thirdparty\gluegen-rt.jar; DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
30Source: thirdparty\jogl.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS} 30Source: thirdparty\jogl.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
31; 31;
32Source: thirdparty\scirenderer-0.3.5.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
33;
32Source: thirdparty\fonts\scilabsymbols.ttf;DestDir: {app}\thirdparty\fonts; Components: {#COMPN_GRAPHICS} 34Source: thirdparty\fonts\scilabsymbols.ttf;DestDir: {app}\thirdparty\fonts; Components: {#COMPN_GRAPHICS}
33; 35;
34Source: modules\{#RENDERER}\jar\org.scilab.modules.{#RENDERER}.jar;DestDir: {app}\modules\{#RENDERER}\jar; Components: {#COMPN_GRAPHICS} 36Source: modules\{#RENDERER}\jar\org.scilab.modules.{#RENDERER}.jar;DestDir: {app}\modules\{#RENDERER}\jar; Components: {#COMPN_GRAPHICS}
diff --git a/scilab/tools/innosetup/code_modules.iss b/scilab/tools/innosetup/code_modules.iss
index 1af9f16..ca1dd1e 100644
--- a/scilab/tools/innosetup/code_modules.iss
+++ b/scilab/tools/innosetup/code_modules.iss
@@ -67,6 +67,7 @@ function CreateModulesFile: Boolean;
67 begin 67 begin
68 ModulesXmlFileLines[i] := '<module name="graphics" activate="yes"/>'; i := i + 1; 68 ModulesXmlFileLines[i] := '<module name="graphics" activate="yes"/>'; i := i + 1;
69 ModulesXmlFileLines[i] := '<module name="renderer" activate="yes"/>'; i := i + 1; 69 ModulesXmlFileLines[i] := '<module name="renderer" activate="yes"/>'; i := i + 1;
70 ModulesXmlFileLines[i] := '<module name="graphic_objects" activate="yes"/>'; i := i + 1;
70 ModulesXmlFileLines[i] := '<module name="graphic_export" activate="yes"/>'; i := i + 1; 71 ModulesXmlFileLines[i] := '<module name="graphic_export" activate="yes"/>'; i := i + 1;
71 end; 72 end;
72 73
diff --git a/scilab/tools/innosetup/files.iss b/scilab/tools/innosetup/files.iss
index 30f038a..f29ffa7 100644
--- a/scilab/tools/innosetup/files.iss
+++ b/scilab/tools/innosetup/files.iss
@@ -93,5 +93,6 @@
93#include BinariesSourcePath + "\modules\history_browser\history_browser.iss" 93#include BinariesSourcePath + "\modules\history_browser\history_browser.iss"
94#include BinariesSourcePath + "\modules\xml\xml.iss" 94#include BinariesSourcePath + "\modules\xml\xml.iss"
95#include BinariesSourcePath + "\modules\preferences\preferences.iss" 95#include BinariesSourcePath + "\modules\preferences\preferences.iss"
96#include BinariesSourcePath + "\modules\graphic_objects\graphic_objects.iss"
96;------------------------------------------------------------------------------- 97;-------------------------------------------------------------------------------
97; 98;