output_stream java part 80/1680/5
Allan CORNET [Tue, 24 Aug 2010 09:29:06 +0000 (11:29 +0200)]
Change-Id: Icf7e01ed93e85e627b48556fa4f476fe1df5c020

13 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/build.incl.xml
scilab/etc/classpath.xml.in
scilab/etc/classpath.xml.vc
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/build.xml [new file with mode: 0644]
scilab/modules/output_stream/output_stream.iss
scilab/modules/output_stream/src/java/org/scilab/modules/output_stream/output_stream.java [new file with mode: 0644]
scilab/modules/output_stream/src/java/output_stream-JAVA.vcproj [new file with mode: 0644]
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc

index 7983ae3..9eb241c 100644 (file)
@@ -1283,6 +1283,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commons-Ant", "modules\comm
                {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "output_stream-Ant", "modules\output_stream\src\java\output_stream-JAVA.vcproj", "{F3943691-FF61-48B4-9CA4-10E9D1F600A6}"
+       ProjectSection(ProjectDependencies) = postProject
+               {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
+               {9188FA91-E039-485D-AF1D-781CEA92F541} = {9188FA91-E039-485D-AF1D-781CEA92F541}
+               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2479,6 +2486,14 @@ Global
                {9188FA91-E039-485D-AF1D-781CEA92F541}.Release|Win32.Build.0 = Release|Win32
                {9188FA91-E039-485D-AF1D-781CEA92F541}.Release|x64.ActiveCfg = Release|x64
                {9188FA91-E039-485D-AF1D-781CEA92F541}.Release|x64.Build.0 = Release|x64
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Debug|Win32.ActiveCfg = Debug|Win32
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Debug|Win32.Build.0 = Debug|Win32
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Debug|x64.ActiveCfg = Debug|x64
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Debug|x64.Build.0 = Debug|x64
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Release|Win32.ActiveCfg = Release|Win32
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Release|Win32.Build.0 = Release|Win32
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Release|x64.ActiveCfg = Release|x64
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 04727c3..1c79aa5 100644 (file)
@@ -1283,6 +1283,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commons-Ant", "modules\comm
                {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "output_stream-Ant", "modules\output_stream\src\java\output_stream-JAVA.vcproj", "{F3943691-FF61-48B4-9CA4-10E9D1F600A6}"
+       ProjectSection(ProjectDependencies) = postProject
+               {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
+               {9188FA91-E039-485D-AF1D-781CEA92F541} = {9188FA91-E039-485D-AF1D-781CEA92F541}
+               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2479,6 +2486,14 @@ Global
                {9188FA91-E039-485D-AF1D-781CEA92F541}.Release|Win32.Build.0 = Release|Win32
                {9188FA91-E039-485D-AF1D-781CEA92F541}.Release|x64.ActiveCfg = Release|x64
                {9188FA91-E039-485D-AF1D-781CEA92F541}.Release|x64.Build.0 = Release|x64
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Debug|Win32.ActiveCfg = Debug|Win32
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Debug|Win32.Build.0 = Debug|Win32
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Debug|x64.ActiveCfg = Debug|x64
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Debug|x64.Build.0 = Debug|x64
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Release|Win32.ActiveCfg = Release|Win32
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Release|Win32.Build.0 = Release|Win32
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Release|x64.ActiveCfg = Release|x64
+               {F3943691-FF61-48B4-9CA4-10E9D1F600A6}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 8be49bd..4c9c103 100644 (file)
@@ -64,6 +64,7 @@
 
        <path id="compile.classpath">
                <pathelement location="${library.types.dir}/${library.types.name}"/>
+               <pathelement location="${library.types.dir}/${library.output_stream.name}"/>            
                <pathelement location="${library.graph.dir}/${library.graph.name}"/>
                <pathelement location="${library.xcos.dir}/${library.xcos.name}"/>
                <pathelement location="${library.hdf5.dir}/${library.hdf5.name}"/>
index c2e1086..81fde51 100644 (file)
@@ -60,12 +60,9 @@ The option is "disableUnderMode" and can be:
        <load on="HDF5"/>
 </path>
 
-<path value="@JGRAPHX@" load="onUse">
-       <load on="XCos"/>
-</path>
-
 <!-- Temp. loaded at startup -->
 <path value="$SCILAB/modules/types/jar/org.scilab.modules.types.jar"/>
+<path value="$SCILAB/modules/output_stream/jar/org.scilab.modules.output_stream.jar" load="startup"/>
 <path value="$SCILAB/modules/hdf5/jar/org.scilab.modules.hdf5.jar" load="startup"/>
 
 <path value="$SCILAB/modules/xcos/jar/org.scilab.modules.xcos.jar" load="onUse">
index dc896bb..86366c8 100644 (file)
@@ -59,12 +59,9 @@ The option is "disableUnderMode" and can be:
        <load on="HDF5"/>
 </path>
 
-<path value="$SCILAB/thirdparty/jgraphx.jar" load="onUse">
-        <load on="XCos"/>
-</path>
-
 <!-- Temp. loaded at startup -->
 <path value="$SCILAB/modules/types/jar/org.scilab.modules.types.jar"/>
+<path value="$SCILAB/modules/output_stream/jar/org.scilab.modules.output_stream.jar" load="startup"/>
 <path value="$SCILAB/modules/hdf5/jar/org.scilab.modules.hdf5.jar" load="startup"/>
 
 <path value="$SCILAB/modules/xcos/jar/org.scilab.modules.xcos.jar" load="onUse">
index a3723cf..06867f3 100644 (file)
@@ -79,6 +79,10 @@ libscioutput_stream_la_CPPFLAGS=  -I$(top_srcdir)/libs/MALLOC/includes/ \
 
 pkglib_LTLIBRARIES = libscioutput_stream.la
 
+if GUI
+USEANT=1
+endif
+
 libscioutput_stream_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 
 libscioutput_stream_la_SOURCES = $(OUTPUT_STREAM_C_SOURCES) $(OUTPUT_STREAM_CPP_SOURCES) $(OUTPUT_STREAM_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES) $(GATEWAY_FORTRAN_SOURCES) $(JNI_SOURCES)
index 6371231..5c2ba22 100644 (file)
@@ -505,6 +505,7 @@ libscioutput_stream_la_CPPFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/string/includes
 
 pkglib_LTLIBRARIES = libscioutput_stream.la
+@GUI_TRUE@USEANT = 1
 libscioutput_stream_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 libscioutput_stream_la_SOURCES = $(OUTPUT_STREAM_C_SOURCES) $(OUTPUT_STREAM_CPP_SOURCES) $(OUTPUT_STREAM_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES) $(GATEWAY_FORTRAN_SOURCES) $(JNI_SOURCES)
 
diff --git a/scilab/modules/output_stream/build.xml b/scilab/modules/output_stream/build.xml
new file mode 100644 (file)
index 0000000..eb9c271
--- /dev/null
@@ -0,0 +1,21 @@
+<?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="output_stream" default="jar">
+  <import file="../../build.incl.xml"/>
+
+  <property name="library.name" value="${library.output_stream.name}" />
+
+  <description>
+       Build "output_stream" Scilab module
+  </description>
+</project>
index 915db0d..89d505a 100644 (file)
@@ -18,6 +18,8 @@
 ;
 #define OUTPUT_STREAM "output_stream"
 ;
+Source: modules\{#OUTPUT_STREAM}\jar\org.scilab.modules.{#OUTPUT_STREAM}.jar;DestDir: {app}\modules\{#OUTPUT_STREAM}\jar; Components: {#COMPN_SCILAB}
+;
 Source: bin\{#OUTPUT_STREAM}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\{#OUTPUT_STREAM}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\{#OUTPUT_STREAM}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
diff --git a/scilab/modules/output_stream/src/java/org/scilab/modules/output_stream/output_stream.java b/scilab/modules/output_stream/src/java/org/scilab/modules/output_stream/output_stream.java
new file mode 100644 (file)
index 0000000..1e5e3d2
--- /dev/null
@@ -0,0 +1,16 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - @TODO
+ *
+ * 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
+ *
+ */
+ package org.scilab.modules.output_stream;
+ public class output_stream {
+} 
\ No newline at end of file
diff --git a/scilab/modules/output_stream/src/java/output_stream-JAVA.vcproj b/scilab/modules/output_stream/src/java/output_stream-JAVA.vcproj
new file mode 100644 (file)
index 0000000..80531fd
--- /dev/null
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9,00"
+       Name="output_stream-Ant"
+       ProjectGUID="{F3943691-FF61-48B4-9CA4-10E9D1F600A6}"
+       RootNamespace="output_stream-Ant"
+       Keyword="MakeFileProj"
+       TargetFrameworkVersion="0"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)modules\output_stream\jar"
+                       IntermediateDirectory="$(ProjectDir)$(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;&#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&#x0D;&#x0A;"
+                               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;&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;_DEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)modules\output_stream\jar"
+                       IntermediateDirectory="$(ProjectDir)$(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;&#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&#x0D;&#x0A;"
+                               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;&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;_DEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)modules\output_stream\jar"
+                       IntermediateDirectory="$(ProjectDir)$(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;&#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&#x0D;&#x0A;"
+                               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;&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;NDEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="$(SolutionDir)modules\output_stream\jar"
+                       IntermediateDirectory="$(ProjectDir)$(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;&#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&#x0D;&#x0A;"
+                               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;&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;NDEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{32CECC8B-3355-4312-87A2-5B25796C3F41}"
+                       >
+               </Filter>
+               <File
+                       RelativePath="..\..\..\build.xml"
+                       >
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
index 284c935..ec74212 100644 (file)
@@ -95,3 +95,7 @@ library.graph.name=org.scilab.modules.graph.jar
 
 library.history_browser.dir=${modules.dir}/history_browser/${build.jar.dir}/
 library.history_browser.name=org.scilab.modules.history_browser.jar
+
+library.output_stream.dir=${modules.dir}/output_stream/${build.jar.dir}/
+library.output_stream.name=org.scilab.modules.output_stream.jar
+
index 8727d7a..f108958 100644 (file)
@@ -94,3 +94,6 @@ library.graph.name=org.scilab.modules.graph.jar
 
 library.history_browser.dir=${modules.dir}/history_browser/${build.jar.dir}/
 library.history_browser.name=org.scilab.modules.history_browser.jar
+
+library.output_stream.dir=${modules.dir}/output_stream/${build.jar.dir}/
+library.output_stream.name=org.scilab.modules.output_stream.jar