summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2010-06-29 10:34:14 +0200
committerClément DAVID <clement.david@scilab.org>2010-06-29 10:34:14 +0200
commitf5989e7cd13e99aff4444b83aec0d4806866d779 (patch)
tree0a737887487137b885c4e2878771e9e45b625e1c /scilab/modules/intersci
parentab8e53a3b5ec4d68e12ab51a31c43c9904300a47 (diff)
parentab133df22f778b14adfa43ad8922f014104c5a00 (diff)
downloadscilab-f5989e7cd13e99aff4444b83aec0d4806866d779.zip
scilab-f5989e7cd13e99aff4444b83aec0d4806866d779.tar.gz
Merge remote branch 'origin/master' into simulinkimport
Updates: scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/ImportMdl.java Conflicts: scilab/configure scilab/modules/xpad/Makefile.in
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.in7
-rw-r--r--scilab/modules/intersci/intersci.iss16
-rw-r--r--scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj38
-rw-r--r--scilab/modules/intersci/src/exe/interscin/interscin.vcproj30
4 files changed, 56 insertions, 35 deletions
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 9d6b8bf..3289a75 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -277,6 +277,10 @@ OCAMLDEP = @OCAMLDEP@
277OCAMLLEX = @OCAMLLEX@ 277OCAMLLEX = @OCAMLLEX@
278OCAMLOPT = @OCAMLOPT@ 278OCAMLOPT = @OCAMLOPT@
279OCAMLYACC = @OCAMLYACC@ 279OCAMLYACC = @OCAMLYACC@
280OPENMP_CFLAGS = @OPENMP_CFLAGS@
281OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
282OPENMP_ENABLE = @OPENMP_ENABLE@
283OPENMP_LIBS = @OPENMP_LIBS@
280OTOOL = @OTOOL@ 284OTOOL = @OTOOL@
281OTOOL64 = @OTOOL64@ 285OTOOL64 = @OTOOL64@
282PACKAGE = @PACKAGE@ 286PACKAGE = @PACKAGE@
@@ -1185,7 +1189,8 @@ clean-macros:
1185 1189
1186test: 1190test:
1187# More tests could be added here 1191# More tests could be added here
1188 @if test -f build.xml; then \ 1192 @if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
1193 if test -f build.xml -a $$USEANT -eq 1; then \
1189 $(ANT) test; \ 1194 $(ANT) test; \
1190 fi 1195 fi
1191 1196
diff --git a/scilab/modules/intersci/intersci.iss b/scilab/modules/intersci/intersci.iss
index c9e9f8e..3b7559d 100644
--- a/scilab/modules/intersci/intersci.iss
+++ b/scilab/modules/intersci/intersci.iss
@@ -1,17 +1,17 @@
1; Scilab ( http://mwww.scilab.org/ ) - This file is part of Scilab 1;
2; Copyright (C) 2007-2008 - INRIA - Allan CORNET 2; Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3; Copyright (C) INRIA - Allan CORNET
4; Copyright (C) DIGITEO - 2010 - Allan CORNET
3; 5;
4; This file must be used under the terms of the CeCILL. 6; This file must be used under the terms of the CeCILL.
5; This source file is licensed as described in the file COPYING, which 7; This source file is licensed as described in the file COPYING, which
6; you should have received as part of this distribution. The terms 8; you should have received as part of this distribution. The terms
7; are also available at 9; are also available at
8; http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10; http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9 11;
10 12;--------------------------------------------------------------------------------------------------------------
11;############################################################################################################## 13; Inno Setup Script (5.3 and more) for Scilab (UNICODE version required)
12; Script d'installation Inno Setup (5.2.1) pour scilab 14;
13; Version TRUNK
14;##############################################################################################################
15;-------------------------------------------------------------------------------------------------------------- 15;--------------------------------------------------------------------------------------------------------------
16; intersci module 16; intersci module
17;-------------------------------------------------------------------------------------------------------------- 17;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj b/scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj
index 60d478e..53326b1 100644
--- a/scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj
+++ b/scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -20,7 +20,7 @@
20 <Configurations> 20 <Configurations>
21 <Configuration 21 <Configuration
22 Name="Debug|Win32" 22 Name="Debug|Win32"
23 OutputDirectory="$(SolutionDir)bin\" 23 OutputDirectory="$(SolutionDir)modules\intersci\bin\"
24 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 24 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
25 ConfigurationType="1" 25 ConfigurationType="1"
26 UseOfMFC="0" 26 UseOfMFC="0"
@@ -36,7 +36,9 @@
36 <Tool 36 <Tool
37 Name="VCXMLDataGeneratorTool" 37 Name="VCXMLDataGeneratorTool"
38 /> 38 />
39 39 <Tool
40 Name="VCWebServiceProxyGeneratorTool"
41 />
40 <Tool 42 <Tool
41 Name="VCMIDLTool" 43 Name="VCMIDLTool"
42 TypeLibraryName="$(ConfigurationName)/intersciexe.tlb" 44 TypeLibraryName="$(ConfigurationName)/intersciexe.tlb"
@@ -57,7 +59,6 @@
57 ProgramDataBaseFileName="$(ConfigurationName)/" 59 ProgramDataBaseFileName="$(ConfigurationName)/"
58 WarningLevel="3" 60 WarningLevel="3"
59 SuppressStartupBanner="true" 61 SuppressStartupBanner="true"
60
61 DebugInformationFormat="3" 62 DebugInformationFormat="3"
62 /> 63 />
63 <Tool 64 <Tool
@@ -73,7 +74,7 @@
73 /> 74 />
74 <Tool 75 <Tool
75 Name="VCLinkerTool" 76 Name="VCLinkerTool"
76 OutputFile="../../../bin/intersci.exe" 77 OutputFile="$(SolutionDir)modules\intersci\bin\intersci.exe"
77 LinkIncremental="1" 78 LinkIncremental="1"
78 SuppressStartupBanner="true" 79 SuppressStartupBanner="true"
79 GenerateDebugInformation="true" 80 GenerateDebugInformation="true"
@@ -107,7 +108,7 @@
107 </Configuration> 108 </Configuration>
108 <Configuration 109 <Configuration
109 Name="Debug|x64" 110 Name="Debug|x64"
110 OutputDirectory="$(SolutionDir)bin\" 111 OutputDirectory="$(SolutionDir)modules\intersci\bin\"
111 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 112 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
112 ConfigurationType="1" 113 ConfigurationType="1"
113 UseOfMFC="0" 114 UseOfMFC="0"
@@ -123,7 +124,9 @@
123 <Tool 124 <Tool
124 Name="VCXMLDataGeneratorTool" 125 Name="VCXMLDataGeneratorTool"
125 /> 126 />
126 127 <Tool
128 Name="VCWebServiceProxyGeneratorTool"
129 />
127 <Tool 130 <Tool
128 Name="VCMIDLTool" 131 Name="VCMIDLTool"
129 TargetEnvironment="3" 132 TargetEnvironment="3"
@@ -144,7 +147,6 @@
144 ProgramDataBaseFileName="$(ConfigurationName)/" 147 ProgramDataBaseFileName="$(ConfigurationName)/"
145 WarningLevel="3" 148 WarningLevel="3"
146 SuppressStartupBanner="true" 149 SuppressStartupBanner="true"
147
148 DebugInformationFormat="3" 150 DebugInformationFormat="3"
149 /> 151 />
150 <Tool 152 <Tool
@@ -160,7 +162,7 @@
160 /> 162 />
161 <Tool 163 <Tool
162 Name="VCLinkerTool" 164 Name="VCLinkerTool"
163 OutputFile="../../../bin/intersci.exe" 165 OutputFile="$(SolutionDir)modules\intersci\bin\intersci.exe"
164 LinkIncremental="1" 166 LinkIncremental="1"
165 SuppressStartupBanner="true" 167 SuppressStartupBanner="true"
166 GenerateDebugInformation="true" 168 GenerateDebugInformation="true"
@@ -194,7 +196,7 @@
194 </Configuration> 196 </Configuration>
195 <Configuration 197 <Configuration
196 Name="Release|Win32" 198 Name="Release|Win32"
197 OutputDirectory="$(SolutionDir)bin\" 199 OutputDirectory="$(SolutionDir)modules\intersci\bin\"
198 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 200 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
199 ConfigurationType="1" 201 ConfigurationType="1"
200 UseOfMFC="0" 202 UseOfMFC="0"
@@ -210,7 +212,9 @@
210 <Tool 212 <Tool
211 Name="VCXMLDataGeneratorTool" 213 Name="VCXMLDataGeneratorTool"
212 /> 214 />
213 215 <Tool
216 Name="VCWebServiceProxyGeneratorTool"
217 />
214 <Tool 218 <Tool
215 Name="VCMIDLTool" 219 Name="VCMIDLTool"
216 TypeLibraryName="$(ConfigurationName)/intersciexe.tlb" 220 TypeLibraryName="$(ConfigurationName)/intersciexe.tlb"
@@ -235,7 +239,6 @@
235 ProgramDataBaseFileName="$(ConfigurationName)/" 239 ProgramDataBaseFileName="$(ConfigurationName)/"
236 WarningLevel="3" 240 WarningLevel="3"
237 SuppressStartupBanner="true" 241 SuppressStartupBanner="true"
238
239 /> 242 />
240 <Tool 243 <Tool
241 Name="VCManagedResourceCompilerTool" 244 Name="VCManagedResourceCompilerTool"
@@ -250,7 +253,7 @@
250 /> 253 />
251 <Tool 254 <Tool
252 Name="VCLinkerTool" 255 Name="VCLinkerTool"
253 OutputFile="../../../bin/intersci.exe" 256 OutputFile="$(SolutionDir)modules\intersci\bin\intersci.exe"
254 LinkIncremental="1" 257 LinkIncremental="1"
255 SuppressStartupBanner="true" 258 SuppressStartupBanner="true"
256 ProgramDatabaseFile="$(ConfigurationName)/intersci.pdb" 259 ProgramDatabaseFile="$(ConfigurationName)/intersci.pdb"
@@ -283,7 +286,7 @@
283 </Configuration> 286 </Configuration>
284 <Configuration 287 <Configuration
285 Name="Release|x64" 288 Name="Release|x64"
286 OutputDirectory="$(SolutionDir)bin\" 289 OutputDirectory="$(SolutionDir)modules\intersci\bin\"
287 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 290 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
288 ConfigurationType="1" 291 ConfigurationType="1"
289 UseOfMFC="0" 292 UseOfMFC="0"
@@ -299,7 +302,9 @@
299 <Tool 302 <Tool
300 Name="VCXMLDataGeneratorTool" 303 Name="VCXMLDataGeneratorTool"
301 /> 304 />
302 305 <Tool
306 Name="VCWebServiceProxyGeneratorTool"
307 />
303 <Tool 308 <Tool
304 Name="VCMIDLTool" 309 Name="VCMIDLTool"
305 TargetEnvironment="3" 310 TargetEnvironment="3"
@@ -324,7 +329,6 @@
324 ProgramDataBaseFileName="$(ConfigurationName)/" 329 ProgramDataBaseFileName="$(ConfigurationName)/"
325 WarningLevel="3" 330 WarningLevel="3"
326 SuppressStartupBanner="true" 331 SuppressStartupBanner="true"
327
328 /> 332 />
329 <Tool 333 <Tool
330 Name="VCManagedResourceCompilerTool" 334 Name="VCManagedResourceCompilerTool"
@@ -339,7 +343,7 @@
339 /> 343 />
340 <Tool 344 <Tool
341 Name="VCLinkerTool" 345 Name="VCLinkerTool"
342 OutputFile="../../../bin/intersci.exe" 346 OutputFile="$(SolutionDir)modules\intersci\bin\intersci.exe"
343 LinkIncremental="1" 347 LinkIncremental="1"
344 SuppressStartupBanner="true" 348 SuppressStartupBanner="true"
345 ProgramDatabaseFile="$(ConfigurationName)/intersci.pdb" 349 ProgramDatabaseFile="$(ConfigurationName)/intersci.pdb"
diff --git a/scilab/modules/intersci/src/exe/interscin/interscin.vcproj b/scilab/modules/intersci/src/exe/interscin/interscin.vcproj
index 0280d94..dd0692f 100644
--- a/scilab/modules/intersci/src/exe/interscin/interscin.vcproj
+++ b/scilab/modules/intersci/src/exe/interscin/interscin.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -20,7 +20,7 @@
20 <Configurations> 20 <Configurations>
21 <Configuration 21 <Configuration
22 Name="Debug|Win32" 22 Name="Debug|Win32"
23 OutputDirectory="$(SolutionDir)bin\" 23 OutputDirectory="$(SolutionDir)modules\intersci\bin\"
24 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 24 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
25 ConfigurationType="1" 25 ConfigurationType="1"
26 UseOfMFC="0" 26 UseOfMFC="0"
@@ -37,6 +37,9 @@
37 Name="VCXMLDataGeneratorTool" 37 Name="VCXMLDataGeneratorTool"
38 /> 38 />
39 <Tool 39 <Tool
40 Name="VCWebServiceProxyGeneratorTool"
41 />
42 <Tool
40 Name="VCMIDLTool" 43 Name="VCMIDLTool"
41 TypeLibraryName="$(ConfigurationName)/interscin.tlb" 44 TypeLibraryName="$(ConfigurationName)/interscin.tlb"
42 HeaderFileName="" 45 HeaderFileName=""
@@ -71,7 +74,7 @@
71 /> 74 />
72 <Tool 75 <Tool
73 Name="VCLinkerTool" 76 Name="VCLinkerTool"
74 OutputFile="$(SolutionDir)bin\$(ProjectName).dll" 77 OutputFile="$(SolutionDir)modules\intersci\bin\$(ProjectName).exe"
75 LinkIncremental="1" 78 LinkIncremental="1"
76 SuppressStartupBanner="true" 79 SuppressStartupBanner="true"
77 GenerateDebugInformation="true" 80 GenerateDebugInformation="true"
@@ -106,7 +109,7 @@
106 </Configuration> 109 </Configuration>
107 <Configuration 110 <Configuration
108 Name="Debug|x64" 111 Name="Debug|x64"
109 OutputDirectory="$(SolutionDir)bin\" 112 OutputDirectory="$(SolutionDir)modules\intersci\bin\"
110 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 113 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
111 ConfigurationType="1" 114 ConfigurationType="1"
112 UseOfMFC="0" 115 UseOfMFC="0"
@@ -123,6 +126,9 @@
123 Name="VCXMLDataGeneratorTool" 126 Name="VCXMLDataGeneratorTool"
124 /> 127 />
125 <Tool 128 <Tool
129 Name="VCWebServiceProxyGeneratorTool"
130 />
131 <Tool
126 Name="VCMIDLTool" 132 Name="VCMIDLTool"
127 TargetEnvironment="3" 133 TargetEnvironment="3"
128 TypeLibraryName="$(ConfigurationName)/interscin.tlb" 134 TypeLibraryName="$(ConfigurationName)/interscin.tlb"
@@ -157,7 +163,7 @@
157 /> 163 />
158 <Tool 164 <Tool
159 Name="VCLinkerTool" 165 Name="VCLinkerTool"
160 OutputFile="$(SolutionDir)bin\$(ProjectName).dll" 166 OutputFile="$(SolutionDir)modules\intersci\bin\$(ProjectName).exe"
161 LinkIncremental="1" 167 LinkIncremental="1"
162 SuppressStartupBanner="true" 168 SuppressStartupBanner="true"
163 GenerateDebugInformation="true" 169 GenerateDebugInformation="true"
@@ -192,7 +198,7 @@
192 </Configuration> 198 </Configuration>
193 <Configuration 199 <Configuration
194 Name="Release|Win32" 200 Name="Release|Win32"
195 OutputDirectory="$(SolutionDir)bin\" 201 OutputDirectory="$(SolutionDir)modules\intersci\bin\"
196 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 202 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
197 ConfigurationType="1" 203 ConfigurationType="1"
198 UseOfMFC="0" 204 UseOfMFC="0"
@@ -209,6 +215,9 @@
209 Name="VCXMLDataGeneratorTool" 215 Name="VCXMLDataGeneratorTool"
210 /> 216 />
211 <Tool 217 <Tool
218 Name="VCWebServiceProxyGeneratorTool"
219 />
220 <Tool
212 Name="VCMIDLTool" 221 Name="VCMIDLTool"
213 TypeLibraryName="$(ConfigurationName)/interscin.tlb" 222 TypeLibraryName="$(ConfigurationName)/interscin.tlb"
214 HeaderFileName="" 223 HeaderFileName=""
@@ -246,7 +255,7 @@
246 /> 255 />
247 <Tool 256 <Tool
248 Name="VCLinkerTool" 257 Name="VCLinkerTool"
249 OutputFile="$(SolutionDir)bin\$(ProjectName).dll" 258 OutputFile="$(SolutionDir)modules\intersci\bin\$(ProjectName).exe"
250 LinkIncremental="1" 259 LinkIncremental="1"
251 SuppressStartupBanner="true" 260 SuppressStartupBanner="true"
252 ProgramDatabaseFile="$(ConfigurationName)/intersci-n.pdb" 261 ProgramDatabaseFile="$(ConfigurationName)/intersci-n.pdb"
@@ -280,7 +289,7 @@
280 </Configuration> 289 </Configuration>
281 <Configuration 290 <Configuration
282 Name="Release|x64" 291 Name="Release|x64"
283 OutputDirectory="$(SolutionDir)bin\" 292 OutputDirectory="$(SolutionDir)modules\intersci\bin\"
284 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 293 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
285 ConfigurationType="1" 294 ConfigurationType="1"
286 UseOfMFC="0" 295 UseOfMFC="0"
@@ -297,6 +306,9 @@
297 Name="VCXMLDataGeneratorTool" 306 Name="VCXMLDataGeneratorTool"
298 /> 307 />
299 <Tool 308 <Tool
309 Name="VCWebServiceProxyGeneratorTool"
310 />
311 <Tool
300 Name="VCMIDLTool" 312 Name="VCMIDLTool"
301 TargetEnvironment="3" 313 TargetEnvironment="3"
302 TypeLibraryName="$(ConfigurationName)/interscin.tlb" 314 TypeLibraryName="$(ConfigurationName)/interscin.tlb"
@@ -334,7 +346,7 @@
334 /> 346 />
335 <Tool 347 <Tool
336 Name="VCLinkerTool" 348 Name="VCLinkerTool"
337 OutputFile="$(SolutionDir)bin\$(ProjectName).dll" 349 OutputFile="$(SolutionDir)modules\intersci\bin\$(ProjectName).exe"
338 LinkIncremental="1" 350 LinkIncremental="1"
339 SuppressStartupBanner="true" 351 SuppressStartupBanner="true"
340 ProgramDatabaseFile="$(ConfigurationName)/intersci-n.pdb" 352 ProgramDatabaseFile="$(ConfigurationName)/intersci-n.pdb"