add graph module

diff --git a/scilab/Scilab.sln b/scilab/Scilab.sln
index 49b6d61..530d53f 100644 (file)
--- a/scilab/Scilab.sln
+++ b/scilab/Scilab.sln
@@ -1048,12 +1048,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\sr
        ProjectSection(ProjectDependencies) = postProject
                {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
                {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02}
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD} = {968FD6C1-5845-4B22-B61E-F6DE987D47AD}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelicat", "modules\scicos\src\translator\translator.vcproj", "{9E0DE362-60A0-4584-9FF1-BB537DA94F40}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2modelica", "modules\scicos\src\xml2modelica\xml2modelica.vcproj", "{7CF15086-6DED-4F83-9C40-C4951FD373B3}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph-Ant", "modules\graph\src\java\graph-JAVA.vcproj", "{968FD6C1-5845-4B22-B61E-F6DE987D47AD}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
+               {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2142,6 +2149,14 @@ Global
                {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Debug|x64.ActiveCfg = Debug|x64
                {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|Win32.ActiveCfg = Release|Win32
                {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|x64.ActiveCfg = Release|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|Win32.ActiveCfg = Debug|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|Win32.Build.0 = Debug|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|x64.ActiveCfg = Debug|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|x64.Build.0 = Debug|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.ActiveCfg = Release|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.Build.0 = Release|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.ActiveCfg = Release|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index 834c7b4..a72a29d 100644 (file)
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -1049,12 +1049,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\sr
        ProjectSection(ProjectDependencies) = postProject
                {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
                {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02}
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD} = {968FD6C1-5845-4B22-B61E-F6DE987D47AD}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelicat", "modules\scicos\src\translator\translator.vcproj", "{9E0DE362-60A0-4584-9FF1-BB537DA94F40}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2modelica", "modules\scicos\src\xml2modelica\xml2modelica.vcproj", "{7CF15086-6DED-4F83-9C40-C4951FD373B3}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph-Ant", "modules\graph\src\java\graph-JAVA.vcproj", "{968FD6C1-5845-4B22-B61E-F6DE987D47AD}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
+               {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2145,6 +2152,14 @@ Global
                {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|Win32.ActiveCfg = Release|Win32
                {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|Win32.Build.0 = Release|Win32
                {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|x64.ActiveCfg = Release|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|Win32.ActiveCfg = Debug|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|Win32.Build.0 = Debug|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|x64.ActiveCfg = Debug|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|x64.Build.0 = Debug|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.ActiveCfg = Release|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.Build.0 = Release|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.ActiveCfg = Release|x64
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/scilab/etc/classpath.xml.vc b/scilab/etc/classpath.xml.vc
index 0ff4048..f15b860 100644 (file)
--- a/scilab/etc/classpath.xml.vc
+++ b/scilab/etc/classpath.xml.vc
@@ -165,4 +165,7 @@ The option is "disableUnderMode" and can be:
        <load on="Xpad"/>
 </path>
 
+<!-- TO DO Load only when we need -->
+<path value="$SCILAB/modules/graph/jar/org.scilab.modules.graph.jar"/>
+
 </classpaths>

diff --git a/scilab/etc/modules.xml.vc b/scilab/etc/modules.xml.vc
index 1117792..d958ac2 100644 (file)
--- a/scilab/etc/modules.xml.vc
+++ b/scilab/etc/modules.xml.vc
@@ -85,5 +85,6 @@
 <module name="xpad" activate="yes"/>
 <module name="api_scilab" activate="yes"/>
 <module name="helptools" activate="yes"/>
+<module name="graph" activate="yes"/>
 <!-- comments -->
 </modules>

diff --git a/scilab/modules/graph/.gitignore b/scilab/modules/graph/.gitignore
new file mode 100644 (file)
index 0000000..6412f4d
--- /dev/null
+++ b/scilab/modules/graph/.gitignore
@@ -0,0 +1,4 @@
+#
+#generated .def files (windows)
+#
+graph.def

diff --git a/scilab/modules/graph/Makefile.am b/scilab/modules/graph/Makefile.am
new file mode 100644 (file)
index 0000000..351da8a
--- /dev/null
+++ b/scilab/modules/graph/Makefile.am
@@ -0,0 +1,91 @@
+#
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) DIGITEO - 2010 - 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
+#
+
+#### Target ######
+modulename=graph
+
+
+#### graph : Conf files ####
+libscigraph_la_rootdir = $(mydatadir)
+libscigraph_la_root_DATA = changelog.txt license.txt readme.txt version.xml
+
+
+#### graph : init scripts ####
+libscigraph_la_etcdir = $(mydatadir)/etc
+libscigraph_la_etc_DATA = etc/graph.quit \
+                               etc/graph.start
+
+include $(top_srcdir)/Makefile.incl.am
+
+
+GRAPH_JNI_SOURCES = 
+
+GRAPH_C_SOURCES = 
+
+GRAPH_CPP_SOURCES = 
+
+GIWS_WRAPPERS = 
+
+if GIWS
+BUILT_SOURCES=giws
+endif
+
+
+GATEWAY_C_SOURCES = 
+
+GATEWAY_CPP_SOURCES = 
+
+libscigraph_la_CFLAGS= 
+
+
+libscigraph_la_CPPFLAGS = 
+
+# Without the graph module 
+libscigraph_disable_la_CFLAGS = 
+
+GRAPH_DISABLE_C_SOURCES = 
+libscigraph_disable_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
+libscigraph_disable_la_SOURCES = $(GRAPH_DISABLE_C_SOURCES)
+
+pkglib_LTLIBRARIES = libscigraph-disable.la
+
+if GUI
+pkglib_LTLIBRARIES += libscigraph.la 
+endif
+
+libscigraph_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)  $(X_LIBS) $(X_EXTRA_LIBS)
+
+libscigraph_la_SOURCES = $(GRAPH_C_SOURCES) $(GRAPH_JNI_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES) $(GRAPH_CPP_SOURCES)
+
+# For the code check (splint)
+CHECK_SRC= $(GRAPH_C_SOURCES) $(GATEWAY_C_SOURCES)
+INCLUDE_FLAGS = $(libscigraph_la_CFLAGS)
+
+
+#### SWIG Declaration ####
+SWIG_WRAPPERS = 
+
+if SWIG
+BUILT_SOURCES=swig
+endif
+
+libscigraph_la_LIBADD = $(top_builddir)/modules/core/libscicore.la \
+$(top_builddir)/libs/MALLOC/libscimalloc.la \
+$(top_builddir)/modules/output_stream/libscioutput_stream.la
+
+
+#### graph : gateway declaration ####
+libscigraph_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+libscigraph_la_sci_gateway_DATA = sci_gateway/graph_gateway.xml
+
+if GUI
+USEANT=1
+endif

diff --git a/scilab/modules/graph/build.xml b/scilab/modules/graph/build.xml
new file mode 100644 (file)
index 0000000..f4875c4
--- /dev/null
+++ b/scilab/modules/graph/build.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - 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
+ * 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
+ *
+ -->
+
+<project name="ui_data" default="jar">
+
+  <import file="../../build.incl.xml"/>
+  <property name="library.name" value="${library.graph.name}" />
+
+  <description>
+                       Build the Scilab graph module
+  </description>
+
+</project>

diff --git a/scilab/modules/graph/changelog.txt b/scilab/modules/graph/changelog.txt
new file mode 100644 (file)
index 0000000..de1720a
--- /dev/null
+++ b/scilab/modules/graph/changelog.txt
@@ -0,0 +1,4 @@
+graph (0.1-1) stable; urgency=medium
+
+  * First version of the module
+

diff --git a/scilab/modules/graph/etc/graph.quit b/scilab/modules/graph/etc/graph.quit
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/scilab/modules/graph/etc/graph.start b/scilab/modules/graph/etc/graph.start
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/scilab/modules/graph/graph.iss b/scilab/modules/graph/graph.iss
new file mode 100644 (file)
index 0000000..21979f0
--- /dev/null
+++ b/scilab/modules/graph/graph.iss
@@ -0,0 +1,19 @@
+;##############################################################################################################
+; Scilab ( http://mwww.scilab.org/ ) - This file is part of Scilab
+; Copyright (C) 2010 - 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
+; 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
+;##############################################################################################################
+;--------------------------------------------------------------------------------------------------------------
+; graph module
+;--------------------------------------------------------------------------------------------------------------
+;
+#define GRAPH "graph"
+;
+;
+;
+;--------------------------------------------------------------------------------------------------------------

diff --git a/scilab/modules/graph/license.txt b/scilab/modules/graph/license.txt
new file mode 100644 (file)
index 0000000..46ae42e
--- /dev/null
+++ b/scilab/modules/graph/license.txt
@@ -0,0 +1,9 @@
+Copyright:
+Copyright (c) 2010 - DIGITEO
+
+License:
+This module must be used under the terms of the CeCILL.
+This module 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

diff --git a/scilab/modules/graph/macros/buildmacros.bat b/scilab/modules/graph/macros/buildmacros.bat
new file mode 100644 (file)
index 0000000..f9bd674
--- /dev/null
+++ b/scilab/modules/graph/macros/buildmacros.bat
@@ -0,0 +1,11 @@
+
+rem Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+rem Copyright (C) 2009 - DIGITEO
+rem
+rem This file must be used under the terms of the CeCILL.
+rem This source file is licensed as described in the file COPYING, which
+rem you should have received as part of this distribution.  The terms
+rem are also available at
+rem http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+@..\..\..\bin\scilex -nwni -ns -e exec('buildmacros.sce');quit;

diff --git a/scilab/modules/graph/macros/buildmacros.sce b/scilab/modules/graph/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..a82162b
--- /dev/null
+++ b/scilab/modules/graph/macros/buildmacros.sce
@@ -0,0 +1,16 @@
+
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - DIGITEO - Allan CORNET <allan.cornet@inria.fr>
+//
+// 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
+
+if (isdef('genlib') == %f) then
+  exec(SCI+'/modules/functions/scripts/buildmacros/loadgenlib.sce');
+end
+
+//genlib("graphlib","SCI/modules/graph/macros",%f,%t);
+

diff --git a/scilab/modules/graph/macros/cleanmacros.bat b/scilab/modules/graph/macros/cleanmacros.bat
new file mode 100644 (file)
index 0000000..d8e26bf
--- /dev/null
+++ b/scilab/modules/graph/macros/cleanmacros.bat
@@ -0,0 +1,13 @@
+
+rem Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+rem Copyright (C) 2009 - DIGITEO
+rem
+rem This file must be used under the terms of the CeCILL.
+rem This source file is licensed as described in the file COPYING, which
+rem you should have received as part of this distribution.  The terms
+rem are also available at
+rem http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+@del *.bin 2>NUL
+@del lib 2>NUL
+@del names 2>NUL

diff --git a/scilab/modules/graph/readme.txt b/scilab/modules/graph/readme.txt
new file mode 100644 (file)
index 0000000..785eeec
--- /dev/null
+++ b/scilab/modules/graph/readme.txt
@@ -0,0 +1 @@
+README File

diff --git a/scilab/modules/graph/src/java/graph-JAVA.vcproj b/scilab/modules/graph/src/java/graph-JAVA.vcproj
new file mode 100644 (file)
index 0000000..2518e67
--- /dev/null
+++ b/scilab/modules/graph/src/java/graph-JAVA.vcproj
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9,00"
+       Name="graph-Ant"
+       ProjectGUID="{968FD6C1-5845-4B22-B61E-F6DE987D47AD}"
+       RootNamespace="graph-Ant"
+       Keyword="MakeFileProj"
+       TargetFrameworkVersion="0"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;call ant"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;_DEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;call ant"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;_DEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;call ant"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;NDEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;call ant"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;NDEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+               </Filter>
+               <File
+                       RelativePath="..\..\build.xml"
+                       >
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>

diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/graph.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/graph.java
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/scilab/modules/graph/version.xml b/scilab/modules/graph/version.xml
new file mode 100644 (file)
index 0000000..057500d
--- /dev/null
+++ b/scilab/modules/graph/version.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - DIGITEO
+ * 
+ *  This file is distributed under the same license as the Scilab package.
+ -->
+<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
+<MODULE_VERSION name="graph">
+<VERSION major="1" minor="0" maintenance="0" revision="0" string="unstable-git" />
+</MODULE_VERSION>

diff --git a/scilab/scilab-lib.properties.vc b/scilab/scilab-lib.properties.vc
index 6cb1212..5833949 100644 (file)
--- a/scilab/scilab-lib.properties.vc
+++ b/scilab/scilab-lib.properties.vc
@@ -79,3 +79,6 @@ library.xcos.name=org.scilab.modules.xcos.jar
 
 library.xpad.dir=${modules.dir}/xpad/${build.jar.dir}/
 library.xpad.name=org.scilab.modules.xpad.jar
+
+library.graph.dir=${modules.dir}/graph/${build.jar.dir}/
+library.graph.name=org.scilab.modules.graph.jar