fix install on windowsgraphic

Change-Id: I693acb27ff5141d4177d72ed7c0fd88651edcc78

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 @@
 ;##############################################################################################################
 ; Scilab ( http://mwww.scilab.org/ ) - This file is part of Scilab
-; Copyright (C) 2010 - DIGITEO - Allan CORNET
+; Copyright (C) 2012 - DIGITEO - 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
@@ -14,6 +14,10 @@
 ;
 #define GRAPHIC_OBJECTS "graphic_objects"
 ;
-Source: bin\graphic_objects.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHIC_OBJECTS}
+Source: bin\sci{#GRAPHIC_OBJECTS}.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
+Source: modules\{#GRAPHIC_OBJECTS}\jar\org.scilab.modules.{#GRAPHIC_OBJECTS}.jar;DestDir: {app}\modules\{#GRAPHIC_OBJECTS}\jar; Components: {#COMPN_GRAPHICS}
+;
+Source: modules\{#GRAPHIC_OBJECTS}\etc\{#GRAPHIC_OBJECTS}.quit; DestDir: {app}\modules\{#GRAPHIC_OBJECTS}\etc; Components: {#COMPN_GRAPHICS}
+Source: modules\{#GRAPHIC_OBJECTS}\etc\{#GRAPHIC_OBJECTS}.start; DestDir: {app}\modules\{#GRAPHIC_OBJECTS}\etc; Components: {#COMPN_GRAPHICS}
 ;
 ;--------------------------------------------------------------------------------------------------------------
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
 Source: thirdparty\gluegen-rt.jar; DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
 Source: thirdparty\jogl.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
 ;
+Source: thirdparty\scirenderer-0.3.5.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
+;
 Source: thirdparty\fonts\scilabsymbols.ttf;DestDir: {app}\thirdparty\fonts; Components: {#COMPN_GRAPHICS}
 ;
 Source: 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;
             begin
                 ModulesXmlFileLines[i] := '<module name="graphics" activate="yes"/>'; i := i + 1;
                 ModulesXmlFileLines[i] := '<module name="renderer" activate="yes"/>'; i := i + 1;
+                ModulesXmlFileLines[i] := '<module name="graphic_objects" activate="yes"/>'; i := i + 1;
                 ModulesXmlFileLines[i] := '<module name="graphic_export" activate="yes"/>'; i := i + 1;
             end;
 
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 @@
 #include BinariesSourcePath + "\modules\history_browser\history_browser.iss"
 #include BinariesSourcePath + "\modules\xml\xml.iss"
 #include BinariesSourcePath + "\modules\preferences\preferences.iss"
+#include BinariesSourcePath + "\modules\graphic_objects\graphic_objects.iss"
 ;-------------------------------------------------------------------------------
 ;