diff options
448 files changed, 9852 insertions, 8755 deletions
diff --git a/scilab/.gitignore b/scilab/.gitignore index a43623f..53437ce 100644 --- a/scilab/.gitignore +++ b/scilab/.gitignore | |||
@@ -83,6 +83,7 @@ es_ES_scilab.isl | |||
83 | # VS solution files (windows) | 83 | # VS solution files (windows) |
84 | # | 84 | # |
85 | Scilab.sln_old | 85 | Scilab.sln_old |
86 | *.aps | ||
86 | *.lib | 87 | *.lib |
87 | *.exp | 88 | *.exp |
88 | *.vcdef | 89 | *.vcdef |
diff --git a/scilab/CHANGES_5.1.X b/scilab/CHANGES_5.1.X index 9aedb00..382a726 100644 --- a/scilab/CHANGES_5.1.X +++ b/scilab/CHANGES_5.1.X | |||
@@ -175,8 +175,13 @@ Bug fixes: | |||
175 | called /tmp/myplop.jpeg.jpg (Thanks to Guilherme | 175 | called /tmp/myplop.jpeg.jpg (Thanks to Guilherme |
176 | Kunigami for the fix) | 176 | Kunigami for the fix) |
177 | 177 | ||
178 | * bug 4616 fixed - Text strings in SVG output are not rotated. Thanks | 178 | * bug 4616 fixed - Text strings in SVG output are not rotated. Thanks |
179 | to Paul Griffiths for the patch! | 179 | to Paul Griffiths for the patch! |
180 | |||
181 | * bug 4630 fixed - problem with the Scicos block affich | ||
182 | |||
183 | * bug 4635 fixed - Bad title in the french help of the graphic module | ||
184 | |||
180 | 185 | ||
181 | Changes between version 5.1.0 and 5.1.1 of Scilab | 186 | Changes between version 5.1.0 and 5.1.1 of Scilab |
182 | ================================================= | 187 | ================================================= |
diff --git a/scilab/CHANGES_5.2.X b/scilab/CHANGES_5.2.X index 8a56ce9..e5bdb00 100644 --- a/scilab/CHANGES_5.2.X +++ b/scilab/CHANGES_5.2.X | |||
@@ -177,6 +177,8 @@ Bug fixes: | |||
177 | 177 | ||
178 | * bug 4181 fixed - remove the AdCommunications help page | 178 | * bug 4181 fixed - remove the AdCommunications help page |
179 | 179 | ||
180 | * bug 4217 fixed - gsort sort complex by magnitude only with 'g' and not support 'r', 'c', 'lr', 'lc' | ||
181 | |||
180 | * bug 4262 fixed - lines returns incorrect values. | 182 | * bug 4262 fixed - lines returns incorrect values. |
181 | 183 | ||
182 | * bug 4267 fixed - A non initilization of a lock under Netbsd was | 184 | * bug 4267 fixed - A non initilization of a lock under Netbsd was |
@@ -285,3 +287,6 @@ Bug fixes: | |||
285 | 287 | ||
286 | * bug 4626 fixed - when using the CLI version, completion make Scilab crash | 288 | * bug 4626 fixed - when using the CLI version, completion make Scilab crash |
287 | 289 | ||
290 | * bug 4638 fixed - this example with optim freezes scilab | ||
291 | |||
292 | * bug 4645 fixed - french 'gsort' help had some wrong informations. | ||
diff --git a/scilab/Scilab.sln b/scilab/Scilab.sln index d38b736..936617e 100644 --- a/scilab/Scilab.sln +++ b/scilab/Scilab.sln | |||
@@ -98,6 +98,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab", "libs\LibScilab | |||
98 | {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} | 98 | {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} |
99 | {C7865CAA-EC7C-41EB-8324-2B81C384CA20} = {C7865CAA-EC7C-41EB-8324-2B81C384CA20} | 99 | {C7865CAA-EC7C-41EB-8324-2B81C384CA20} = {C7865CAA-EC7C-41EB-8324-2B81C384CA20} |
100 | {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89} = {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89} | 100 | {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89} = {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89} |
101 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} | ||
101 | {F52E27B6-D1B2-4BC1-9FC9-BE11B11397F0} = {F52E27B6-D1B2-4BC1-9FC9-BE11B11397F0} | 102 | {F52E27B6-D1B2-4BC1-9FC9-BE11B11397F0} = {F52E27B6-D1B2-4BC1-9FC9-BE11B11397F0} |
102 | {8091E9B6-4C08-4218-A63D-742867CCFE9F} = {8091E9B6-4C08-4218-A63D-742867CCFE9F} | 103 | {8091E9B6-4C08-4218-A63D-742867CCFE9F} = {8091E9B6-4C08-4218-A63D-742867CCFE9F} |
103 | {C456D5B8-8A32-496A-A2EE-164B0D734126} = {C456D5B8-8A32-496A-A2EE-164B0D734126} | 104 | {C456D5B8-8A32-496A-A2EE-164B0D734126} = {C456D5B8-8A32-496A-A2EE-164B0D734126} |
@@ -283,6 +284,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileio", "modules\fileio\fi | |||
283 | {805AA73F-EF7B-4177-BF46-200B72D8F83A} = {805AA73F-EF7B-4177-BF46-200B72D8F83A} | 284 | {805AA73F-EF7B-4177-BF46-200B72D8F83A} = {805AA73F-EF7B-4177-BF46-200B72D8F83A} |
284 | {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA} | 285 | {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA} |
285 | {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} | 286 | {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} |
287 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} | ||
286 | {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} | 288 | {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} |
287 | {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A} | 289 | {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A} |
288 | EndProjectSection | 290 | EndProjectSection |
@@ -1002,6 +1004,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions", "modules\functi | |||
1002 | ProjectSection(ProjectDependencies) = postProject | 1004 | ProjectSection(ProjectDependencies) = postProject |
1003 | {E6552427-01DD-4C12-823C-09AD46F77FAD} = {E6552427-01DD-4C12-823C-09AD46F77FAD} | 1005 | {E6552427-01DD-4C12-823C-09AD46F77FAD} = {E6552427-01DD-4C12-823C-09AD46F77FAD} |
1004 | {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} | 1006 | {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} |
1007 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} | ||
1005 | {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} | 1008 | {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} |
1006 | {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A} | 1009 | {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A} |
1007 | EndProjectSection | 1010 | EndProjectSection |
@@ -1012,6 +1015,12 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "functions_f", "modules\func | |||
1012 | {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} | 1015 | {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} |
1013 | EndProjectSection | 1016 | EndProjectSection |
1014 | EndProject | 1017 | EndProject |
1018 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api_scilab", "modules\api_scilab\api_scilab.vcproj", "{43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}" | ||
1019 | ProjectSection(ProjectDependencies) = postProject | ||
1020 | {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} | ||
1021 | {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} | ||
1022 | EndProjectSection | ||
1023 | EndProject | ||
1015 | Global | 1024 | Global |
1016 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 1025 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
1017 | Debug|Win32 = Debug|Win32 | 1026 | Debug|Win32 = Debug|Win32 |
@@ -2076,6 +2085,14 @@ Global | |||
2076 | {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|Win32.Build.0 = Release|Win32 | 2085 | {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|Win32.Build.0 = Release|Win32 |
2077 | {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|x64.ActiveCfg = Release|x64 | 2086 | {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|x64.ActiveCfg = Release|x64 |
2078 | {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|x64.Build.0 = Release|x64 | 2087 | {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|x64.Build.0 = Release|x64 |
2088 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
2089 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|Win32.Build.0 = Debug|Win32 | ||
2090 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|x64.ActiveCfg = Debug|x64 | ||
2091 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|x64.Build.0 = Debug|x64 | ||
2092 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|Win32.ActiveCfg = Release|Win32 | ||
2093 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|Win32.Build.0 = Release|Win32 | ||
2094 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.ActiveCfg = Release|x64 | ||
2095 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.Build.0 = Release|x64 | ||
2079 | EndGlobalSection | 2096 | EndGlobalSection |
2080 | GlobalSection(SolutionProperties) = preSolution | 2097 | GlobalSection(SolutionProperties) = preSolution |
2081 | HideSolutionNode = FALSE | 2098 | HideSolutionNode = FALSE |
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln index 3dea74d..d58d675 100644 --- a/scilab/Scilab_f2c.sln +++ b/scilab/Scilab_f2c.sln | |||
@@ -98,6 +98,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab_f2c", "libs\LibSc | |||
98 | {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} | 98 | {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} |
99 | {C7865CAA-EC7C-41EB-8324-2B81C384CA20} = {C7865CAA-EC7C-41EB-8324-2B81C384CA20} | 99 | {C7865CAA-EC7C-41EB-8324-2B81C384CA20} = {C7865CAA-EC7C-41EB-8324-2B81C384CA20} |
100 | {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89} = {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89} | 100 | {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89} = {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89} |
101 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} | ||
101 | {F52E27B6-D1B2-4BC1-9FC9-BE11B11397F0} = {F52E27B6-D1B2-4BC1-9FC9-BE11B11397F0} | 102 | {F52E27B6-D1B2-4BC1-9FC9-BE11B11397F0} = {F52E27B6-D1B2-4BC1-9FC9-BE11B11397F0} |
102 | {8091E9B6-4C08-4218-A63D-742867CCFE9F} = {8091E9B6-4C08-4218-A63D-742867CCFE9F} | 103 | {8091E9B6-4C08-4218-A63D-742867CCFE9F} = {8091E9B6-4C08-4218-A63D-742867CCFE9F} |
103 | {C456D5B8-8A32-496A-A2EE-164B0D734126} = {C456D5B8-8A32-496A-A2EE-164B0D734126} | 104 | {C456D5B8-8A32-496A-A2EE-164B0D734126} = {C456D5B8-8A32-496A-A2EE-164B0D734126} |
@@ -283,6 +284,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileio", "modules\fileio\fi | |||
283 | {805AA73F-EF7B-4177-BF46-200B72D8F83A} = {805AA73F-EF7B-4177-BF46-200B72D8F83A} | 284 | {805AA73F-EF7B-4177-BF46-200B72D8F83A} = {805AA73F-EF7B-4177-BF46-200B72D8F83A} |
284 | {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA} | 285 | {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA} |
285 | {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} | 286 | {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} |
287 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} | ||
286 | {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} | 288 | {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} |
287 | {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A} | 289 | {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A} |
288 | EndProjectSection | 290 | EndProjectSection |
@@ -1002,6 +1004,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions", "modules\functi | |||
1002 | ProjectSection(ProjectDependencies) = postProject | 1004 | ProjectSection(ProjectDependencies) = postProject |
1003 | {E6552427-01DD-4C12-823C-09AD46F77FAD} = {E6552427-01DD-4C12-823C-09AD46F77FAD} | 1005 | {E6552427-01DD-4C12-823C-09AD46F77FAD} = {E6552427-01DD-4C12-823C-09AD46F77FAD} |
1004 | {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} | 1006 | {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} |
1007 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} | ||
1005 | {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} | 1008 | {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} |
1006 | {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A} | 1009 | {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A} |
1007 | EndProjectSection | 1010 | EndProjectSection |
@@ -1012,6 +1015,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_f2c", "modules\fu | |||
1012 | {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} | 1015 | {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} |
1013 | EndProjectSection | 1016 | EndProjectSection |
1014 | EndProject | 1017 | EndProject |
1018 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api_scilab", "modules\api_scilab\api_scilab.vcproj", "{43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}" | ||
1019 | ProjectSection(ProjectDependencies) = postProject | ||
1020 | {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} | ||
1021 | {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} | ||
1022 | EndProjectSection | ||
1023 | EndProject | ||
1015 | Global | 1024 | Global |
1016 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 1025 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
1017 | Debug|Win32 = Debug|Win32 | 1026 | Debug|Win32 = Debug|Win32 |
@@ -2076,6 +2085,14 @@ Global | |||
2076 | {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|Win32.Build.0 = Release|Win32 | 2085 | {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|Win32.Build.0 = Release|Win32 |
2077 | {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|x64.ActiveCfg = Release|x64 | 2086 | {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|x64.ActiveCfg = Release|x64 |
2078 | {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|x64.Build.0 = Release|x64 | 2087 | {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|x64.Build.0 = Release|x64 |
2088 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
2089 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|Win32.Build.0 = Debug|Win32 | ||
2090 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|x64.ActiveCfg = Debug|x64 | ||
2091 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|x64.Build.0 = Debug|x64 | ||
2092 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|Win32.ActiveCfg = Release|Win32 | ||
2093 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|Win32.Build.0 = Release|Win32 | ||
2094 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.ActiveCfg = Release|x64 | ||
2095 | {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.Build.0 = Release|x64 | ||
2079 | EndGlobalSection | 2096 | EndGlobalSection |
2080 | GlobalSection(SolutionProperties) = preSolution | 2097 | GlobalSection(SolutionProperties) = preSolution |
2081 | HideSolutionNode = FALSE | 2098 | HideSolutionNode = FALSE |
diff --git a/scilab/bin/Atlas.spec b/scilab/bin/Atlas.spec index b12710d..6fda9e5 100644 --- a/scilab/bin/Atlas.spec +++ b/scilab/bin/Atlas.spec | |||
@@ -25,25 +25,25 @@ comments = "# Athlon/Duron, Athlon XP" /> | |||
25 | <cpu cpu_manufacturer = "GenuineIntel" | 25 | <cpu cpu_manufacturer = "GenuineIntel" |
26 | cpu_family = "15" | 26 | cpu_family = "15" |
27 | cpu_model = "5" | 27 | cpu_model = "5" |
28 | dll_filename = "Atlas_PIVHT.dll" | 28 | dll_filename = "Atlas_PIV.dll" |
29 | comments = "# Pentium IV D" /> | 29 | comments = "# Pentium IV D" /> |
30 | <!-- =================================== --> | 30 | <!-- =================================== --> |
31 | <cpu cpu_manufacturer = "GenuineIntel" | 31 | <cpu cpu_manufacturer = "GenuineIntel" |
32 | cpu_family = "15" | 32 | cpu_family = "15" |
33 | cpu_model = "4" | 33 | cpu_model = "4" |
34 | dll_filename = "Atlas_PIVHT.dll" | 34 | dll_filename = "Atlas_PIV.dll" |
35 | comments = "# Pentium IV, 512k cache" /> | 35 | comments = "# Pentium IV, 512k cache" /> |
36 | <!-- =================================== --> | 36 | <!-- =================================== --> |
37 | <cpu cpu_manufacturer = "GenuineIntel" | 37 | <cpu cpu_manufacturer = "GenuineIntel" |
38 | cpu_family = "15" | 38 | cpu_family = "15" |
39 | cpu_model = "3" | 39 | cpu_model = "3" |
40 | dll_filename = "Atlas_PIVHT.dll" | 40 | dll_filename = "Atlas_PIV.dll" |
41 | comments = "# Pentium IV (Prescott)" /> | 41 | comments = "# Pentium IV (Prescott)" /> |
42 | <!-- =================================== --> | 42 | <!-- =================================== --> |
43 | <cpu cpu_manufacturer = "GenuineIntel" | 43 | <cpu cpu_manufacturer = "GenuineIntel" |
44 | cpu_family = "15" | 44 | cpu_family = "15" |
45 | cpu_model = "2" | 45 | cpu_model = "2" |
46 | dll_filename = "Atlas_PIVHT.dll" | 46 | dll_filename = "Atlas_PIV.dll" |
47 | comments = "# Pentium IV with Hyperthreading" /> | 47 | comments = "# Pentium IV with Hyperthreading" /> |
48 | <!-- =================================== --> | 48 | <!-- =================================== --> |
49 | <cpu cpu_manufacturer = "GenuineIntel" | 49 | <cpu cpu_manufacturer = "GenuineIntel" |
@@ -54,6 +54,12 @@ comments = "# Pentium IV" /> | |||
54 | <!-- =================================== --> | 54 | <!-- =================================== --> |
55 | <cpu cpu_manufacturer = "GenuineIntel" | 55 | <cpu cpu_manufacturer = "GenuineIntel" |
56 | cpu_family = "6" | 56 | cpu_family = "6" |
57 | cpu_model = "28" | ||
58 | dll_filename = "Atlas_PIII.dll" | ||
59 | comments = "# ATOM N270 MMX, SSE, SSE2, SSE3" /> | ||
60 | <!-- =================================== --> | ||
61 | <cpu cpu_manufacturer = "GenuineIntel" | ||
62 | cpu_family = "6" | ||
57 | cpu_model = "26" | 63 | cpu_model = "26" |
58 | dll_filename = "Atlas_C2D.dll" | 64 | dll_filename = "Atlas_C2D.dll" |
59 | comments = "# Core i7" /> | 65 | comments = "# Core i7" /> |
diff --git a/scilab/configure b/scilab/configure index 2b1acbc..300891e 100755 --- a/scilab/configure +++ b/scilab/configure | |||
@@ -46220,7 +46220,7 @@ if test "$enable_stop_on_warning" = yes; then | |||
46220 | CXXFLAGS="$CXXFLAGS -Werror -O0" | 46220 | CXXFLAGS="$CXXFLAGS -Werror -O0" |
46221 | fi | 46221 | fi |
46222 | 46222 | ||
46223 | ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/metanet/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/call_scilab/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/scipad/Makefile modules/scilab2fortran/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml modules/jvm/etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties" | 46223 | ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/metanet/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/scipad/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml modules/jvm/etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties" |
46224 | 46224 | ||
46225 | 46225 | ||
46226 | # Detection of the module for the future version of Scilab 6 | 46226 | # Detection of the module for the future version of Scilab 6 |
@@ -47127,6 +47127,7 @@ do | |||
47127 | "modules/tclsci/Makefile") CONFIG_FILES="$CONFIG_FILES modules/tclsci/Makefile" ;; | 47127 | "modules/tclsci/Makefile") CONFIG_FILES="$CONFIG_FILES modules/tclsci/Makefile" ;; |
47128 | "modules/windows_tools/Makefile") CONFIG_FILES="$CONFIG_FILES modules/windows_tools/Makefile" ;; | 47128 | "modules/windows_tools/Makefile") CONFIG_FILES="$CONFIG_FILES modules/windows_tools/Makefile" ;; |
47129 | "modules/core/Makefile") CONFIG_FILES="$CONFIG_FILES modules/core/Makefile" ;; | 47129 | "modules/core/Makefile") CONFIG_FILES="$CONFIG_FILES modules/core/Makefile" ;; |
47130 | "modules/api_scilab/Makefile") CONFIG_FILES="$CONFIG_FILES modules/api_scilab/Makefile" ;; | ||
47130 | "modules/call_scilab/Makefile") CONFIG_FILES="$CONFIG_FILES modules/call_scilab/Makefile" ;; | 47131 | "modules/call_scilab/Makefile") CONFIG_FILES="$CONFIG_FILES modules/call_scilab/Makefile" ;; |
47131 | "modules/fftw/Makefile") CONFIG_FILES="$CONFIG_FILES modules/fftw/Makefile" ;; | 47132 | "modules/fftw/Makefile") CONFIG_FILES="$CONFIG_FILES modules/fftw/Makefile" ;; |
47132 | "modules/umfpack/Makefile") CONFIG_FILES="$CONFIG_FILES modules/umfpack/Makefile" ;; | 47133 | "modules/umfpack/Makefile") CONFIG_FILES="$CONFIG_FILES modules/umfpack/Makefile" ;; |
@@ -47141,7 +47142,6 @@ do | |||
47141 | "modules/compatibility_functions/Makefile") CONFIG_FILES="$CONFIG_FILES modules/compatibility_functions/Makefile" ;; | 47142 | "modules/compatibility_functions/Makefile") CONFIG_FILES="$CONFIG_FILES modules/compatibility_functions/Makefile" ;; |
47142 | "modules/texmacs/Makefile") CONFIG_FILES="$CONFIG_FILES modules/texmacs/Makefile" ;; | 47143 | "modules/texmacs/Makefile") CONFIG_FILES="$CONFIG_FILES modules/texmacs/Makefile" ;; |
47143 | "modules/scipad/Makefile") CONFIG_FILES="$CONFIG_FILES modules/scipad/Makefile" ;; | 47144 | "modules/scipad/Makefile") CONFIG_FILES="$CONFIG_FILES modules/scipad/Makefile" ;; |
47144 | "modules/scilab2fortran/Makefile") CONFIG_FILES="$CONFIG_FILES modules/scilab2fortran/Makefile" ;; | ||
47145 | "modules/development_tools/Makefile") CONFIG_FILES="$CONFIG_FILES modules/development_tools/Makefile" ;; | 47145 | "modules/development_tools/Makefile") CONFIG_FILES="$CONFIG_FILES modules/development_tools/Makefile" ;; |
47146 | "modules/output_stream/Makefile") CONFIG_FILES="$CONFIG_FILES modules/output_stream/Makefile" ;; | 47146 | "modules/output_stream/Makefile") CONFIG_FILES="$CONFIG_FILES modules/output_stream/Makefile" ;; |
47147 | "modules/console/Makefile") CONFIG_FILES="$CONFIG_FILES modules/console/Makefile" ;; | 47147 | "modules/console/Makefile") CONFIG_FILES="$CONFIG_FILES modules/console/Makefile" ;; |
diff --git a/scilab/configure.ac b/scilab/configure.ac index 71236cc..1146761 100644 --- a/scilab/configure.ac +++ b/scilab/configure.ac | |||
@@ -1429,6 +1429,7 @@ modules/randlib/Makefile | |||
1429 | modules/tclsci/Makefile | 1429 | modules/tclsci/Makefile |
1430 | modules/windows_tools/Makefile | 1430 | modules/windows_tools/Makefile |
1431 | modules/core/Makefile | 1431 | modules/core/Makefile |
1432 | modules/api_scilab/Makefile | ||
1432 | modules/call_scilab/Makefile | 1433 | modules/call_scilab/Makefile |
1433 | modules/fftw/Makefile | 1434 | modules/fftw/Makefile |
1434 | modules/umfpack/Makefile | 1435 | modules/umfpack/Makefile |
@@ -1443,7 +1444,6 @@ modules/m2sci/Makefile | |||
1443 | modules/compatibility_functions/Makefile | 1444 | modules/compatibility_functions/Makefile |
1444 | modules/texmacs/Makefile | 1445 | modules/texmacs/Makefile |
1445 | modules/scipad/Makefile | 1446 | modules/scipad/Makefile |
1446 | modules/scilab2fortran/Makefile | ||
1447 | modules/development_tools/Makefile | 1447 | modules/development_tools/Makefile |
1448 | modules/output_stream/Makefile | 1448 | modules/output_stream/Makefile |
1449 | modules/console/Makefile | 1449 | modules/console/Makefile |
diff --git a/scilab/etc/modules.xml.in b/scilab/etc/modules.xml.in index 74c1dd8..1b20d61 100644 --- a/scilab/etc/modules.xml.in +++ b/scilab/etc/modules.xml.in | |||
@@ -13,6 +13,7 @@ | |||
13 | <!-- =================== --> | 13 | <!-- =================== --> |
14 | <modules> | 14 | <modules> |
15 | <module name="core" activate="yes"/> | 15 | <module name="core" activate="yes"/> |
16 | <module name="api_scilab" activate="yes"/> | ||
16 | <module name="helptools" activate="@HELP_ENABLE@"/> | 17 | <module name="helptools" activate="@HELP_ENABLE@"/> |
17 | <module name="differential_equations" activate="yes"/> | 18 | <module name="differential_equations" activate="yes"/> |
18 | <module name="double" activate="yes"/> | 19 | <module name="double" activate="yes"/> |
@@ -62,7 +63,6 @@ | |||
62 | <module name="sound" activate="yes"/> | 63 | <module name="sound" activate="yes"/> |
63 | <module name="scipad" activate="@SCIPAD_ENABLE@"/> | 64 | <module name="scipad" activate="@SCIPAD_ENABLE@"/> |
64 | <module name="randlib" activate="yes"/> | 65 | <module name="randlib" activate="yes"/> |
65 | <module name="scilab2fortran" activate="yes"/> | ||
66 | <module name="development_tools" activate="yes"/> | 66 | <module name="development_tools" activate="yes"/> |
67 | <module name="demo_tools" activate="@DEMOTOOLS_ENABLE@"/> | 67 | <module name="demo_tools" activate="@DEMOTOOLS_ENABLE@"/> |
68 | <module name="spreadsheet" activate="yes"/> | 68 | <module name="spreadsheet" activate="yes"/> |
diff --git a/scilab/etc/modules.xml.vc b/scilab/etc/modules.xml.vc index 1ea4c0b..d1109bf 100644 --- a/scilab/etc/modules.xml.vc +++ b/scilab/etc/modules.xml.vc | |||
@@ -13,6 +13,7 @@ | |||
13 | <!-- =================== --> | 13 | <!-- =================== --> |
14 | <modules> | 14 | <modules> |
15 | <module name="core" activate="yes"/> | 15 | <module name="core" activate="yes"/> |
16 | <module name="api_scilab" activate="yes"/> | ||
16 | <module name="helptools" activate="yes"/> | 17 | <module name="helptools" activate="yes"/> |
17 | <module name="differential_equations" activate="yes"/> | 18 | <module name="differential_equations" activate="yes"/> |
18 | <module name="double" activate="yes"/> | 19 | <module name="double" activate="yes"/> |
@@ -64,7 +65,6 @@ | |||
64 | <module name="sound" activate="yes"/> | 65 | <module name="sound" activate="yes"/> |
65 | <module name="scipad" activate="yes"/> | 66 | <module name="scipad" activate="yes"/> |
66 | <module name="randlib" activate="yes"/> | 67 | <module name="randlib" activate="yes"/> |
67 | <module name="scilab2fortran" activate="yes"/> | ||
68 | <module name="development_tools" activate="yes"/> | 68 | <module name="development_tools" activate="yes"/> |
69 | <module name="demo_tools" activate="yes"/> | 69 | <module name="demo_tools" activate="yes"/> |
70 | <module name="spreadsheet" activate="yes"/> | 70 | <module name="spreadsheet" activate="yes"/> |
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am index 3d37140..80ce748 100644 --- a/scilab/modules/Makefile.am +++ b/scilab/modules/Makefile.am | |||
@@ -22,6 +22,7 @@ action_binding \ | |||
22 | arnoldi \ | 22 | arnoldi \ |
23 | elementary_functions \ | 23 | elementary_functions \ |
24 | string \ | 24 | string \ |
25 | api_scilab \ | ||
25 | dynamic_link \ | 26 | dynamic_link \ |
26 | fileio \ | 27 | fileio \ |
27 | history_manager \ | 28 | history_manager \ |
@@ -70,7 +71,6 @@ maple2scilab \ | |||
70 | m2sci \ | 71 | m2sci \ |
71 | texmacs \ | 72 | texmacs \ |
72 | scipad \ | 73 | scipad \ |
73 | scilab2fortran \ | ||
74 | development_tools \ | 74 | development_tools \ |
75 | compatibility_functions \ | 75 | compatibility_functions \ |
76 | helptools \ | 76 | helptools \ |
@@ -141,6 +141,7 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \ | |||
141 | $(top_builddir)/modules/cacsd/libscicacsd.la \ | 141 | $(top_builddir)/modules/cacsd/libscicacsd.la \ |
142 | $(top_builddir)/modules/core/libscicore.la \ | 142 | $(top_builddir)/modules/core/libscicore.la \ |
143 | $(top_builddir)/modules/call_scilab/libscicall_scilab.la \ | 143 | $(top_builddir)/modules/call_scilab/libscicall_scilab.la \ |
144 | $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \ | ||
144 | $(top_builddir)/modules/data_structures/libscidata_structures.la \ | 145 | $(top_builddir)/modules/data_structures/libscidata_structures.la \ |
145 | $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \ | 146 | $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \ |
146 | $(top_builddir)/modules/double/libscidouble.la \ | 147 | $(top_builddir)/modules/double/libscidouble.la \ |
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in index 6927fcd..c826100 100644 --- a/scilab/modules/Makefile.in +++ b/scilab/modules/Makefile.in | |||
@@ -127,7 +127,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | |||
127 | ETAGS = etags | 127 | ETAGS = etags |
128 | CTAGS = ctags | 128 | CTAGS = ctags |
129 | DIST_SUBDIRS = core output_stream action_binding arnoldi \ | 129 | DIST_SUBDIRS = core output_stream action_binding arnoldi \ |
130 | elementary_functions string dynamic_link fileio \ | 130 | elementary_functions string api_scilab dynamic_link fileio \ |
131 | history_manager spreadsheet tclsci localization renderer shell \ | 131 | history_manager spreadsheet tclsci localization renderer shell \ |
132 | completion console graphic_export gui jvm graphics \ | 132 | completion console graphic_export gui jvm graphics \ |
133 | optimization symbolic randlib statistics special_functions \ | 133 | optimization symbolic randlib statistics special_functions \ |
@@ -135,10 +135,10 @@ DIST_SUBDIRS = core output_stream action_binding arnoldi \ | |||
135 | differential_equations cacsd polynomials boolean double pvm io \ | 135 | differential_equations cacsd polynomials boolean double pvm io \ |
136 | intersci metanet signal_processing call_scilab sound time \ | 136 | intersci metanet signal_processing call_scilab sound time \ |
137 | sparse windows_tools functions overloading maple2scilab m2sci \ | 137 | sparse windows_tools functions overloading maple2scilab m2sci \ |
138 | texmacs scipad scilab2fortran development_tools \ | 138 | texmacs scipad development_tools compatibility_functions \ |
139 | compatibility_functions helptools fftw umfpack demo_tools \ | 139 | helptools fftw umfpack demo_tools genetic_algorithms \ |
140 | genetic_algorithms simulated_annealing parameters matio atoms \ | 140 | simulated_annealing parameters matio atoms scicos_blocks \ |
141 | scicos_blocks scicos . javasci | 141 | scicos . javasci |
142 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 142 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
143 | ACLOCAL = @ACLOCAL@ | 143 | ACLOCAL = @ACLOCAL@ |
144 | ALL_LINGUAS = @ALL_LINGUAS@ | 144 | ALL_LINGUAS = @ALL_LINGUAS@ |
@@ -364,7 +364,7 @@ top_srcdir = @top_srcdir@ | |||
364 | # core is the main module of Scilab. All the compilation deps has been removed | 364 | # core is the main module of Scilab. All the compilation deps has been removed |
365 | # since it already linked almost the whole world | 365 | # since it already linked almost the whole world |
366 | SUBDIRS = core output_stream action_binding arnoldi \ | 366 | SUBDIRS = core output_stream action_binding arnoldi \ |
367 | elementary_functions string dynamic_link fileio \ | 367 | elementary_functions string api_scilab dynamic_link fileio \ |
368 | history_manager spreadsheet tclsci localization renderer shell \ | 368 | history_manager spreadsheet tclsci localization renderer shell \ |
369 | completion console graphic_export gui jvm graphics \ | 369 | completion console graphic_export gui jvm graphics \ |
370 | optimization symbolic randlib statistics special_functions \ | 370 | optimization symbolic randlib statistics special_functions \ |
@@ -373,10 +373,10 @@ SUBDIRS = core output_stream action_binding arnoldi \ | |||
373 | intersci metanet signal_processing core call_scilab \ | 373 | intersci metanet signal_processing core call_scilab \ |
374 | interpolation sound time randlib sparse windows_tools \ | 374 | interpolation sound time randlib sparse windows_tools \ |
375 | functions overloading maple2scilab m2sci texmacs scipad \ | 375 | functions overloading maple2scilab m2sci texmacs scipad \ |
376 | scilab2fortran development_tools compatibility_functions \ | 376 | development_tools compatibility_functions helptools fftw \ |
377 | helptools fftw umfpack demo_tools genetic_algorithms \ | 377 | umfpack demo_tools genetic_algorithms simulated_annealing \ |
378 | simulated_annealing parameters matio atoms $(am__append_1) \ | 378 | parameters matio atoms $(am__append_1) scicos . \ |
379 | scicos . $(am__append_2) | 379 | $(am__append_2) |
380 | 380 | ||
381 | #### Basic files #### | 381 | #### Basic files #### |
382 | libscilab_la_rootdir = $(mydatadir) | 382 | libscilab_la_rootdir = $(mydatadir) |
@@ -413,6 +413,7 @@ ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \ | |||
413 | $(top_builddir)/modules/cacsd/libscicacsd.la \ | 413 | $(top_builddir)/modules/cacsd/libscicacsd.la \ |
414 | $(top_builddir)/modules/core/libscicore.la \ | 414 | $(top_builddir)/modules/core/libscicore.la \ |
415 | $(top_builddir)/modules/call_scilab/libscicall_scilab.la \ | 415 | $(top_builddir)/modules/call_scilab/libscicall_scilab.la \ |
416 | $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \ | ||
416 | $(top_builddir)/modules/data_structures/libscidata_structures.la \ | 417 | $(top_builddir)/modules/data_structures/libscidata_structures.la \ |
417 | $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \ | 418 | $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \ |
418 | $(top_builddir)/modules/double/libscidouble.la \ | 419 | $(top_builddir)/modules/double/libscidouble.la \ |
diff --git a/scilab/modules/action_binding/src/c/action_binding.rc b/scilab/modules/action_binding/src/c/action_binding.rc index 2314d31..0678c54 100644 --- a/scilab/modules/action_binding/src/c/action_binding.rc +++ b/scilab/modules/action_binding/src/c/action_binding.rc | |||
@@ -49,8 +49,8 @@ END | |||
49 | // | 49 | // |
50 | 50 | ||
51 | VS_VERSION_INFO VERSIONINFO | 51 | VS_VERSION_INFO VERSIONINFO |
52 | FILEVERSION 5,1,0,0 | 52 | FILEVERSION 5,2,0,0 |
53 | PRODUCTVERSION 5,1,0,0 | 53 | PRODUCTVERSION 5,2,0,0 |
54 | FILEFLAGSMASK 0x17L | 54 | FILEFLAGSMASK 0x17L |
55 | #ifdef _DEBUG | 55 | #ifdef _DEBUG |
56 | FILEFLAGS 0x1L | 56 | FILEFLAGS 0x1L |
@@ -66,12 +66,12 @@ BEGIN | |||
66 | BLOCK "040c04b0" | 66 | BLOCK "040c04b0" |
67 | BEGIN | 67 | BEGIN |
68 | VALUE "FileDescription", "action_binding module" | 68 | VALUE "FileDescription", "action_binding module" |
69 | VALUE "FileVersion", "5, 1, 0, 0" | 69 | VALUE "FileVersion", "5, 2, 0, 0" |
70 | VALUE "InternalName", "action_binding module" | 70 | VALUE "InternalName", "action_binding module" |
71 | VALUE "LegalCopyright", "Copyright (C) 2009" | 71 | VALUE "LegalCopyright", "Copyright (C) 2009" |
72 | VALUE "OriginalFilename", "action_binding.dll" | 72 | VALUE "OriginalFilename", "action_binding.dll" |
73 | VALUE "ProductName", " action_binding" | 73 | VALUE "ProductName", " action_binding" |
74 | VALUE "ProductVersion", "5, 1, 0, 0" | 74 | VALUE "ProductVersion", "5, 2, 0, 0" |
75 | END | 75 | END |
76 | END | 76 | END |
77 | BLOCK "VarFileInfo" | 77 | BLOCK "VarFileInfo" |
diff --git a/scilab/modules/action_binding/src/c/action_binding.vcproj b/scilab/modules/action_binding/src/c/action_binding.vcproj index 0ec0e13..6fb4a3d 100644 --- a/scilab/modules/action_binding/src/c/action_binding.vcproj +++ b/scilab/modules/action_binding/src/c/action_binding.vcproj | |||
@@ -6,7 +6,7 @@ | |||
6 | ProjectGUID="{8A654CC5-22C1-4972-A8CF-1B89F78B5383}" | 6 | ProjectGUID="{8A654CC5-22C1-4972-A8CF-1B89F78B5383}" |
7 | RootNamespace="action_binding" | 7 | RootNamespace="action_binding" |
8 | Keyword="Win32Proj" | 8 | Keyword="Win32Proj" |
9 | TargetFrameworkVersion="0" | 9 | |
10 | > | 10 | > |
11 | <Platforms> | 11 | <Platforms> |
12 | <Platform | 12 | <Platform |
diff --git a/scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc b/scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc index e69de29..d71a2b5 100644 --- a/scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc +++ b/scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc | |||
@@ -0,0 +1,97 @@ | |||
1 | // Microsoft Visual C++ generated resource script. | ||
2 | // | ||
3 | #include "resource.h" | ||
4 | |||
5 | #define APSTUDIO_READONLY_SYMBOLS | ||
6 | ///////////////////////////////////////////////////////////////////////////// | ||
7 | // | ||
8 | // Generated from the TEXTINCLUDE 2 resource. | ||
9 | // | ||
10 | //#include "afxres.h" | ||
11 | #define APSTUDIO_HIDDEN_SYMBOLS | ||
12 | #include "windows.h" | ||
13 | ///////////////////////////////////////////////////////////////////////////// | ||
14 | #undef APSTUDIO_READONLY_SYMBOLS | ||
15 | |||
16 | ///////////////////////////////////////////////////////////////////////////// | ||
17 | // French (France) resources | ||
18 | |||
19 | #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) | ||
20 | #ifdef _WIN32 | ||
21 | LANGUAGE LANG_FRENCH, SUBLANG_FRENCH | ||
22 | #pragma code_page(1252) | ||
23 | #endif //_WIN32 | ||
24 | |||
25 | #ifdef APSTUDIO_INVOKED | ||
26 | ///////////////////////////////////////////////////////////////////////////// | ||
27 | // | ||
28 | // TEXTINCLUDE | ||
29 | // | ||
30 | |||
31 | 1 TEXTINCLUDE | ||
32 | BEGIN | ||
33 | "resource.h\0" | ||
34 | END | ||
35 | |||
36 | |||
37 | 3 TEXTINCLUDE | ||
38 | BEGIN | ||
39 | "\r\n" | ||
40 | "\0" | ||
41 | END | ||
42 | |||
43 | #endif // APSTUDIO_INVOKED | ||
44 | |||
45 | |||
46 | ///////////////////////////////////////////////////////////////////////////// | ||
47 | // | ||
48 | // Version | ||
49 | // | ||
50 | |||
51 | VS_VERSION_INFO VERSIONINFO | ||
52 | FILEVERSION 5,2,0,0 | ||
53 | PRODUCTVERSION 5,2,0,0 | ||
54 | FILEFLAGSMASK 0x17L | ||
55 | #ifdef _DEBUG | ||
56 | FILEFLAGS 0x1L | ||
57 | #else | ||
58 | FILEFLAGS 0x0L | ||
59 | #endif | ||
60 | FILEOS 0x4L | ||
61 | FILETYPE 0x0L | ||
62 | FILESUBTYPE 0x0L | ||
63 | BEGIN | ||
64 | BLOCK "StringFileInfo" | ||
65 | BEGIN | ||
66 | BLOCK "040c04b0" | ||
67 | BEGIN | ||
68 | VALUE "FileDescription", "noaction_binding module" | ||
69 | VALUE "FileVersion", "5, 2, 0, 0" | ||
70 | VALUE "InternalName", "noaction_binding module" | ||
71 | VALUE "LegalCopyright", "Copyright (C) 2009" | ||
72 | VALUE "OriginalFilename", "noaction_binding.dll" | ||
73 | VALUE "ProductName", " noaction_binding" | ||
74 | VALUE "ProductVersion", "5, 2, 0, 0" | ||
75 | END | ||
76 | END | ||
77 | BLOCK "VarFileInfo" | ||
78 | BEGIN | ||
79 | VALUE "Translation", 0x40c, 1200 | ||
80 | END | ||
81 | END | ||
82 | |||
83 | #endif // French (France) resources | ||
84 | ///////////////////////////////////////////////////////////////////////////// | ||
85 | |||
86 | |||
87 | |||
88 | #ifndef APSTUDIO_INVOKED | ||
89 | ///////////////////////////////////////////////////////////////////////////// | ||
90 | // | ||
91 | // Generated from the TEXTINCLUDE 3 resource. | ||
92 | // | ||
93 | |||
94 | |||
95 | ///////////////////////////////////////////////////////////////////////////// | ||
96 | #endif // not APSTUDIO_INVOKED | ||
97 | |||
diff --git a/scilab/modules/action_binding/src/noaction_binding/noaction_binding.vcproj b/scilab/modules/action_binding/src/noaction_binding/noaction_binding.vcproj index 1b1be92..d6f180e 100644 --- a/scilab/modules/action_binding/src/noaction_binding/noaction_binding.vcproj +++ b/scilab/modules/action_binding/src/noaction_binding/noaction_binding.vcproj | |||
@@ -1,7 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="Windows-1252"?> | 1 | <?xml version="1.0" encoding="Windows-1252"?> |
2 | <VisualStudioProject | 2 | <VisualStudioProject |
3 | ProjectType="Visual C++" | 3 | ProjectType="Visual C++" |
4 | Version="8,00" | 4 | Version="9,00" |
5 | Name="noaction_binding" | 5 | Name="noaction_binding" |
6 | ProjectGUID="{6880943E-80BA-480B-A595-89B2C3BE14A8}" | 6 | ProjectGUID="{6880943E-80BA-480B-A595-89B2C3BE14A8}" |
7 | RootNamespace="noaction_binding" | 7 | RootNamespace="noaction_binding" |
@@ -41,7 +41,7 @@ | |||
41 | Name="VCCLCompilerTool" | 41 | Name="VCCLCompilerTool" |
42 | Optimization="0" | 42 | Optimization="0" |
43 | AdditionalIncludeDirectories="../../../core/includes" | 43 | AdditionalIncludeDirectories="../../../core/includes" |
44 | PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS" | 44 | PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOACTION_BINDING_EXPORTS" |
45 | MinimalRebuild="true" | 45 | MinimalRebuild="true" |
46 | BasicRuntimeChecks="0" | 46 | BasicRuntimeChecks="0" |
47 | RuntimeLibrary="3" | 47 | RuntimeLibrary="3" |
@@ -126,7 +126,7 @@ | |||
126 | FavorSizeOrSpeed="1" | 126 | FavorSizeOrSpeed="1" |
127 | WholeProgramOptimization="false" | 127 | WholeProgramOptimization="false" |
128 | AdditionalIncludeDirectories="../../../core/includes" | 128 | AdditionalIncludeDirectories="../../../core/includes" |
129 | PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS" | 129 | PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOACTION_BINDING_EXPORTS" |
130 | StringPooling="true" | 130 | StringPooling="true" |
131 | RuntimeLibrary="2" | 131 | RuntimeLibrary="2" |
132 | EnableEnhancedInstructionSet="1" | 132 | EnableEnhancedInstructionSet="1" |
diff --git a/scilab/modules/action_binding/version.xml b/scilab/modules/action_binding/version.xml index ff3284a..2c18426 100644 --- a/scilab/modules/action_binding/version.xml +++ b/scilab/modules/action_binding/version.xml | |||
@@ -19,5 +19,5 @@ | |||
19 | <!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd"> | 19 | <!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd"> |
20 | 20 | ||
21 | <MODULE_VERSION name="action_binding"> | 21 | <MODULE_VERSION name="action_binding"> |
22 | <VERSION major="5" minor="1" maintenance="0" revision="0" string="unstable-svn" /> | 22 | <VERSION major="5" minor="2" maintenance="0" revision="0" string="unstable-git" /> |
23 | </MODULE_VERSION> | 23 | </MODULE_VERSION> |
diff --git a/scilab/modules/api_scilab/.gitignore b/scilab/modules/api_scilab/.gitignore new file mode 100644 index 0000000..21645b7 --- /dev/null +++ b/scilab/modules/api_scilab/.gitignore | |||
@@ -0,0 +1,4 @@ | |||
1 | # | ||
2 | #generated .def files (windows) | ||
3 | # | ||
4 | api_scilab.def | ||
diff --git a/scilab/modules/api_scilab/LibScilab_Import.def b/scilab/modules/api_scilab/LibScilab_Import.def new file mode 100644 index 0000000..e0429f9 --- /dev/null +++ b/scilab/modules/api_scilab/LibScilab_Import.def | |||
@@ -0,0 +1,16 @@ | |||
1 | LIBRARY LibScilab.dll | ||
2 | |||
3 | |||
4 | EXPORTS | ||
5 | com_ | ||
6 | vstk_ | ||
7 | intersci_ | ||
8 | stack_ | ||
9 | iop_ | ||
10 | stackg_ | ||
11 | stackp_ | ||
12 | vGetPointerFromDoubleComplex | ||
13 | oGetDoubleComplexFromPointer | ||
14 | iArraySum | ||
15 | str2name_ | ||
16 | cvnamel_ \ No newline at end of file | ||
diff --git a/scilab/modules/api_scilab/Makefile.am b/scilab/modules/api_scilab/Makefile.am new file mode 100644 index 0000000..53ec9e7 --- /dev/null +++ b/scilab/modules/api_scilab/Makefile.am | |||
@@ -0,0 +1,68 @@ | |||
1 | ########## | ||
2 | ### Allan CORNET | ||
3 | ### DIGITEO - Scilab 2009 | ||
4 | ########## | ||
5 | |||
6 | ### SOURCES ### | ||
7 | API_SCILAB_C_SOURCES = src/c/api_boolean.c \ | ||
8 | src/c/api_boolean_sparse.c \ | ||
9 | src/c/api_common.c \ | ||
10 | src/c/api_double.c \ | ||
11 | src/c/api_int.c \ | ||
12 | src/c/api_list.c \ | ||
13 | src/c/api_poly.c \ | ||
14 | src/c/api_sparse.c \ | ||
15 | src/c/api_string.c | ||
16 | |||
17 | |||
18 | libsciapi_scilab_la_CFLAGS=-I$(srcdir)/includes/ \ | ||
19 | -I$(srcdir)/src/c/ \ | ||
20 | -I$(top_srcdir)/modules/core/includes \ | ||
21 | -I$(top_srcdir)/modules/call_scilab/includes \ | ||
22 | -I$(top_srcdir)/libs/MALLOC/includes/ \ | ||
23 | -I$(top_srcdir)/modules/output_stream/includes \ | ||
24 | -I$(top_srcdir)/modules/string/includes | ||
25 | |||
26 | |||
27 | pkglib_LTLIBRARIES = libsciapi_scilab.la | ||
28 | |||
29 | libsciapi_scilab_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) | ||
30 | |||
31 | libsciapi_scilab_la_SOURCES = $(API_SCILAB_C_SOURCES) $(GATEWAY_C_SOURCES) | ||
32 | |||
33 | # For the code check (splint) | ||
34 | CHECK_SRC= $(libsciapi_scilab_la_SOURCES) | ||
35 | INCLUDE_FLAGS = $(libsciapi_scilab_la_CFLAGS) | ||
36 | |||
37 | libsciapi_scilab_la_LIBADD = $(top_builddir)/modules/core/libscicore.la | ||
38 | |||
39 | |||
40 | #### Target ###### | ||
41 | modulename=api_scilab | ||
42 | |||
43 | |||
44 | #### api_scilab : Conf files #### | ||
45 | libsciapi_scilab_la_rootdir = $(mydatadir) | ||
46 | libsciapi_scilab_la_root_DATA = changelog.txt license.txt readme.txt version.xml | ||
47 | |||
48 | |||
49 | #### api_scilab : init scripts #### | ||
50 | libsciapi_scilab_la_etcdir = $(mydatadir)/etc | ||
51 | libsciapi_scilab_la_etc_DATA = etc/api_scilab.quit etc/api_scilab.start | ||
52 | |||
53 | |||
54 | #### api_scilab : include files #### | ||
55 | libsciapi_scilab_la_includedir=$(pkgincludedir)/api_scilab | ||
56 | libsciapi_scilab_la_include_HEADERS = includes/api_boolean.h \ | ||
57 | includes/api_boolean_sparse.h \ | ||
58 | includes/api_common.h \ | ||
59 | includes/api_double.h \ | ||
60 | includes/api_int.h \ | ||
61 | includes/api_list.h \ | ||
62 | includes/api_poly.h \ | ||
63 | includes/api_sparse.h \ | ||
64 | includes/api_string.h \ | ||
65 | includes/api_variable.h \ | ||
66 | includes/dynlib_api_scilab.h | ||
67 | |||
68 | include $(top_srcdir)/Makefile.incl.am | ||
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in new file mode 100644 index 0000000..af013f3 --- /dev/null +++ b/scilab/modules/api_scilab/Makefile.in | |||
@@ -0,0 +1,1067 @@ | |||
1 | # Makefile.in generated by automake 1.10.2 from Makefile.am. | ||
2 | # @configure_input@ | ||
3 | |||
4 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
5 | # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | ||
6 | # This Makefile.in is free software; the Free Software Foundation | ||
7 | # gives unlimited permission to copy and/or distribute it, | ||
8 | # with or without modifications, as long as this notice is preserved. | ||
9 | |||
10 | # This program is distributed in the hope that it will be useful, | ||
11 | # but WITHOUT ANY WARRANTY, to the extent permitted by law; without | ||
12 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
13 | # PARTICULAR PURPOSE. | ||
14 | |||
15 | @SET_MAKE@ | ||
16 | |||
17 | ########## | ||
18 | ### Allan CORNET | ||
19 | ### DIGITEO - Scilab 2009 | ||
20 | ########## | ||
21 | |||
22 | # Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | ||
23 | # Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr> | ||
24 | # Copyright (C) 2008 - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr> | ||
25 | # | ||
26 | # This file must be used under the terms of the CeCILL. | ||
27 | # This source file is licensed as described in the file COPYING, which | ||
28 | # you should have received as part of this distribution. The terms | ||
29 | # are also available at | ||
30 | # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt | ||
31 | # | ||
32 | |||
33 | ########## | ||
34 | ### Makefile included stuff | ||
35 | ### Target, variable, suffixes which are supposed to be usefull in every makefile.am | ||
36 | ########## | ||
37 | |||
38 | |||
39 | |||
40 | VPATH = @srcdir@ | ||
41 | pkgdatadir = $(datadir)/@PACKAGE@ | ||
42 | pkglibdir = $(libdir)/@PACKAGE@ | ||
43 | pkgincludedir = $(includedir)/@PACKAGE@ | ||
44 | am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
45 | install_sh_DATA = $(install_sh) -c -m 644 | ||
46 | install_sh_PROGRAM = $(install_sh) -c | ||
47 | install_sh_SCRIPT = $(install_sh) -c | ||
48 | INSTALL_HEADER = $(INSTALL_DATA) | ||
49 | transform = $(program_transform_name) | ||
50 | NORMAL_INSTALL = : | ||
51 | PRE_INSTALL = : | ||
52 | POST_INSTALL = : | ||
53 | NORMAL_UNINSTALL = : | ||
54 | PRE_UNINSTALL = : | ||
55 | POST_UNINSTALL = : | ||
56 | build_triplet = @build@ | ||
57 | host_triplet = @host@ | ||
58 | DIST_COMMON = $(libsciapi_scilab_la_include_HEADERS) \ | ||
59 | $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ | ||
60 | $(top_srcdir)/Makefile.incl.am | ||
61 | @NEED_JAVA_TRUE@am__append_1 = java | ||
62 | subdir = modules/api_scilab | ||
63 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
64 | am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ | ||
65 | $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ | ||
66 | $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ | ||
67 | $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ | ||
68 | $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libs_by_debian.m4 \ | ||
69 | $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \ | ||
70 | $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ocaml.m4 \ | ||
71 | $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \ | ||
72 | $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \ | ||
73 | $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \ | ||
74 | $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \ | ||
75 | $(top_srcdir)/configure.ac | ||
76 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | ||
77 | $(ACLOCAL_M4) | ||
78 | mkinstalldirs = $(install_sh) -d | ||
79 | CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h | ||
80 | CONFIG_CLEAN_FILES = | ||
81 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | ||
82 | am__vpath_adj = case $$p in \ | ||
83 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
84 | *) f=$$p;; \ | ||
85 | esac; | ||
86 | am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; | ||
87 | am__installdirs = "$(DESTDIR)$(pkglibdir)" \ | ||
88 | "$(DESTDIR)$(libsciapi_scilab_la_etcdir)" \ | ||
89 | "$(DESTDIR)$(libsciapi_scilab_la_rootdir)" \ | ||
90 | "$(DESTDIR)$(libsciapi_scilab_la_includedir)" | ||
91 | pkglibLTLIBRARIES_INSTALL = $(INSTALL) | ||
92 | LTLIBRARIES = $(pkglib_LTLIBRARIES) | ||
93 | libsciapi_scilab_la_DEPENDENCIES = \ | ||
94 | $(top_builddir)/modules/core/libscicore.la | ||
95 | am__objects_1 = libsciapi_scilab_la-api_boolean.lo \ | ||
96 | libsciapi_scilab_la-api_boolean_sparse.lo \ | ||
97 | libsciapi_scilab_la-api_common.lo \ | ||
98 | libsciapi_scilab_la-api_double.lo \ | ||
99 | libsciapi_scilab_la-api_int.lo libsciapi_scilab_la-api_list.lo \ | ||
100 | libsciapi_scilab_la-api_poly.lo \ | ||
101 | libsciapi_scilab_la-api_sparse.lo \ | ||
102 | libsciapi_scilab_la-api_string.lo | ||
103 | am_libsciapi_scilab_la_OBJECTS = $(am__objects_1) | ||
104 | libsciapi_scilab_la_OBJECTS = $(am_libsciapi_scilab_la_OBJECTS) | ||
105 | libsciapi_scilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
106 | $(LIBTOOLFLAGS) --mode=link $(CCLD) \ | ||
107 | $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) \ | ||
108 | $(libsciapi_scilab_la_LDFLAGS) $(LDFLAGS) -o $@ | ||
109 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes | ||
110 | depcomp = $(SHELL) $(top_srcdir)/config/depcomp | ||
111 | am__depfiles_maybe = depfiles | ||
112 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | ||
113 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
114 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
115 | --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | ||
116 | $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
117 | CCLD = $(CC) | ||
118 | LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | ||
119 | --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | ||
120 | $(LDFLAGS) -o $@ | ||
121 | SOURCES = $(libsciapi_scilab_la_SOURCES) | ||
122 | DIST_SOURCES = $(libsciapi_scilab_la_SOURCES) | ||
123 | libsciapi_scilab_la_etcDATA_INSTALL = $(INSTALL_DATA) | ||
124 | libsciapi_scilab_la_rootDATA_INSTALL = $(INSTALL_DATA) | ||
125 | DATA = $(libsciapi_scilab_la_etc_DATA) \ | ||
126 | $(libsciapi_scilab_la_root_DATA) | ||
127 | libsciapi_scilab_la_includeHEADERS_INSTALL = $(INSTALL_HEADER) | ||
128 | HEADERS = $(libsciapi_scilab_la_include_HEADERS) | ||
129 | ETAGS = etags | ||
130 | CTAGS = ctags | ||
131 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
132 | ACLOCAL = @ACLOCAL@ | ||
133 | ALL_LINGUAS = @ALL_LINGUAS@ | ||
134 | AMTAR = @AMTAR@ | ||
135 | ANT = @ANT@ | ||
136 | AR = @AR@ | ||
137 | AUTOCONF = @AUTOCONF@ | ||
138 | AUTOHEADER = @AUTOHEADER@ | ||
139 | AUTOMAKE = @AUTOMAKE@ | ||
140 | AVALON_FRAMEWORK = @AVALON_FRAMEWORK@ | ||
141 | AWK = @AWK@ | ||
142 | BATIK = @BATIK@ | ||
143 | BLAS_LIBS = @BLAS_LIBS@ | ||
144 | CC = @CC@ | ||
145 | CCDEPMODE = @CCDEPMODE@ | ||
146 | CFLAGS = @CFLAGS@ | ||
147 | COMMONS_IO = @COMMONS_IO@ | ||
148 | COMMONS_LOGGING = @COMMONS_LOGGING@ | ||
149 | CPP = @CPP@ | ||
150 | CPPFLAGS = @CPPFLAGS@ | ||
151 | CXX = @CXX@ | ||
152 | CXXCPP = @CXXCPP@ | ||
153 | CXXDEPMODE = @CXXDEPMODE@ | ||
154 | CXXFLAGS = @CXXFLAGS@ | ||
155 | CYGPATH_W = @CYGPATH_W@ | ||
156 | DEFS = @DEFS@ | ||
157 | DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@ | ||
158 | DEPDIR = @DEPDIR@ | ||
159 | DOCBOOK_ROOT = @DOCBOOK_ROOT@ | ||
160 | DSYMUTIL = @DSYMUTIL@ | ||
161 | ECHO = @ECHO@ | ||
162 | ECHO_C = @ECHO_C@ | ||
163 | ECHO_N = @ECHO_N@ | ||
164 | ECHO_T = @ECHO_T@ | ||
165 | EGREP = @EGREP@ | ||
166 | EXEEXT = @EXEEXT@ | ||
167 | F77 = @F77@ | ||
168 | FFLAGS = @FFLAGS@ | ||
169 | FFTW3_LIB = @FFTW3_LIB@ | ||
170 | FFTW_ENABLE = @FFTW_ENABLE@ | ||
171 | FLEXDOCK = @FLEXDOCK@ | ||
172 | FLIBS = @FLIBS@ | ||
173 | FOP = @FOP@ | ||
174 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ | ||
175 | GIWS_BIN = @GIWS_BIN@ | ||
176 | GLUEGEN_RT = @GLUEGEN_RT@ | ||
177 | GMSGFMT = @GMSGFMT@ | ||
178 | GMSGFMT_015 = @GMSGFMT_015@ | ||
179 | GRAPHICS_ENABLE = @GRAPHICS_ENABLE@ | ||
180 | GREP = @GREP@ | ||
181 | GUI_ENABLE = @GUI_ENABLE@ | ||
182 | HDF5_CFLAGS = @HDF5_CFLAGS@ | ||
183 | HDF5_ENABLE = @HDF5_ENABLE@ | ||
184 | HDF5_LIBS = @HDF5_LIBS@ | ||
185 | HELP_ENABLE = @HELP_ENABLE@ | ||
186 | INSTALL = @INSTALL@ | ||
187 | INSTALL_DATA = @INSTALL_DATA@ | ||
188 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ | ||
189 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ | ||
190 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ | ||
191 | INTLLIBS = @INTLLIBS@ | ||
192 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ | ||
193 | JAR = @JAR@ | ||
194 | JAVA = @JAVA@ | ||
195 | JAVAC = @JAVAC@ | ||
196 | JAVAH = @JAVAH@ | ||
197 | JAVASCI_ENABLE = @JAVASCI_ENABLE@ | ||
198 | JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ | ||
199 | JAVA_ENABLE = @JAVA_ENABLE@ | ||
200 | JAVA_G = @JAVA_G@ | ||
201 | JAVA_HOME = @JAVA_HOME@ | ||
202 | JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@ | ||
203 | JAVA_JNI_LIBS = @JAVA_JNI_LIBS@ | ||
204 | JDB = @JDB@ | ||
205 | JEUCLID_CORE = @JEUCLID_CORE@ | ||
206 | JHALL = @JHALL@ | ||
207 | JOGL = @JOGL@ | ||
208 | JROSETTA_API = @JROSETTA_API@ | ||
209 | JROSETTA_ENGINE = @JROSETTA_ENGINE@ | ||
210 | LAPACK_LIBS = @LAPACK_LIBS@ | ||
211 | LDFLAGS = @LDFLAGS@ | ||
212 | LIBICONV = @LIBICONV@ | ||
213 | LIBINTL = @LIBINTL@ | ||
214 | LIBOBJS = @LIBOBJS@ | ||
215 | LIBS = @LIBS@ | ||
216 | LIBTOOL = @LIBTOOL@ | ||
217 | LN_S = @LN_S@ | ||
218 | LOOKS = @LOOKS@ | ||
219 | LTLIBICONV = @LTLIBICONV@ | ||
220 | LTLIBINTL = @LTLIBINTL@ | ||
221 | LTLIBOBJS = @LTLIBOBJS@ | ||
222 | MAINT = @MAINT@ | ||
223 | MAKEINFO = @MAKEINFO@ | ||
224 | MATIO_CFLAGS = @MATIO_CFLAGS@ | ||
225 | MATIO_ENABLE = @MATIO_ENABLE@ | ||
226 | MATIO_LIBS = @MATIO_LIBS@ | ||
227 | MKDIR_P = @MKDIR_P@ | ||
228 | MSGCAT = @MSGCAT@ | ||
229 | MSGFMT = @MSGFMT@ | ||
230 | MSGFMT_015 = @MSGFMT_015@ | ||
231 | MSGMERGE = @MSGMERGE@ | ||
232 | NM = @NM@ | ||
233 | NMEDIT = @NMEDIT@ | ||
234 | OBJEXT = @OBJEXT@ | ||
235 | OCAMLC = @OCAMLC@ | ||
236 | OCAMLDEP = @OCAMLDEP@ | ||
237 | OCAMLLEX = @OCAMLLEX@ | ||
238 | OCAMLOPT = @OCAMLOPT@ | ||
239 | OCAMLYACC = @OCAMLYACC@ | ||
240 | PACKAGE = @PACKAGE@ | ||
241 | PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | ||
242 | PACKAGE_NAME = @PACKAGE_NAME@ | ||
243 | PACKAGE_STRING = @PACKAGE_STRING@ | ||
244 | PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
245 | PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
246 | PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
247 | PCRE_CFLAGS = @PCRE_CFLAGS@ | ||
248 | PCRE_CONFIG = @PCRE_CONFIG@ | ||
249 | PCRE_LIBS = @PCRE_LIBS@ | ||
250 | PCRE_VERSION = @PCRE_VERSION@ | ||
251 | PKG_CONFIG = @PKG_CONFIG@ | ||
252 | POSUB = @POSUB@ | ||
253 | POW_LIB = @POW_LIB@ | ||
254 | PVMGETARCH = @PVMGETARCH@ | ||
255 | PVM_ARCH = @PVM_ARCH@ | ||
256 | PVM_ENABLE = @PVM_ENABLE@ | ||
257 | PVM_INCLUDE = @PVM_INCLUDE@ | ||
258 | PVM_LIB = @PVM_LIB@ | ||
259 | PYTHON = @PYTHON@ | ||
260 | RANLIB = @RANLIB@ | ||
261 | RELOCATABLE = @RELOCATABLE@ | ||
262 | RT_LIB = @RT_LIB@ | ||
263 | SAXON = @SAXON@ | ||
264 | SCICOS_ENABLE = @SCICOS_ENABLE@ | ||
265 | SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ | ||
266 | SCIPAD_ENABLE = @SCIPAD_ENABLE@ | ||
267 | SED = @SED@ | ||
268 | SET_MAKE = @SET_MAKE@ | ||
269 | SET_RELOCATABLE = @SET_RELOCATABLE@ | ||
270 | SHELL = @SHELL@ | ||
271 | SKINLF = @SKINLF@ | ||
272 | STRIP = @STRIP@ | ||
273 | SWIG_BIN = @SWIG_BIN@ | ||
274 | SWIG_JAVA = @SWIG_JAVA@ | ||
275 | SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ | ||
276 | TCLTK_LIBS = @TCLTK_LIBS@ | ||
277 | TCL_INC_PATH = @TCL_INC_PATH@ | ||
278 | TK_INC_PATH = @TK_INC_PATH@ | ||
279 | UMFPACK_ENABLE = @UMFPACK_ENABLE@ | ||
280 | UMFPACK_LIB = @UMFPACK_LIB@ | ||
281 | USE_NLS = @USE_NLS@ | ||
282 | VERSION = @VERSION@ | ||
283 | WITH_OCAML = @WITH_OCAML@ | ||
284 | WITH_TKSCI = @WITH_TKSCI@ | ||
285 | XGETTEXT = @XGETTEXT@ | ||
286 | XGETTEXT_015 = @XGETTEXT_015@ | ||
287 | XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ | ||
288 | XMKMF = @XMKMF@ | ||
289 | XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@ | ||
290 | XML_APIS_EXT = @XML_APIS_EXT@ | ||
291 | XML_CONFIG = @XML_CONFIG@ | ||
292 | XML_FLAGS = @XML_FLAGS@ | ||
293 | XML_LIBS = @XML_LIBS@ | ||
294 | XML_VERSION = @XML_VERSION@ | ||
295 | X_CFLAGS = @X_CFLAGS@ | ||
296 | X_EXTRA_LIBS = @X_EXTRA_LIBS@ | ||
297 | X_LIBS = @X_LIBS@ | ||
298 | X_PRE_LIBS = @X_PRE_LIBS@ | ||
299 | abs_builddir = @abs_builddir@ | ||
300 | abs_srcdir = @abs_srcdir@ | ||
301 | abs_top_builddir = @abs_top_builddir@ | ||
302 | abs_top_srcdir = @abs_top_srcdir@ | ||
303 | ac_ct_CC = @ac_ct_CC@ | ||
304 | ac_ct_CXX = @ac_ct_CXX@ | ||
305 | ac_ct_F77 = @ac_ct_F77@ | ||
306 | am__include = @am__include@ | ||
307 | am__leading_dot = @am__leading_dot@ | ||
308 | am__quote = @am__quote@ | ||
309 | am__tar = @am__tar@ | ||
310 | am__untar = @am__untar@ | ||
311 | bindir = @bindir@ | ||
312 | build = @build@ | ||
313 | build_alias = @build_alias@ | ||
314 | build_cpu = @build_cpu@ | ||
315 | build_os = @build_os@ | ||
316 | build_vendor = @build_vendor@ | ||
317 | builddir = @builddir@ | ||
318 | cxx_present = @cxx_present@ | ||
319 | datadir = @datadir@ | ||
320 | datarootdir = @datarootdir@ | ||
321 | docdir = @docdir@ | ||
322 | dvidir = @dvidir@ | ||
323 | exec_prefix = @exec_prefix@ | ||
324 | host = @host@ | ||
325 | host_alias = @host_alias@ | ||
326 | host_cpu = @host_cpu@ | ||
327 | host_os = @host_os@ | ||
328 | host_vendor = @host_vendor@ | ||
329 | htmldir = @htmldir@ | ||
330 | includedir = @includedir@ | ||
331 | infodir = @infodir@ | ||
332 | install_sh = @install_sh@ | ||
333 | libdir = @libdir@ | ||
334 | libexecdir = @libexecdir@ | ||
335 | localedir = @localedir@ | ||
336 | localstatedir = @localstatedir@ | ||
337 | mandir = @mandir@ | ||
338 | mkdir_p = @mkdir_p@ | ||
339 | oldincludedir = @oldincludedir@ | ||
340 | pdfdir = @pdfdir@ | ||
341 | prefix = @prefix@ | ||
342 | program_transform_name = @program_transform_name@ | ||
343 | psdir = @psdir@ | ||
344 | sbindir = @sbindir@ | ||
345 | sharedstatedir = @sharedstatedir@ | ||
346 | srcdir = @srcdir@ | ||
347 | sysconfdir = @sysconfdir@ | ||
348 | target_alias = @target_alias@ | ||
349 | top_build_prefix = @top_build_prefix@ | ||
350 | top_builddir = @top_builddir@ | ||
351 | top_srcdir = @top_srcdir@ | ||
352 | |||
353 | ### SOURCES ### | ||
354 | API_SCILAB_C_SOURCES = src/c/api_boolean.c \ | ||
355 | src/c/api_boolean_sparse.c \ | ||
356 | src/c/api_common.c \ | ||
357 | src/c/api_double.c \ | ||
358 | src/c/api_int.c \ | ||
359 | src/c/api_list.c \ | ||
360 | src/c/api_poly.c \ | ||
361 | src/c/api_sparse.c \ | ||
362 | src/c/api_string.c | ||
363 | |||
364 | libsciapi_scilab_la_CFLAGS = -I$(srcdir)/includes/ \ | ||
365 | -I$(srcdir)/src/c/ \ | ||
366 | -I$(top_srcdir)/modules/core/includes \ | ||
367 | -I$(top_srcdir)/modules/call_scilab/includes \ | ||
368 | -I$(top_srcdir)/libs/MALLOC/includes/ \ | ||
369 | -I$(top_srcdir)/modules/output_stream/includes \ | ||
370 | -I$(top_srcdir)/modules/string/includes | ||
371 | |||
372 | pkglib_LTLIBRARIES = libsciapi_scilab.la | ||
373 | libsciapi_scilab_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) | ||
374 | libsciapi_scilab_la_SOURCES = $(API_SCILAB_C_SOURCES) $(GATEWAY_C_SOURCES) | ||
375 | |||
376 | # For the code check (splint) | ||
377 | CHECK_SRC = $(libsciapi_scilab_la_SOURCES) | ||
378 | INCLUDE_FLAGS = $(libsciapi_scilab_la_CFLAGS) | ||
379 | libsciapi_scilab_la_LIBADD = $(top_builddir)/modules/core/libscicore.la | ||
380 | |||
381 | #### Target ###### | ||
382 | modulename = api_scilab | ||
383 | |||
384 | #### api_scilab : Conf files #### | ||
385 | libsciapi_scilab_la_rootdir = $(mydatadir) | ||
386 | libsciapi_scilab_la_root_DATA = changelog.txt license.txt readme.txt version.xml | ||
387 | |||
388 | #### api_scilab : init scripts #### | ||
389 | libsciapi_scilab_la_etcdir = $(mydatadir)/etc | ||
390 | libsciapi_scilab_la_etc_DATA = etc/api_scilab.quit etc/api_scilab.start | ||
391 | |||
392 | #### api_scilab : include files #### | ||
393 | libsciapi_scilab_la_includedir = $(pkgincludedir)/api_scilab | ||
394 | libsciapi_scilab_la_include_HEADERS = includes/api_boolean.h \ | ||
395 | includes/api_boolean_sparse.h \ | ||
396 | includes/api_common.h \ | ||
397 | includes/api_double.h \ | ||
398 | includes/api_int.h \ | ||
399 | includes/api_list.h \ | ||
400 | includes/api_poly.h \ | ||
401 | includes/api_sparse.h \ | ||
402 | includes/api_string.h \ | ||
403 | includes/api_variable.h \ | ||
404 | includes/dynlib_api_scilab.h | ||
405 | |||
406 | |||
407 | # Where all the Scilab stuff is installed (macros, help, ...) | ||
408 | mydatadir = $(pkgdatadir)/modules/$(modulename) | ||
409 | |||
410 | # splint options | ||
411 | SPLINT_OPTIONS = -weak -booltype BOOL | ||
412 | |||
413 | ########################### JAVA ###################################### | ||
414 | #### We are delegating java compilation to ant... Thanks to that | ||
415 | #### the procedure will be the same with Microsoft Windows (C) | ||
416 | #### and Linux/Unix | ||
417 | ####################################################################### | ||
418 | TARGETS_ALL = $(am__append_1) | ||
419 | |||
420 | ################ MACROS ###################### | ||
421 | # Rule to build a macro | ||
422 | # NOT USED AT THE MOMENT | ||
423 | SUFFIXES = .sci | ||
424 | |||
425 | ########### INSTALL DOCUMENTATION ################### | ||
426 | |||
427 | # Install documentation files into the right target | ||
428 | # We do not use the automake mechanism (libxxxx_la_help_fr_DATA) because | ||
429 | # automake needs the html files to be present which is not the case when | ||
430 | # we are building Scilab | ||
431 | |||
432 | # Where it should be installed | ||
433 | pkgdocdir = $(mydatadir) | ||
434 | |||
435 | # What is the mask of the help source | ||
436 | DOCMASKXML = *.xml | ||
437 | |||
438 | # What is the mask of the MathML sources | ||
439 | DOCMASKMML = *.mml | ||
440 | |||
441 | ########### INSTALL DATA ################### | ||
442 | # Install macros, help & demos | ||
443 | # Where it should be installed | ||
444 | pkgmacrosdir = $(mydatadir) | ||
445 | # Which directory we process | ||
446 | MACRODIRS = macros/ | ||
447 | # Mask of the Scilab sources macros | ||
448 | MACROMASK = *.sci | ||
449 | # Mask of the Scilab executable sources macros | ||
450 | MACROBUILDMASK = *.sce | ||
451 | # Mask of the Scilab compiled macros | ||
452 | MACROBINMASK = *.bin | ||
453 | # List of the standard directory for tests | ||
454 | TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests | ||
455 | # Where the demos should be installed | ||
456 | pkgdemosdir = $(mydatadir) | ||
457 | # List of the standard directory for demos | ||
458 | DEMOS_DIR = demos | ||
459 | # List of the standard directory for examples | ||
460 | EXAMPLES_DIR = examples | ||
461 | # Where to export JAVA archives (.jar) | ||
462 | JARDIR = jar/ | ||
463 | # JAR files mask | ||
464 | JARMASK = *.jar | ||
465 | # Chapter file | ||
466 | HELP_CHAPTERDIR = help/ | ||
467 | HELP_CHAPTERFILE = addchapter.sce | ||
468 | HELP_CHAPTERLANG = en_US fr_FR pt_BR | ||
469 | all: all-am | ||
470 | |||
471 | .SUFFIXES: | ||
472 | .SUFFIXES: .sci .bin .c .lo .o .obj | ||
473 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps) | ||
474 | @for dep in $?; do \ | ||
475 | case '$(am__configure_deps)' in \ | ||
476 | *$$dep*) \ | ||
477 | ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ | ||
478 | && { if test -f $@; then exit 0; else break; fi; }; \ | ||
479 | exit 1;; \ | ||
480 | esac; \ | ||
481 | done; \ | ||
482 | echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/api_scilab/Makefile'; \ | ||
483 | cd $(top_srcdir) && \ | ||
484 | $(AUTOMAKE) --foreign modules/api_scilab/Makefile | ||
485 | .PRECIOUS: Makefile | ||
486 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
487 | @case '$?' in \ | ||
488 | *config.status*) \ | ||
489 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ | ||
490 | *) \ | ||
491 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ | ||
492 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ | ||
493 | esac; | ||
494 | |||
495 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | ||
496 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
497 | |||
498 | $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | ||
499 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
500 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
501 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
502 | install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) | ||
503 | @$(NORMAL_INSTALL) | ||
504 | test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" | ||
505 | @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ | ||
506 | if test -f $$p; then \ | ||
507 | f=$(am__strip_dir) \ | ||
508 | echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \ | ||
509 | $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \ | ||
510 | else :; fi; \ | ||
511 | done | ||
512 | |||
513 | uninstall-pkglibLTLIBRARIES: | ||
514 | @$(NORMAL_UNINSTALL) | ||
515 | @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ | ||
516 | p=$(am__strip_dir) \ | ||
517 | echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \ | ||
518 | $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \ | ||
519 | done | ||
520 | |||
521 | clean-pkglibLTLIBRARIES: | ||
522 | -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) | ||
523 | @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ | ||
524 | dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ | ||
525 | test "$$dir" != "$$p" || dir=.; \ | ||
526 | echo "rm -f \"$${dir}/so_locations\""; \ | ||
527 | rm -f "$${dir}/so_locations"; \ | ||
528 | done | ||
529 | libsciapi_scilab.la: $(libsciapi_scilab_la_OBJECTS) $(libsciapi_scilab_la_DEPENDENCIES) | ||
530 | $(libsciapi_scilab_la_LINK) -rpath $(pkglibdir) $(libsciapi_scilab_la_OBJECTS) $(libsciapi_scilab_la_LIBADD) $(LIBS) | ||
531 | |||
532 | mostlyclean-compile: | ||
533 | -rm -f *.$(OBJEXT) | ||
534 | |||
535 | distclean-compile: | ||
536 | -rm -f *.tab.c | ||
537 | |||
538 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciapi_scilab_la-api_boolean.Plo@am__quote@ | ||
539 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciapi_scilab_la-api_boolean_sparse.Plo@am__quote@ | ||
540 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciapi_scilab_la-api_common.Plo@am__quote@ | ||
541 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciapi_scilab_la-api_double.Plo@am__quote@ | ||
542 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciapi_scilab_la-api_int.Plo@am__quote@ | ||
543 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciapi_scilab_la-api_list.Plo@am__quote@ | ||
544 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciapi_scilab_la-api_poly.Plo@am__quote@ | ||
545 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciapi_scilab_la-api_sparse.Plo@am__quote@ | ||
546 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciapi_scilab_la-api_string.Plo@am__quote@ | ||
547 | |||
548 | .c.o: | ||
549 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
550 | @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
551 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
552 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
553 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | ||
554 | |||
555 | .c.obj: | ||
556 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | ||
557 | @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | ||
558 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | ||
559 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
560 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | ||
561 | |||
562 | .c.lo: | ||
563 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | ||
564 | @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | ||
565 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | ||
566 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
567 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | ||
568 | |||
569 | libsciapi_scilab_la-api_boolean.lo: src/c/api_boolean.c | ||
570 | @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -MT libsciapi_scilab_la-api_boolean.lo -MD -MP -MF $(DEPDIR)/libsciapi_scilab_la-api_boolean.Tpo -c -o libsciapi_scilab_la-api_boolean.lo `test -f 'src/c/api_boolean.c' || echo '$(srcdir)/'`src/c/api_boolean.c | ||
571 | @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsciapi_scilab_la-api_boolean.Tpo $(DEPDIR)/libsciapi_scilab_la-api_boolean.Plo | ||
572 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/api_boolean.c' object='libsciapi_scilab_la-api_boolean.lo' libtool=yes @AMDEPBACKSLASH@ | ||
573 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
574 | @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -c -o libsciapi_scilab_la-api_boolean.lo `test -f 'src/c/api_boolean.c' || echo '$(srcdir)/'`src/c/api_boolean.c | ||
575 | |||
576 | libsciapi_scilab_la-api_boolean_sparse.lo: src/c/api_boolean_sparse.c | ||
577 | @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -MT libsciapi_scilab_la-api_boolean_sparse.lo -MD -MP -MF $(DEPDIR)/libsciapi_scilab_la-api_boolean_sparse.Tpo -c -o libsciapi_scilab_la-api_boolean_sparse.lo `test -f 'src/c/api_boolean_sparse.c' || echo '$(srcdir)/'`src/c/api_boolean_sparse.c | ||
578 | @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsciapi_scilab_la-api_boolean_sparse.Tpo $(DEPDIR)/libsciapi_scilab_la-api_boolean_sparse.Plo | ||
579 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/api_boolean_sparse.c' object='libsciapi_scilab_la-api_boolean_sparse.lo' libtool=yes @AMDEPBACKSLASH@ | ||
580 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
581 | @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -c -o libsciapi_scilab_la-api_boolean_sparse.lo `test -f 'src/c/api_boolean_sparse.c' || echo '$(srcdir)/'`src/c/api_boolean_sparse.c | ||
582 | |||
583 | libsciapi_scilab_la-api_common.lo: src/c/api_common.c | ||
584 | @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -MT libsciapi_scilab_la-api_common.lo -MD -MP -MF $(DEPDIR)/libsciapi_scilab_la-api_common.Tpo -c -o libsciapi_scilab_la-api_common.lo `test -f 'src/c/api_common.c' || echo '$(srcdir)/'`src/c/api_common.c | ||
585 | @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsciapi_scilab_la-api_common.Tpo $(DEPDIR)/libsciapi_scilab_la-api_common.Plo | ||
586 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/api_common.c' object='libsciapi_scilab_la-api_common.lo' libtool=yes @AMDEPBACKSLASH@ | ||
587 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
588 | @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -c -o libsciapi_scilab_la-api_common.lo `test -f 'src/c/api_common.c' || echo '$(srcdir)/'`src/c/api_common.c | ||
589 | |||
590 | libsciapi_scilab_la-api_double.lo: src/c/api_double.c | ||
591 | @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -MT libsciapi_scilab_la-api_double.lo -MD -MP -MF $(DEPDIR)/libsciapi_scilab_la-api_double.Tpo -c -o libsciapi_scilab_la-api_double.lo `test -f 'src/c/api_double.c' || echo '$(srcdir)/'`src/c/api_double.c | ||
592 | @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsciapi_scilab_la-api_double.Tpo $(DEPDIR)/libsciapi_scilab_la-api_double.Plo | ||
593 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/api_double.c' object='libsciapi_scilab_la-api_double.lo' libtool=yes @AMDEPBACKSLASH@ | ||
594 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
595 | @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -c -o libsciapi_scilab_la-api_double.lo `test -f 'src/c/api_double.c' || echo '$(srcdir)/'`src/c/api_double.c | ||
596 | |||
597 | libsciapi_scilab_la-api_int.lo: src/c/api_int.c | ||
598 | @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -MT libsciapi_scilab_la-api_int.lo -MD -MP -MF $(DEPDIR)/libsciapi_scilab_la-api_int.Tpo -c -o libsciapi_scilab_la-api_int.lo `test -f 'src/c/api_int.c' || echo '$(srcdir)/'`src/c/api_int.c | ||
599 | @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsciapi_scilab_la-api_int.Tpo $(DEPDIR)/libsciapi_scilab_la-api_int.Plo | ||
600 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/api_int.c' object='libsciapi_scilab_la-api_int.lo' libtool=yes @AMDEPBACKSLASH@ | ||
601 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
602 | @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -c -o libsciapi_scilab_la-api_int.lo `test -f 'src/c/api_int.c' || echo '$(srcdir)/'`src/c/api_int.c | ||
603 | |||
604 | libsciapi_scilab_la-api_list.lo: src/c/api_list.c | ||
605 | @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -MT libsciapi_scilab_la-api_list.lo -MD -MP -MF $(DEPDIR)/libsciapi_scilab_la-api_list.Tpo -c -o libsciapi_scilab_la-api_list.lo `test -f 'src/c/api_list.c' || echo '$(srcdir)/'`src/c/api_list.c | ||
606 | @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsciapi_scilab_la-api_list.Tpo $(DEPDIR)/libsciapi_scilab_la-api_list.Plo | ||
607 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/api_list.c' object='libsciapi_scilab_la-api_list.lo' libtool=yes @AMDEPBACKSLASH@ | ||
608 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
609 | @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -c -o libsciapi_scilab_la-api_list.lo `test -f 'src/c/api_list.c' || echo '$(srcdir)/'`src/c/api_list.c | ||
610 | |||
611 | libsciapi_scilab_la-api_poly.lo: src/c/api_poly.c | ||
612 | @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -MT libsciapi_scilab_la-api_poly.lo -MD -MP -MF $(DEPDIR)/libsciapi_scilab_la-api_poly.Tpo -c -o libsciapi_scilab_la-api_poly.lo `test -f 'src/c/api_poly.c' || echo '$(srcdir)/'`src/c/api_poly.c | ||
613 | @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsciapi_scilab_la-api_poly.Tpo $(DEPDIR)/libsciapi_scilab_la-api_poly.Plo | ||
614 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/api_poly.c' object='libsciapi_scilab_la-api_poly.lo' libtool=yes @AMDEPBACKSLASH@ | ||
615 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
616 | @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -c -o libsciapi_scilab_la-api_poly.lo `test -f 'src/c/api_poly.c' || echo '$(srcdir)/'`src/c/api_poly.c | ||
617 | |||
618 | libsciapi_scilab_la-api_sparse.lo: src/c/api_sparse.c | ||
619 | @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -MT libsciapi_scilab_la-api_sparse.lo -MD -MP -MF $(DEPDIR)/libsciapi_scilab_la-api_sparse.Tpo -c -o libsciapi_scilab_la-api_sparse.lo `test -f 'src/c/api_sparse.c' || echo '$(srcdir)/'`src/c/api_sparse.c | ||
620 | @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsciapi_scilab_la-api_sparse.Tpo $(DEPDIR)/libsciapi_scilab_la-api_sparse.Plo | ||
621 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/api_sparse.c' object='libsciapi_scilab_la-api_sparse.lo' libtool=yes @AMDEPBACKSLASH@ | ||
622 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
623 | @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -c -o libsciapi_scilab_la-api_sparse.lo `test -f 'src/c/api_sparse.c' || echo '$(srcdir)/'`src/c/api_sparse.c | ||
624 | |||
625 | libsciapi_scilab_la-api_string.lo: src/c/api_string.c | ||
626 | @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -MT libsciapi_scilab_la-api_string.lo -MD -MP -MF $(DEPDIR)/libsciapi_scilab_la-api_string.Tpo -c -o libsciapi_scilab_la-api_string.lo `test -f 'src/c/api_string.c' || echo '$(srcdir)/'`src/c/api_string.c | ||
627 | @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsciapi_scilab_la-api_string.Tpo $(DEPDIR)/libsciapi_scilab_la-api_string.Plo | ||
628 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/api_string.c' object='libsciapi_scilab_la-api_string.lo' libtool=yes @AMDEPBACKSLASH@ | ||
629 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
630 | @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciapi_scilab_la_CFLAGS) $(CFLAGS) -c -o libsciapi_scilab_la-api_string.lo `test -f 'src/c/api_string.c' || echo '$(srcdir)/'`src/c/api_string.c | ||
631 | |||
632 | mostlyclean-libtool: | ||
633 | -rm -f *.lo | ||
634 | |||
635 | clean-libtool: | ||
636 | -rm -rf .libs _libs | ||
637 | install-libsciapi_scilab_la_etcDATA: $(libsciapi_scilab_la_etc_DATA) | ||
638 | @$(NORMAL_INSTALL) | ||
639 | test -z "$(libsciapi_scilab_la_etcdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciapi_scilab_la_etcdir)" | ||
640 | @list='$(libsciapi_scilab_la_etc_DATA)'; for p in $$list; do \ | ||
641 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
642 | f=$(am__strip_dir) \ | ||
643 | echo " $(libsciapi_scilab_la_etcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libsciapi_scilab_la_etcdir)/$$f'"; \ | ||
644 | $(libsciapi_scilab_la_etcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libsciapi_scilab_la_etcdir)/$$f"; \ | ||
645 | done | ||
646 | |||
647 | uninstall-libsciapi_scilab_la_etcDATA: | ||
648 | @$(NORMAL_UNINSTALL) | ||
649 | @list='$(libsciapi_scilab_la_etc_DATA)'; for p in $$list; do \ | ||
650 | f=$(am__strip_dir) \ | ||
651 | echo " rm -f '$(DESTDIR)$(libsciapi_scilab_la_etcdir)/$$f'"; \ | ||
652 | rm -f "$(DESTDIR)$(libsciapi_scilab_la_etcdir)/$$f"; \ | ||
653 | done | ||
654 | install-libsciapi_scilab_la_rootDATA: $(libsciapi_scilab_la_root_DATA) | ||
655 | @$(NORMAL_INSTALL) | ||
656 | test -z "$(libsciapi_scilab_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libsciapi_scilab_la_rootdir)" | ||
657 | @list='$(libsciapi_scilab_la_root_DATA)'; for p in $$list; do \ | ||
658 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
659 | f=$(am__strip_dir) \ | ||
660 | echo " $(libsciapi_scilab_la_rootDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libsciapi_scilab_la_rootdir)/$$f'"; \ | ||
661 | $(libsciapi_scilab_la_rootDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libsciapi_scilab_la_rootdir)/$$f"; \ | ||
662 | done | ||
663 | |||
664 | uninstall-libsciapi_scilab_la_rootDATA: | ||
665 | @$(NORMAL_UNINSTALL) | ||
666 | @list='$(libsciapi_scilab_la_root_DATA)'; for p in $$list; do \ | ||
667 | f=$(am__strip_dir) \ | ||
668 | echo " rm -f '$(DESTDIR)$(libsciapi_scilab_la_rootdir)/$$f'"; \ | ||
669 | rm -f "$(DESTDIR)$(libsciapi_scilab_la_rootdir)/$$f"; \ | ||
670 | done | ||
671 | install-libsciapi_scilab_la_includeHEADERS: $(libsciapi_scilab_la_include_HEADERS) | ||
672 | @$(NORMAL_INSTALL) | ||
673 | test -z "$(libsciapi_scilab_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libsciapi_scilab_la_includedir)" | ||
674 | @list='$(libsciapi_scilab_la_include_HEADERS)'; for p in $$list; do \ | ||
675 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
676 | f=$(am__strip_dir) \ | ||
677 | echo " $(libsciapi_scilab_la_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libsciapi_scilab_la_includedir)/$$f'"; \ | ||
678 | $(libsciapi_scilab_la_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libsciapi_scilab_la_includedir)/$$f"; \ | ||
679 | done | ||
680 | |||
681 | uninstall-libsciapi_scilab_la_includeHEADERS: | ||
682 | @$(NORMAL_UNINSTALL) | ||
683 | @list='$(libsciapi_scilab_la_include_HEADERS)'; for p in $$list; do \ | ||
684 | f=$(am__strip_dir) \ | ||
685 | echo " rm -f '$(DESTDIR)$(libsciapi_scilab_la_includedir)/$$f'"; \ | ||
686 | rm -f "$(DESTDIR)$(libsciapi_scilab_la_includedir)/$$f"; \ | ||
687 | done | ||
688 | |||
689 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
690 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
691 | unique=`for i in $$list; do \ | ||
692 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
693 | done | \ | ||
694 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
695 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
696 | mkid -fID $$unique | ||
697 | tags: TAGS | ||
698 | |||
699 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
700 | $(TAGS_FILES) $(LISP) | ||
701 | tags=; \ | ||
702 | here=`pwd`; \ | ||
703 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
704 | unique=`for i in $$list; do \ | ||
705 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
706 | done | \ | ||
707 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
708 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
709 | if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | ||
710 | test -n "$$unique" || unique=$$empty_fix; \ | ||
711 | $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | ||
712 | $$tags $$unique; \ | ||
713 | fi | ||
714 | ctags: CTAGS | ||
715 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | ||
716 | $(TAGS_FILES) $(LISP) | ||
717 | tags=; \ | ||
718 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
719 | unique=`for i in $$list; do \ | ||
720 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
721 | done | \ | ||
722 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
723 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
724 | test -z "$(CTAGS_ARGS)$$tags$$unique" \ | ||
725 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | ||
726 | $$tags $$unique | ||
727 | |||
728 | GTAGS: | ||
729 | here=`$(am__cd) $(top_builddir) && pwd` \ | ||
730 | && cd $(top_srcdir) \ | ||
731 | && gtags -i $(GTAGS_ARGS) $$here | ||
732 | |||
733 | distclean-tags: | ||
734 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | ||
735 | |||
736 | distdir: $(DISTFILES) | ||
737 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
738 | topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
739 | list='$(DISTFILES)'; \ | ||
740 | dist_files=`for file in $$list; do echo $$file; done | \ | ||
741 | sed -e "s|^$$srcdirstrip/||;t" \ | ||
742 | -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ | ||
743 | case $$dist_files in \ | ||
744 | */*) $(MKDIR_P) `echo "$$dist_files" | \ | ||
745 | sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ | ||
746 | sort -u` ;; \ | ||
747 | esac; \ | ||
748 | for file in $$dist_files; do \ | ||
749 | if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
750 | if test -d $$d/$$file; then \ | ||
751 | dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
752 | if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
753 | cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | ||
754 | fi; \ | ||
755 | cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ | ||
756 | else \ | ||
757 | test -f $(distdir)/$$file \ | ||
758 | || cp -p $$d/$$file $(distdir)/$$file \ | ||
759 | || exit 1; \ | ||
760 | fi; \ | ||
761 | done | ||
762 | check-am: all-am | ||
763 | $(MAKE) $(AM_MAKEFLAGS) check-local | ||
764 | check: check-am | ||
765 | all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local | ||
766 | installdirs: | ||
767 | for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciapi_scilab_la_etcdir)" "$(DESTDIR)$(libsciapi_scilab_la_rootdir)" "$(DESTDIR)$(libsciapi_scilab_la_includedir)"; do \ | ||
768 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | ||
769 | done | ||
770 | install: install-am | ||
771 | install-exec: install-exec-am | ||
772 | install-data: install-data-am | ||
773 | uninstall: uninstall-am | ||
774 | |||
775 | install-am: all-am | ||
776 | @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am | ||
777 | |||
778 | installcheck: installcheck-am | ||
779 | install-strip: | ||
780 | $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
781 | install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
782 | `test -z '$(STRIP)' || \ | ||
783 | echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
784 | mostlyclean-generic: | ||
785 | |||
786 | clean-generic: | ||
787 | |||
788 | distclean-generic: | ||
789 | -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
790 | |||
791 | maintainer-clean-generic: | ||
792 | @echo "This command is intended for maintainers to use" | ||
793 | @echo "it deletes files that may require special tools to rebuild." | ||
794 | clean: clean-am | ||
795 | |||
796 | clean-am: clean-generic clean-libtool clean-local \ | ||
797 | clean-pkglibLTLIBRARIES mostlyclean-am | ||
798 | |||
799 | distclean: distclean-am | ||
800 | -rm -rf ./$(DEPDIR) | ||
801 | -rm -f Makefile | ||
802 | distclean-am: clean-am distclean-compile distclean-generic \ | ||
803 | distclean-local distclean-tags | ||
804 | |||
805 | dvi: dvi-am | ||
806 | |||
807 | dvi-am: | ||
808 | |||
809 | html: html-am | ||
810 | |||
811 | info: info-am | ||
812 | |||
813 | info-am: | ||
814 | |||
815 | install-data-am: install-data-local \ | ||
816 | install-libsciapi_scilab_la_etcDATA \ | ||
817 | install-libsciapi_scilab_la_includeHEADERS \ | ||
818 | install-libsciapi_scilab_la_rootDATA | ||
819 | |||
820 | install-dvi: install-dvi-am | ||
821 | |||
822 | install-exec-am: install-pkglibLTLIBRARIES | ||
823 | |||
824 | install-html: install-html-am | ||
825 | |||
826 | install-html-am: install-html-local | ||
827 | |||
828 | install-info: install-info-am | ||
829 | |||
830 | install-man: | ||
831 | |||
832 | install-pdf: install-pdf-am | ||
833 | |||
834 | install-ps: install-ps-am | ||
835 | |||
836 | installcheck-am: | ||
837 | |||
838 | maintainer-clean: maintainer-clean-am | ||
839 | -rm -rf ./$(DEPDIR) | ||
840 | -rm -f Makefile | ||
841 | maintainer-clean-am: distclean-am maintainer-clean-generic | ||
842 | |||
843 | mostlyclean: mostlyclean-am | ||
844 | |||
845 | mostlyclean-am: mostlyclean-compile mostlyclean-generic \ | ||
846 | mostlyclean-libtool | ||
847 | |||
848 | pdf: pdf-am | ||
849 | |||
850 | pdf-am: | ||
851 | |||
852 | ps: ps-am | ||
853 | |||
854 | ps-am: | ||
855 | |||
856 | uninstall-am: uninstall-libsciapi_scilab_la_etcDATA \ | ||
857 | uninstall-libsciapi_scilab_la_includeHEADERS \ | ||
858 | uninstall-libsciapi_scilab_la_rootDATA \ | ||
859 | uninstall-pkglibLTLIBRARIES | ||
860 | |||
861 | .MAKE: install-am install-strip | ||
862 | |||
863 | .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \ | ||
864 | clean clean-generic clean-libtool clean-local \ | ||
865 | clean-pkglibLTLIBRARIES ctags distclean distclean-compile \ | ||
866 | distclean-generic distclean-libtool distclean-local \ | ||
867 | distclean-tags distdir dvi dvi-am html html-am info info-am \ | ||
868 | install install-am install-data install-data-am \ | ||
869 | install-data-local install-dvi install-dvi-am install-exec \ | ||
870 | install-exec-am install-html install-html-am \ | ||
871 | install-html-local install-info install-info-am \ | ||
872 | install-libsciapi_scilab_la_etcDATA \ | ||
873 | install-libsciapi_scilab_la_includeHEADERS \ | ||
874 | install-libsciapi_scilab_la_rootDATA install-man install-pdf \ | ||
875 | install-pdf-am install-pkglibLTLIBRARIES install-ps \ | ||
876 | install-ps-am install-strip installcheck installcheck-am \ | ||
877 | installdirs maintainer-clean maintainer-clean-generic \ | ||
878 | mostlyclean mostlyclean-compile mostlyclean-generic \ | ||
879 | mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ | ||
880 | uninstall-am uninstall-libsciapi_scilab_la_etcDATA \ | ||
881 | uninstall-libsciapi_scilab_la_includeHEADERS \ | ||
882 | uninstall-libsciapi_scilab_la_rootDATA \ | ||
883 | uninstall-pkglibLTLIBRARIES | ||
884 | |||
885 | |||
886 | # This target enables tests for Scilab | ||
887 | check-local: $(top_builddir)/scilab-bin | ||
888 | @COMMAND="test_run('$(modulename)');quit";\ | ||
889 | export LANG=C;\ | ||
890 | $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND" | ||
891 | check-code: | ||
892 | @if test -f build.xml; then \ | ||
893 | $(ANT) checkstyle; \ | ||
894 | fi;\ | ||
895 | splint $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC) | ||
896 | @NEED_JAVA_TRUE@java: | ||
897 | # Some configurations needs to export JAVA_HOME in the current env | ||
898 | @NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \ | ||
899 | @NEED_JAVA_TRUE@ if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \ | ||
900 | @NEED_JAVA_TRUE@ if test -f build.xml -a $$USEANT -eq 1; then \ | ||
901 | @NEED_JAVA_TRUE@ $(ANT); \ | ||
902 | @NEED_JAVA_TRUE@ fi | ||
903 | |||
904 | @NEED_JAVA_TRUE@clean-java: | ||
905 | # Some configurations needs to export JAVA_HOME in the current env | ||
906 | @NEED_JAVA_TRUE@ @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \ | ||
907 | @NEED_JAVA_TRUE@ if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \ | ||
908 | @NEED_JAVA_TRUE@ if test -f build.xml -a $$USEANT -eq 1; then \ | ||
909 | @NEED_JAVA_TRUE@ $(ANT) clean; \ | ||
910 | @NEED_JAVA_TRUE@ fi; | ||
911 | |||
912 | # If the user request for the SWIG generation of the wrappers Java => C/C++ | ||
913 | # We call the target swig-build on the variable SWIG_WRAPPERS | ||
914 | |||
915 | @SWIG_TRUE@swig: $(SWIG_WRAPPERS) | ||
916 | @SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ | ||
917 | @SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ | ||
918 | @SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ | ||
919 | @SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ | ||
920 | @SWIG_TRUE@ echo "Swig process of $$file ..."; \ | ||
921 | @SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ | ||
922 | @SWIG_TRUE@ done; \ | ||
923 | @SWIG_TRUE@ fi | ||
924 | |||
925 | # If the user request for the SWIG generation of the wrappers Java => C/C++ | ||
926 | # We call the target swig-build on the variable SWIG_WRAPPERS | ||
927 | |||
928 | @GIWS_TRUE@giws: $(GIWS_WRAPPERS) | ||
929 | @GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ | ||
930 | @GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ | ||
931 | @GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ | ||
932 | @GIWS_TRUE@ echo "GIWS process of $$file ..."; \ | ||
933 | @GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ | ||
934 | @GIWS_TRUE@ done; \ | ||
935 | @GIWS_TRUE@ fi | ||
936 | |||
937 | macros: | ||
938 | -@( if test ! -x $(top_builddir)/scilab-bin; then \ | ||
939 | echo "Error : Cannot build $< : Scilab has not been built"; \ | ||
940 | else \ | ||
941 | $(top_builddir)/bin/scilab -ns -nwni -e "exec('macros/buildmacros.sce');quit;";\ | ||
942 | fi) | ||
943 | |||
944 | # Removes the macros | ||
945 | clean-macros: | ||
946 | # Removes macros (*.bin generated from .sci) | ||
947 | @for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \ | ||
948 | echo "rm -f $(builddir)/$$dir/$(MACROBINMASK)"; \ | ||
949 | rm -f $(builddir)/$$dir/$(MACROBINMASK); \ | ||
950 | done | ||
951 | |||
952 | all-local: $(TARGETS_ALL) | ||
953 | |||
954 | .sci.bin: | ||
955 | -@( if test ! -x $(top_builddir)/scilab-bin; then \ | ||
956 | echo "Error : Cannot build $< : Scilab has not been build"; \ | ||
957 | else \ | ||
958 | echo "Creating $@"; \ | ||
959 | $(top_builddir)/bin/scilab -ns -nwni -e "exec('$(abs_srcdir)/$<');save('$(abs_srcdir)/$@');exit;"; \ | ||
960 | fi ) | ||
961 | |||
962 | install-html-local: | ||
963 | # If the user wants the help sources to be installed | ||
964 | @INSTALL_HELP_XML_TRUE@ @echo "-------- Install of XML sources of help files --------"; \ | ||
965 | @INSTALL_HELP_XML_TRUE@ for lang in $(ALL_LINGUAS); do \ | ||
966 | @INSTALL_HELP_XML_TRUE@ if test -d $(srcdir)/help/$$lang; then \ | ||
967 | @INSTALL_HELP_XML_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/$$lang && \ | ||
968 | @INSTALL_HELP_XML_TRUE@ if ls -lLd $(srcdir)/help/$$lang/$(DOCMASKXML) >/dev/null 2>&1; then \ | ||
969 | @INSTALL_HELP_XML_TRUE@ for file in $(srcdir)/help/$$lang/$(DOCMASKXML) ; do \ | ||
970 | @INSTALL_HELP_XML_TRUE@ echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/$$lang" ; \ | ||
971 | @INSTALL_HELP_XML_TRUE@ $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/$$lang ; \ | ||
972 | @INSTALL_HELP_XML_TRUE@ done ; \ | ||
973 | @INSTALL_HELP_XML_TRUE@ fi; \ | ||
974 | @INSTALL_HELP_XML_TRUE@ fi; \ | ||
975 | @INSTALL_HELP_XML_TRUE@ done; \ | ||
976 | @INSTALL_HELP_XML_TRUE@ @echo "-------- Install of MathML sources --------"; \ | ||
977 | @INSTALL_HELP_XML_TRUE@ if test -d $(srcdir)/help/mml/; then \ | ||
978 | @INSTALL_HELP_XML_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/mml/ && \ | ||
979 | @INSTALL_HELP_XML_TRUE@ if ls -lLd $(srcdir)/help/mml/$(DOCMASKMML) >/dev/null 2>&1; then \ | ||
980 | @INSTALL_HELP_XML_TRUE@ for file in $(srcdir)/help/mml/$(DOCMASKMML) ; do \ | ||
981 | @INSTALL_HELP_XML_TRUE@ echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/mml" ; \ | ||
982 | @INSTALL_HELP_XML_TRUE@ $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/mml ; \ | ||
983 | @INSTALL_HELP_XML_TRUE@ done ; \ | ||
984 | @INSTALL_HELP_XML_TRUE@ fi; \ | ||
985 | @INSTALL_HELP_XML_TRUE@ fi | ||
986 | install-data-local: | ||
987 | # Install the tests | ||
988 | @echo "-------- Install tests (if any) --------"; \ | ||
989 | for dir in $(TESTS_DIR) $(TESTS_DIREXT) ; do \ | ||
990 | if test -d $(srcdir)/$$dir/; then \ | ||
991 | $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ | ||
992 | for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \ | ||
993 | if test -d "$(srcdir)/$$dir/$$file"; then \ | ||
994 | echo $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir/$$file; \ | ||
995 | $(mkinstalldirs) "$(DESTDIR)$(pkgmacrosdir)/$$dir/$$file"; \ | ||
996 | else \ | ||
997 | echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \ | ||
998 | $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \ | ||
999 | fi \ | ||
1000 | done; \ | ||
1001 | fi; \ | ||
1002 | done | ||
1003 | # Install the help chapter | ||
1004 | @echo "-------- Install the help chapter (if any) --------"; \ | ||
1005 | for lang in $(HELP_CHAPTERLANG); do \ | ||
1006 | HELPFILE=$(srcdir)/$(HELP_CHAPTERDIR)$$lang/$(HELP_CHAPTERFILE); \ | ||
1007 | if test -f $$HELPFILE; then \ | ||
1008 | echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \ | ||
1009 | $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \ | ||
1010 | echo $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \ | ||
1011 | $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \ | ||
1012 | fi; \ | ||
1013 | done | ||
1014 | # Install the demos & examples | ||
1015 | @echo "-------- Install demos & examples (if any) --------"; \ | ||
1016 | for dir in $(DEMOS_DIR) $(DEMOS_DIREXT) $(EXAMPLES_DIR) $(EXAMPLES_DIREXT) ; do \ | ||
1017 | if test -d $(srcdir)/$$dir/; then \ | ||
1018 | $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir && \ | ||
1019 | for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \ | ||
1020 | if test -d "$(srcdir)/$$dir/$$file"; then \ | ||
1021 | echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir/$$file; \ | ||
1022 | $(mkinstalldirs) "$(DESTDIR)$(pkgdocdir)/$$dir/$$file"; \ | ||
1023 | else \ | ||
1024 | echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \ | ||
1025 | $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \ | ||
1026 | fi \ | ||
1027 | done; \ | ||
1028 | fi; \ | ||
1029 | done | ||
1030 | # Install the macros | ||
1031 | @echo "-------- Install macros (if any) --------"; \ | ||
1032 | for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \ | ||
1033 | $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ | ||
1034 | if test -d $(srcdir)/$$dir/; then \ | ||
1035 | FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ | ||
1036 | for specialExt in $(MACROSSPECIALEXT); do \ | ||
1037 | specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ | ||
1038 | done; \ | ||
1039 | FILELIST="$$FILELIST $$specialExtDir"; \ | ||
1040 | for file in `ls -1 $$FILELIST 2>/dev/null`; do \ | ||
1041 | echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ | ||
1042 | $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ | ||
1043 | done; \ | ||
1044 | fi; \ | ||
1045 | done | ||
1046 | # Install java files (.jar) | ||
1047 | @if ls -lLd $(srcdir)/$(JARDIR)$(JARMASK) >/dev/null 2>&1; then \ | ||
1048 | echo "-------- Install jar files --------"; \ | ||
1049 | $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(JARDIR); \ | ||
1050 | for file in $(srcdir)/$(JARDIR)$(JARMASK); do\ | ||
1051 | echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/$(JARDIR)" ; \ | ||
1052 | $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/$(JARDIR) ; \ | ||
1053 | done ; \ | ||
1054 | fi | ||
1055 | |||
1056 | ########### CLEAN ################### | ||
1057 | # Clean macros and help (generated automatically by Scilab) | ||
1058 | @NEED_JAVA_TRUE@clean-local: clean-java clean-macros | ||
1059 | @NEED_JAVA_FALSE@clean-local: clean-macros | ||
1060 | |||
1061 | distclean-local: | ||
1062 | rm -f $(builddir)/help/*/.last_successful_build_javaHelp $(builddir)/help/*/.list_* | ||
1063 | |||
1064 | .PHONY: macros java swig giws | ||
1065 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
1066 | # Otherwise a system limit (for SysV at least) may be exceeded. | ||
1067 | .NOEXPORT: | ||
diff --git a/scilab/modules/api_scilab/String_Import.def b/scilab/modules/api_scilab/String_Import.def new file mode 100644 index 0000000..ae80e0e --- /dev/null +++ b/scilab/modules/api_scilab/String_Import.def | |||
@@ -0,0 +1,6 @@ | |||
1 | LIBRARY string.dll | ||
2 | |||
3 | |||
4 | EXPORTS | ||
5 | code2str | ||
6 | str2code \ No newline at end of file | ||
diff --git a/scilab/modules/api_scilab/api_scilab.iss b/scilab/modules/api_scilab/api_scilab.iss new file mode 100644 index 0000000..66d7ea5 --- /dev/null +++ b/scilab/modules/api_scilab/api_scilab.iss | |||
@@ -0,0 +1,43 @@ | |||
1 | ;############################################################################################################## | ||
2 | ; Script d'installation Inno Setup (5.2.1) pour scilab | ||
3 | ; Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | ||
4 | ; Copyright (C) 2009 - DIGITEO - Allan CORNET | ||
5 | ; | ||
6 | ; This file must be used under the terms of the CeCILL. | ||
7 | ; This source file is licensed as described in the file COPYING, which | ||
8 | ; you should have received as part of this distribution. The terms | ||
9 | ; are also available at | ||
10 | ; http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt | ||
11 | ; | ||
12 | |||
13 | ;############################################################################################################## | ||
14 | ;-------------------------------------------------------------------------------------------------------------- | ||
15 | ; api_scilab module | ||
16 | ;-------------------------------------------------------------------------------------------------------------- | ||
17 | ; | ||
18 | #define MODULE_API_SCILAB "api_scilab" | ||
19 | ; | ||
20 | Source: bin\api_scilab.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} | ||
21 | Source: bin\api_scilab.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB} | ||
22 | ; | ||
23 | Source: modules\{#MODULE_API_SCILAB}\changelog.txt; DestDir: {app}\modules\{#MODULE_API_SCILAB}; Components: {#COMPN_SCILAB} | ||
24 | Source: modules\{#MODULE_API_SCILAB}\license.txt; DestDir: {app}\modules\{#MODULE_API_SCILAB}; Components: {#COMPN_SCILAB} | ||
25 | Source: modules\{#MODULE_API_SCILAB}\readme.txt; DestDir: {app}\modules\{#MODULE_API_SCILAB}; Components: {#COMPN_SCILAB} | ||
26 | Source: modules\{#MODULE_API_SCILAB}\version.xml; DestDir: {app}\modules\{#MODULE_API_SCILAB}; Components: {#COMPN_SCILAB} | ||
27 | ; | ||
28 | Source: modules\{#MODULE_API_SCILAB}\includes\*.h; DestDir: {app}\modules\{#MODULE_API_SCILAB}\includes; Components: {#COMPN_SCILAB} | ||
29 | ; | ||
30 | Source: modules\{#MODULE_API_SCILAB}\etc\{#MODULE_API_SCILAB}.quit; DestDir: {app}\modules\{#MODULE_API_SCILAB}\etc; Components: {#COMPN_SCILAB} | ||
31 | Source: modules\{#MODULE_API_SCILAB}\etc\{#MODULE_API_SCILAB}.start; DestDir: {app}\modules\{#MODULE_API_SCILAB}\etc; Components: {#COMPN_SCILAB} | ||
32 | ; | ||
33 | Source: modules\{#MODULE_API_SCILAB}\macros\buildmacros.sce; DestDir: {app}\modules\{#MODULE_API_SCILAB}\macros; Components: {#COMPN_SCILAB} | ||
34 | Source: modules\{#MODULE_API_SCILAB}\macros\buildmacros.bat; DestDir: {app}\modules\{#MODULE_API_SCILAB}\macros; Components: {#COMPN_SCILAB} | ||
35 | Source: modules\{#MODULE_API_SCILAB}\macros\cleanmacros.bat; DestDir: {app}\modules\{#MODULE_API_SCILAB}\macros; Components: {#COMPN_SCILAB} | ||
36 | ; | ||
37 | ;Source: modules\{#MODULE_API_SCILAB}\examples\*.*; DestDir: {app}\modules\{#MODULE_API_SCILAB}\examples; Flags: recursesubdirs; Components: {#COMPN_SCILAB} | ||
38 | ; | ||
39 | Source: modules\{#MODULE_API_SCILAB}\help\addchapter.sce; DestDir: {app}\modules\{#MODULE_API_SCILAB}\help; Flags: recursesubdirs; Components: {#COMPN_SCILAB} | ||
40 | ; | ||
41 | ;Source: modules\{#MODULE_API_SCILAB}\tests\*.*; DestDir: {app}\modules\{#MODULE_API_SCILAB}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS} | ||
42 | ; | ||
43 | ;-------------------------------------------------------------------------------------------------------------- | ||
diff --git a/scilab/modules/api_scilab/api_scilab.vcproj b/scilab/modules/api_scilab/api_scilab.vcproj new file mode 100644 index 0000000..998b7c7 --- /dev/null +++ b/scilab/modules/api_scilab/api_scilab.vcproj | |||
@@ -0,0 +1,546 @@ | |||
1 | <?xml version="1.0" encoding="Windows-1252"?> | ||
2 | <VisualStudioProject | ||
3 | ProjectType="Visual C++" | ||
4 | Version="9,00" | ||
5 | Name="api_scilab" | ||
6 | ProjectGUID="{43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}" | ||
7 | RootNamespace="api_scilab" | ||
8 | Keyword="Win32Proj" | ||
9 | > | ||
10 | <Platforms> | ||
11 | <Platform | ||
12 | Name="Win32" | ||
13 | /> | ||
14 | <Platform | ||
15 | Name="x64" | ||
16 | /> | ||
17 | </Platforms> | ||
18 | <ToolFiles> | ||
19 | </ToolFiles> | ||
20 | <Configurations> | ||
21 | <Configuration | ||
22 | Name="Debug|Win32" | ||
23 | OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
24 | IntermediateDirectory="$(ConfigurationName)" | ||
25 | ConfigurationType="2" | ||
26 | CharacterSet="2" | ||
27 | > | ||
28 | <Tool | ||
29 | Name="VCPreBuildEventTool" | ||
30 | /> | ||
31 | <Tool | ||
32 | Name="VCCustomBuildTool" | ||
33 | /> | ||
34 | <Tool | ||
35 | Name="VCXMLDataGeneratorTool" | ||
36 | /> | ||
37 | <Tool | ||
38 | Name="VCWebServiceProxyGeneratorTool" | ||
39 | /> | ||
40 | <Tool | ||
41 | Name="VCMIDLTool" | ||
42 | /> | ||
43 | <Tool | ||
44 | Name="VCCLCompilerTool" | ||
45 | Optimization="0" | ||
46 | AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes" | ||
47 | PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE" | ||
48 | MinimalRebuild="true" | ||
49 | BasicRuntimeChecks="0" | ||
50 | RuntimeLibrary="3" | ||
51 | UsePrecompiledHeader="0" | ||
52 | WarningLevel="3" | ||
53 | Detect64BitPortabilityProblems="false" | ||
54 | DebugInformationFormat="3" | ||
55 | /> | ||
56 | <Tool | ||
57 | Name="VCManagedResourceCompilerTool" | ||
58 | /> | ||
59 | <Tool | ||
60 | Name="VCResourceCompilerTool" | ||
61 | /> | ||
62 | <Tool | ||
63 | Name="VCPreLinkEventTool" | ||
64 | Description="Make dependencies" | ||
65 | CommandLine="lib /DEF:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL
" | ||
66 | /> | ||
67 | <Tool | ||
68 | Name="VCLinkerTool" | ||
69 | AdditionalDependencies="LibScilab.lib string.lib" | ||
70 | OutputFile="../../bin/$(ProjectName).dll" | ||
71 | LinkIncremental="1" | ||
72 | ModuleDefinitionFile="" | ||
73 | GenerateDebugInformation="true" | ||
74 | SubSystem="2" | ||
75 | RandomizedBaseAddress="1" | ||
76 | DataExecutionPrevention="0" | ||
77 | ImportLibrary="../../bin/$(ProjectName).lib" | ||
78 | TargetMachine="1" | ||
79 | CLRUnmanagedCodeCheck="true" | ||
80 | /> | ||
81 | <Tool | ||
82 | Name="VCALinkTool" | ||
83 | /> | ||
84 | <Tool | ||
85 | Name="VCManifestTool" | ||
86 | /> | ||
87 | <Tool | ||
88 | Name="VCXDCMakeTool" | ||
89 | /> | ||
90 | <Tool | ||
91 | Name="VCBscMakeTool" | ||
92 | /> | ||
93 | <Tool | ||
94 | Name="VCFxCopTool" | ||
95 | /> | ||
96 | <Tool | ||
97 | Name="VCAppVerifierTool" | ||
98 | /> | ||
99 | <Tool | ||
100 | Name="VCPostBuildEventTool" | ||
101 | /> | ||
102 | </Configuration> | ||
103 | <Configuration | ||
104 | Name="Debug|x64" | ||
105 | OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
106 | IntermediateDirectory="$(ConfigurationName)" | ||
107 | ConfigurationType="2" | ||
108 | CharacterSet="2" | ||
109 | > | ||
110 | <Tool | ||
111 | Name="VCPreBuildEventTool" | ||
112 | /> | ||
113 | <Tool | ||
114 | Name="VCCustomBuildTool" | ||
115 | /> | ||
116 | <Tool | ||
117 | Name="VCXMLDataGeneratorTool" | ||
118 | /> | ||
119 | <Tool | ||
120 | Name="VCWebServiceProxyGeneratorTool" | ||
121 | /> | ||
122 | <Tool | ||
123 | Name="VCMIDLTool" | ||
124 | TargetEnvironment="3" | ||
125 | /> | ||
126 | <Tool | ||
127 | Name="VCCLCompilerTool" | ||
128 | Optimization="0" | ||
129 | AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes" | ||
130 | PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE" | ||
131 | MinimalRebuild="true" | ||
132 | BasicRuntimeChecks="0" | ||
133 | RuntimeLibrary="3" | ||
134 | UsePrecompiledHeader="0" | ||
135 | WarningLevel="3" | ||
136 | Detect64BitPortabilityProblems="false" | ||
137 | DebugInformationFormat="3" | ||
138 | /> | ||
139 | <Tool | ||
140 | Name="VCManagedResourceCompilerTool" | ||
141 | /> | ||
142 | <Tool | ||
143 | Name="VCResourceCompilerTool" | ||
144 | /> | ||
145 | <Tool | ||
146 | Name="VCPreLinkEventTool" | ||
147 | Description="Make dependencies" | ||
148 | CommandLine="lib /DEF:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL
" | ||
149 | /> | ||
150 | <Tool | ||
151 | Name="VCLinkerTool" | ||
152 | AdditionalDependencies="LibScilab.lib string.lib" | ||
153 | OutputFile="../../bin/$(ProjectName).dll" | ||
154 | LinkIncremental="1" | ||
155 | ModuleDefinitionFile="" | ||
156 | GenerateDebugInformation="true" | ||
157 | SubSystem="2" | ||
158 | RandomizedBaseAddress="1" | ||
159 | DataExecutionPrevention="0" | ||
160 | ImportLibrary="../../bin/$(ProjectName).lib" | ||
161 | TargetMachine="17" | ||
162 | CLRUnmanagedCodeCheck="true" | ||
163 | /> | ||
164 | <Tool | ||
165 | Name="VCALinkTool" | ||
166 | /> | ||
167 | <Tool | ||
168 | Name="VCManifestTool" | ||
169 | /> | ||
170 | <Tool | ||
171 | Name="VCXDCMakeTool" | ||
172 | /> | ||
173 | <Tool | ||
174 | Name="VCBscMakeTool" | ||
175 | /> | ||
176 | <Tool | ||
177 | Name="VCFxCopTool" | ||
178 | /> | ||
179 | <Tool | ||
180 | Name="VCAppVerifierTool" | ||
181 | /> | ||
182 | <Tool | ||
183 | Name="VCPostBuildEventTool" | ||
184 | /> | ||
185 | </Configuration> | ||
186 | <Configuration | ||
187 | Name="Release|Win32" | ||
188 | OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
189 | IntermediateDirectory="$(ConfigurationName)" | ||
190 | ConfigurationType="2" | ||
191 | CharacterSet="2" | ||
192 | WholeProgramOptimization="0" | ||
193 | > | ||
194 | <Tool | ||
195 | Name="VCPreBuildEventTool" | ||
196 | /> | ||
197 | <Tool | ||
198 | Name="VCCustomBuildTool" | ||
199 | /> | ||
200 | <Tool | ||
201 | Name="VCXMLDataGeneratorTool" | ||
202 | /> | ||
203 | <Tool | ||
204 | Name="VCWebServiceProxyGeneratorTool" | ||
205 | /> | ||
206 | <Tool | ||
207 | Name="VCMIDLTool" | ||
208 | /> | ||
209 | <Tool | ||
210 | Name="VCCLCompilerTool" | ||
211 | InlineFunctionExpansion="1" | ||
212 | FavorSizeOrSpeed="1" | ||
213 | WholeProgramOptimization="false" | ||
214 | AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes" | ||
215 | PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE" | ||
216 | StringPooling="true" | ||
217 | RuntimeLibrary="2" | ||
218 | EnableFunctionLevelLinking="true" | ||
219 | EnableEnhancedInstructionSet="0" | ||
220 | UsePrecompiledHeader="0" | ||
221 | WarningLevel="3" | ||
222 | Detect64BitPortabilityProblems="false" | ||
223 | DebugInformationFormat="0" | ||
224 | /> | ||
225 | <Tool | ||
226 | Name="VCManagedResourceCompilerTool" | ||
227 | /> | ||
228 | <Tool | ||
229 | Name="VCResourceCompilerTool" | ||
230 | /> | ||
231 | <Tool | ||
232 | Name="VCPreLinkEventTool" | ||
233 | Description="Make dependencies" | ||
234 | CommandLine="lib /DEF:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL
" | ||
235 | /> | ||
236 | <Tool | ||
237 | Name="VCLinkerTool" | ||
238 | AdditionalDependencies="LibScilab.lib string.lib" | ||
239 | OutputFile="../../bin/$(ProjectName).dll" | ||
240 | LinkIncremental="1" | ||
241 | ModuleDefinitionFile="" | ||
242 | GenerateDebugInformation="false" | ||
243 | SubSystem="2" | ||
244 | OptimizeReferences="2" | ||
245 | EnableCOMDATFolding="2" | ||
246 | LinkTimeCodeGeneration="0" | ||
247 | RandomizedBaseAddress="1" | ||
248 | DataExecutionPrevention="0" | ||
249 | ImportLibrary="../../bin/$(ProjectName).lib" | ||
250 | TargetMachine="1" | ||
251 | CLRUnmanagedCodeCheck="true" | ||
252 | /> | ||
253 | <Tool | ||
254 | Name="VCALinkTool" | ||
255 | /> | ||
256 | <Tool | ||
257 | Name="VCManifestTool" | ||
258 | /> | ||
259 | <Tool | ||
260 | Name="VCXDCMakeTool" | ||
261 | /> | ||
262 | <Tool | ||
263 | Name="VCBscMakeTool" | ||
264 | /> | ||
265 | <Tool | ||
266 | Name="VCFxCopTool" | ||
267 | /> | ||
268 | <Tool | ||
269 | Name="VCAppVerifierTool" | ||
270 | /> | ||
271 | <Tool | ||
272 | Name="VCPostBuildEventTool" | ||
273 | /> | ||
274 | </Configuration> | ||
275 | <Configuration | ||
276 | Name="Release|x64" | ||
277 | OutputDirectory="$(SolutionDir)$(ConfigurationName)" | ||
278 | IntermediateDirectory="$(ConfigurationName)" | ||
279 | ConfigurationType="2" | ||
280 | CharacterSet="2" | ||
281 | WholeProgramOptimization="0" | ||
282 | > | ||
283 | <Tool | ||
284 | Name="VCPreBuildEventTool" | ||
285 | /> | ||
286 | <Tool | ||
287 | Name="VCCustomBuildTool" | ||
288 | /> | ||
289 | <Tool | ||
290 | Name="VCXMLDataGeneratorTool" | ||
291 | /> | ||
292 | <Tool | ||
293 | Name="VCWebServiceProxyGeneratorTool" | ||
294 | /> | ||
295 | <Tool | ||
296 | Name="VCMIDLTool" | ||
297 | TargetEnvironment="3" | ||
298 | /> | ||
299 | <Tool | ||
300 | Name="VCCLCompilerTool" | ||
301 | InlineFunctionExpansion="1" | ||
302 | FavorSizeOrSpeed="1" | ||
303 | WholeProgramOptimization="false" | ||
304 | AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes" | ||
305 | PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE" | ||
306 | StringPooling="true" | ||
307 | RuntimeLibrary="2" | ||
308 | EnableFunctionLevelLinking="true" | ||
309 | EnableEnhancedInstructionSet="0" | ||
310 | UsePrecompiledHeader="0" | ||
311 | WarningLevel="3" | ||
312 | Detect64BitPortabilityProblems="false" | ||
313 | DebugInformationFormat="0" | ||
314 | /> | ||
315 | <Tool | ||
316 | Name="VCManagedResourceCompilerTool" | ||
317 | /> | ||
318 | <Tool | ||
319 | Name="VCResourceCompilerTool" | ||
320 | /> | ||
321 | <Tool | ||
322 | Name="VCPreLinkEventTool" | ||
323 | Description="Make dependencies" | ||
324 | CommandLine="lib /DEF:"$(InputDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)LibScilab.lib" 1>NUL 2>NUL
lib /DEF:"$(InputDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(InputDir)string.lib" 1>NUL 2>NUL
" | ||
325 | /> | ||
326 | <Tool | ||
327 | Name="VCLinkerTool" | ||
328 | AdditionalDependencies="LibScilab.lib string.lib" | ||
329 | OutputFile="../../bin/$(ProjectName).dll" | ||
330 | LinkIncremental="1" | ||
331 | ModuleDefinitionFile="" | ||
332 | GenerateDebugInformation="false" | ||
333 | SubSystem="2" | ||
334 | OptimizeReferences="2" | ||
335 | EnableCOMDATFolding="2" | ||
336 | LinkTimeCodeGeneration="0" | ||
337 | RandomizedBaseAddress="1" | ||
338 | DataExecutionPrevention="0" | ||
339 | ImportLibrary="../../bin/$(ProjectName).lib" | ||
340 | TargetMachine="17" | ||
341 | CLRUnmanagedCodeCheck="true" | ||
342 | /> | ||
343 | <Tool | ||
344 | Name="VCALinkTool" | ||
345 | /> | ||
346 | <Tool | ||
347 | Name="VCManifestTool" | ||
348 | /> | ||
349 | <Tool | ||
350 | Name="VCXDCMakeTool" | ||
351 | /> | ||
352 | <Tool | ||
353 | Name="VCBscMakeTool" | ||
354 | /> | ||
355 | <Tool | ||
356 | Name="VCFxCopTool" | ||
357 | /> | ||
358 | <Tool | ||
359 | Name="VCAppVerifierTool" | ||
360 | /> | ||
361 | <Tool | ||
362 | Name="VCPostBuildEventTool" | ||
363 | /> | ||
364 | </Configuration> | ||
365 | </Configurations> | ||
366 | <References> | ||
367 | </References> | ||
368 | <Files> | ||
369 | <Filter | ||
370 | Name="Source Files" | ||
371 | Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" | ||
372 | UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" | ||
373 | > | ||
374 | <File | ||
375 | RelativePath=".\src\c\api_boolean.c" | ||
376 | > | ||
377 | </File> | ||
378 | <File | ||
379 | RelativePath=".\src\c\api_boolean_sparse.c" | ||
380 | > | ||
381 | </File> | ||
382 | <File | ||
383 | RelativePath=".\src\c\api_common.c" | ||
384 | > | ||
385 | </File> | ||
386 | <File | ||
387 | RelativePath=".\src\c\api_double.c" | ||
388 | > | ||
389 | </File> | ||
390 | <File | ||
391 | RelativePath=".\src\c\api_int.c" | ||
392 | > | ||
393 | </File> | ||
394 | <File | ||
395 | RelativePath=".\src\c\api_list.c" | ||
396 | > | ||
397 | </File> | ||
398 | <File | ||
399 | RelativePath=".\src\c\api_poly.c" | ||
400 | > | ||
401 | </File> | ||
402 | <File | ||
403 | RelativePath=".\src\c\api_sparse.c" | ||
404 | > | ||
405 | </File> | ||
406 | <File | ||
407 | RelativePath=".\src\c\api_string.c" | ||
408 | > | ||
409 | </File> | ||
410 | <File | ||
411 | RelativePath=".\src\c\DllmainApi_scilab.c" | ||
412 | > | ||
413 | </File> | ||
414 | </Filter> | ||
415 | <Filter | ||
416 | Name="Header Files" | ||
417 | Filter="h;hpp;hxx;hm;inl;inc;xsd" | ||
418 | UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" | ||
419 | > | ||
420 | <File | ||
421 | RelativePath=".\includes\api_boolean.h" | ||
422 | > | ||
423 | </File> | ||
424 | <File | ||
425 | RelativePath=".\includes\api_boolean_sparse.h" | ||
426 | > | ||
427 | </File> | ||
428 | <File | ||
429 | RelativePath=".\includes\api_common.h" | ||
430 | > | ||
431 | </File> | ||
432 | <File | ||
433 | RelativePath=".\includes\api_double.h" | ||
434 | > | ||
435 | </File> | ||
436 | <File | ||
437 | RelativePath=".\includes\api_int.h" | ||
438 | > | ||
439 | </File> | ||
440 | <File | ||
441 | RelativePath=".\src\c\api_internal_boolean.h" | ||
442 | > | ||
443 | </File> | ||
444 | <File | ||
445 | RelativePath=".\src\c\api_internal_boolean_sparse.h" | ||
446 | > | ||
447 | </File> | ||
448 | <File | ||
449 | RelativePath=".\src\c\api_internal_common.h" | ||
450 | > | ||
451 | </File> | ||
452 | <File | ||
453 | RelativePath=".\src\c\api_internal_double.h" | ||
454 | > | ||
455 | </File> | ||
456 | <File | ||
457 | RelativePath=".\src\c\api_internal_int.h" | ||
458 | > | ||
459 | </File> | ||
460 | <File | ||
461 | RelativePath=".\src\c\api_internal_poly.h" | ||
462 | > | ||
463 | </File> | ||
464 | <File | ||
465 | RelativePath=".\src\c\api_internal_sparse.h" | ||
466 | > | ||
467 | </File> | ||
468 | <File | ||
469 | RelativePath=".\src\c\api_internal_string.h" | ||
470 | > | ||
471 | </File> | ||
472 | <File | ||
473 | RelativePath=".\includes\api_list.h" | ||
474 | > | ||
475 | </File> | ||
476 | <File | ||
477 | RelativePath=".\includes\api_poly.h" | ||
478 | > | ||
479 | </File> | ||
480 | <File | ||
481 | RelativePath=".\includes\api_sparse.h" | ||
482 | > | ||
483 | </File> | ||
484 | <File | ||
485 | RelativePath=".\includes\api_string.h" | ||
486 | > | ||
487 | </File> | ||
488 | <File | ||
489 | RelativePath=".\includes\api_variable.h" | ||
490 | > | ||
491 | </File> | ||
492 | <File | ||
493 | RelativePath=".\includes\dynlib_api_scilab.h" | ||
494 | > | ||
495 | </File> | ||
496 | <File | ||
497 | RelativePath=".\src\c\resource.h" | ||
498 | > | ||
499 | </File> | ||
500 | </Filter> | ||
501 | <Filter | ||
502 | Name="Resource Files" | ||
503 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" | ||
504 | UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" | ||
505 | > | ||
506 | <File | ||
507 | RelativePath=".\src\c\api_scilab.rc" | ||
508 | > | ||
509 | </File> | ||
510 | </Filter> | ||
511 | <Filter | ||
512 | Name="localization" | ||
513 | > | ||
514 | </Filter> | ||
515 | <Filter | ||
516 | Name="Libraries Dependencies" | ||
517 | > | ||
518 | <Filter | ||
519 | Name="Imports" | ||
520 | > | ||
521 | <File | ||
522 | RelativePath=".\LibScilab_Import.def" | ||
523 | > | ||
524 | </File> | ||
525 | </Filter> | ||
526 | </Filter> | ||
527 | <File | ||
528 | RelativePath=".\api_scilab.iss" | ||
529 | > | ||
530 | </File> | ||
531 | <File | ||
532 | RelativePath="..\..\bin\blasplus.lib" | ||
533 | > | ||
534 | </File> | ||
535 | <File | ||
536 | RelativePath=".\Makefile.am" | ||
537 | > | ||
538 | </File> | ||
539 | <File | ||
540 | RelativePath=".\version.xml" | ||
541 | > | ||
542 | </File> | ||
543 | </Files> | ||
544 | <Globals> | ||
545 | </Globals> | ||
546 | </VisualStudioProject> | ||
diff --git a/scilab/modules/api_scilab/changelog.txt b/scilab/modules/api_scilab/changelog.txt new file mode 100644 index 0000000..1f964ad --- /dev/null +++ b/scilab/modules/api_scilab/changelog.txt | |||
@@ -0,0 +1,8 @@ | |||
1 | action_binding (0.1-1) stable; urgency=medium | ||
2 | |||
3 | * First version of the module | ||
4 | -- Vincent COUVERT Wed, 24 Oct 2007 15:46:08D +0200 | ||
5 | |||
6 | * Based on module_skeleton | ||
7 | -- Sylvestre Ledru Tue, 13 Mar 2007 13:37:08D +0200 | ||
8 | -- Allan CORNET Sun, 13 30 2007 13:37:08D +0200 | ||
diff --git a/scilab/modules/scilab2fortran/etc/scilab2fortran.quit b/scilab/modules/api_scilab/etc/api_scilab.quit index 27eab9d..b4daad0 100644 --- a/scilab/modules/scilab2fortran/etc/scilab2fortran.quit +++ b/scilab/modules/api_scilab/etc/api_scilab.quit | |||
@@ -1,5 +1,5 @@ | |||
1 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 1 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
2 | // Copyright (C) 2006-2008 - INRIA | 2 | // Copyright (C) 2009 - DIGITEO - Allan CORNET |
3 | // | 3 | // |
4 | // This file must be used under the terms of the CeCILL. | 4 | // This file must be used under the terms of the CeCILL. |
5 | // This source file is licensed as described in the file COPYING, which | 5 | // This source file is licensed as described in the file COPYING, which |
@@ -10,8 +10,8 @@ | |||
10 | 10 | ||
11 | // ==================================================================== | 11 | // ==================================================================== |
12 | // This file contains command to be executed at the end | 12 | // This file contains command to be executed at the end |
13 | // of a scilab session for scilab2fortran module | 13 | // of a scilab session for api_scilab module |
14 | // ==================================================================== | 14 | // ==================================================================== |
15 | // delete help chapter | 15 | // delete help chapter |
16 | del_help_chapter('scilab2fortran',%T); | 16 | del_help_chapter('api_scilab',%T); |
17 | // ==================================================================== | 17 | // ==================================================================== \ No newline at end of file |
diff --git a/scilab/modules/scilab2fortran/etc/scilab2fortran.start b/scilab/modules/api_scilab/etc/api_scilab.start index cf930fd..3b073cd 100644 --- a/scilab/modules/scilab2fortran/etc/scilab2fortran.start +++ b/scilab/modules/api_scilab/etc/api_scilab.start | |||
@@ -1,5 +1,5 @@ | |||
1 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 1 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
2 | // Copyright (C) 2006-2008 - INRIA | 2 | // Copyright (C) 2009 - DIGITEO - Allan CORNET |
3 | // | 3 | // |
4 | // This file must be used under the terms of the CeCILL. | 4 | // This file must be used under the terms of the CeCILL. |
5 | // This source file is licensed as described in the file COPYING, which | 5 | // This source file is licensed as described in the file COPYING, which |
@@ -7,13 +7,13 @@ | |||
7 | // are also available at | 7 | // are also available at |
8 | // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt | 8 | // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt |
9 | 9 | ||
10 | |||
10 | // ==================================================================== | 11 | // ==================================================================== |
11 | // scilab2fortran module initialisation file | 12 | // api_scilab module initialisation file |
12 | // ==================================================================== | 13 | // ==================================================================== |
13 | |||
14 | //Load functions libraries | 14 | //Load functions libraries |
15 | load('SCI/modules/scilab2fortran/macros/lib'); | 15 | //load('SCI/modules/api_scilab/macros/lib'); |
16 | 16 | // ==================================================================== | |
17 | //add help chapter | 17 | //add help chapter |
18 | add_module_help_chapter('scilab2fortran'); | 18 | add_module_help_chapter('api_scilab'); |
19 | 19 | // ==================================================================== | |
diff --git a/scilab/modules/scilab2fortran/help/pt_BR/addchapter.sce b/scilab/modules/api_scilab/help/en_US/addchapter.sce index 0532150..b2fcaf6 100644 --- a/scilab/modules/scilab2fortran/help/pt_BR/addchapter.sce +++ b/scilab/modules/api_scilab/help/en_US/addchapter.sce | |||
@@ -1,5 +1,5 @@ | |||
1 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 1 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
2 | // Copyright (C) 2009 - DIGITEO | 2 | // Copyright (C) 2009 - DIGITEO - Allan CORNET |
3 | // | 3 | // |
4 | // This file must be used under the terms of the CeCILL. | 4 | // This file must be used under the terms of the CeCILL. |
5 | // This source file is licensed as described in the file COPYING, which | 5 | // This source file is licensed as described in the file COPYING, which |
@@ -7,6 +7,6 @@ | |||
7 | // are also available at | 7 | // are also available at |
8 | // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt | 8 | // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt |
9 | 9 | ||
10 | path = SCI+"/modules/scilab2fortran/help/pt_BR"; | 10 | path = SCI+"/modules/api_scilab/help/en_US"; |
11 | add_help_chapter("Conversão Scilab-Fortran",path,%T); | 11 | add_help_chapter("API Scilab",path,%T); |
12 | clear path add_help_chapter; | 12 | clear path add_help_chapter; |
diff --git a/scilab/modules/api_scilab/help/en_US/double_writing_api.xml b/scilab/modules/api_scilab/help/en_US/double_writing_api.xml new file mode 100644 index 0000000..1cd42ea --- /dev/null +++ b/scilab/modules/api_scilab/help/en_US/double_writing_api.xml | |||
@@ -0,0 +1,254 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <!-- | ||
3 | * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | ||
4 | * Copyright (C) 2009 - DIGITEO - Antoine ELIAS | ||
5 | * | ||
6 | * This file must be used under the terms of the CeCILL. | ||
7 | * This source file is licensed as described in the file COPYING, which | ||
8 | * you should have received as part of this distribution. The terms | ||
9 | * are also available at | ||
10 | * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt | ||
11 | * | ||
12 | --> | ||
13 | <refentry version="5.0-subset Scilab" xml:id="Double management writing_API" | ||
14 | xml:lang="en" xmlns="http://docbook.org/ns/docbook" | ||
15 | xmlns:xlink="http://www.w3.org/1999/xlink" | ||
16 | xmlns:svg="http://www.w3.org/2000/svg" | ||
17 | xmlns:ns5="http://www.w3.org/1999/xhtml" | ||
18 | xmlns:mml="http://www.w3.org/1998/Math/MathML" | ||
19 | xmlns:db="http://docbook.org/ns/docbook"> | ||
20 | |||
21 | <refnamediv> | ||
22 | <refname>Double writing</refname> | ||
23 | |||
24 | <refpurpose> | ||
25 | How to write matrices of doubles in a gateway. | ||
26 | </refpurpose> | ||
27 | </refnamediv> | ||
28 | <refsection> | ||
29 | <title>Description</title> | ||
30 | <para>This help describes how matrix of doubles can be handled through the Scilab API.</para> | ||
31 | <para>There are 2 types of functions which can be used to write in the memory of Scilab.</para> | ||
32 | </refsection> | ||
33 | <refsection> | ||
34 | <title>Create from existing data</title> | ||
35 | <synopsis>int createMatrixOfDouble(int _iVar, int _iRows, int _iCols, double* _pdblReal)</synopsis> | ||
36 | <synopsis>int createComplexMatrixOfDouble(int _iVar, int _iRows, int _iCols, double* _pdblReal, double* _pdblImg)</synopsis> | ||
37 | </refsection> | ||
38 | <refsection> | ||
39 | <title>Parameters</title> | ||
40 | |||
41 | <variablelist> | ||
42 | <varlistentry> | ||
43 | <term>_iVar</term> | ||
44 | <listitem> | ||
45 | <para> | ||
46 | Position in the Scilab memory where you want to put the variable | ||
47 | </para> | ||
48 | </listitem> | ||
49 | </varlistentry> | ||
50 | |||
51 | <varlistentry> | ||
52 | <term>_iRows</term> | ||
53 | <listitem> | ||
54 | <para> | ||
55 | Number of rows of the new variable | ||
56 | </para> | ||
57 | </listitem> | ||
58 | </varlistentry> | ||
59 | |||
60 | <varlistentry> | ||
61 | <term>_iCols</term> | ||
62 | <listitem> | ||
63 | <para> | ||
64 | Numbers of columns of the new variable | ||
65 | </para> | ||
66 | </listitem> | ||
67 | </varlistentry> | ||
68 | |||
69 | <varlistentry> | ||
70 | <term>_pdblReal</term> | ||
71 | <listitem> | ||
72 | <para> | ||
73 | Address of real data array (size: _iCols * _iRows) | ||
74 | </para> | ||
75 | </listitem> | ||
76 | </varlistentry> | ||
77 | |||
78 | <varlistentry> | ||
79 | <term>_pdblImg</term> | ||
80 | <listitem> | ||
81 | <para> | ||
82 | Address of imaginary data array (size: _iCols * _iRows) | ||
83 | </para> | ||
84 | </listitem> | ||
85 | </varlistentry> | ||
86 | |||
87 | </variablelist> | ||
88 | </refsection> | ||
89 | <refsection> | ||
90 | <title>Write directly in Scilab memory</title> | ||
91 | <synopsis>int allocMatrixOfDouble(int _iVar, int _iRows, int _iCols, double** _pdblReal)</synopsis> | ||
92 | <synopsis>int allocComplexMatrixOfDouble(int _iVar, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg)</synopsis> | ||
93 | </refsection> | ||
94 | <refsection> | ||
95 | <title>Parameters</title> | ||
96 | |||
97 | <variablelist> | ||
98 | <varlistentry> | ||
99 | <term>_iVar</term> | ||
100 | <listitem> | ||
101 | <para> | ||
102 | Position in the Scilab memory where you want to put the variable | ||
103 | </para> | ||
104 | </listitem> | ||
105 | </varlistentry> | ||
106 | |||
107 | <varlistentry> | ||
108 | <term>_iRows</term> | ||
109 | <listitem> | ||
110 | <para> | ||
111 | Number of rows of the new variable | ||
112 | </para> | ||
113 | </listitem> | ||
114 | </varlistentry> | ||
115 | |||
116 | <varlistentry> | ||
117 | <term>_iCols</term> | ||
118 | <listitem> | ||
119 | <para> | ||
120 | Numbers of columns of the new variable | ||
121 | </para> | ||
122 | </listitem> | ||
123 | </varlistentry> | ||
124 | |||
125 | <varlistentry> | ||
126 | <term>_pdblReal</term> | ||
127 | <listitem> | ||
128 | <para> | ||
129 | Returns address of real data array (size: _iCols * _iRows) | ||
130 | </para> | ||
131 | </listitem> | ||
132 | </varlistentry> | ||
133 | |||
134 | <varlistentry> | ||
135 | <term>_pdblImg</term> | ||
136 | <listitem> | ||
137 | <para> | ||
138 | Returns address of imaginary data array (size: _iCols * _iRows) | ||
139 | </para> | ||
140 | </listitem> | ||
141 | </varlistentry> | ||
142 | |||
143 | </variablelist> | ||
144 | </refsection> | ||
145 | |||
146 | <refsection> | ||
147 | <!--File_gateway: SCI/modules/core/tests/unit_tests/double_writing_api.c--> | ||
148 | <!--File_scilab: SCI/modules/core/tests/unit_tests/double_writing_api.tst--> | ||
149 | <!--Lib_name: double_writing--> | ||
150 | <!--Func_list: write_double--> | ||
151 | <title>Gateway Source</title> | ||
152 | <programlisting role="code gateway"> | ||
153 | <![CDATA[ | ||
154 | int write_double(char *fname,unsigned long fname_len) | ||
155 | { | ||
156 | int i,j; | ||
157 | |||
158 | //first variable info : real matrix of double 3 x 4 | ||
159 | int iRows1 = 3; | ||
160 | int iCols1 = 4; | ||
161 | double* pdblReal1 = NULL; | ||
162 | |||
163 | //second variable info : complex matrix of double 4 x 6 | ||
164 | int iRows2 = 4; | ||
165 | int iCols2 = 6; | ||
166 | double* pdblReal2 = NULL; | ||
167 | double* pdblImg2 = NULL; | ||
168 | |||
169 | /************************ | ||
170 | * First variable * | ||
171 | ************************/ | ||
172 | //alloc array of data in OS memory | ||
173 | pdblReal1 = (double*)malloc(sizeof(double) * iRows1 * iCols1); | ||
174 | |||
175 | //fill array with incremental values | ||
176 | //[ 0 1 2 3 | ||
177 | // 4 5 6 7 | ||
178 | // 8 9 10 11] | ||
179 | for(i = 0 ; i < iRows1 ; i++) | ||
180 | { | ||
181 | for(j = 0 ; j < iCols1 ; j++) | ||
182 | { | ||
183 | pdblReal1[i + iRows1 * j] = i * iCols1 + j; | ||
184 | } | ||
185 | } | ||
186 | //can be written in a single loop | ||
187 | //for(i = 0 ; i < iRows1 * iCols1; i++) | ||
188 | //{ | ||
189 | // pdblReal1[i] = i; | ||
190 | //} | ||
191 | |||
192 | //create a variable from a existing data array | ||
193 | createMatrixOfDouble(Rhs + 1, iRows1, iCols1, pdblReal1); | ||
194 | |||
195 | //after creation, we can free memory. | ||
196 | free(pdblReal1); | ||
197 | /************************* | ||
198 | * Second variable * | ||
199 | *************************/ | ||
200 | |||
201 | //reserve space in scilab memory and fill it | ||
202 | allocComplexMatrixOfDouble(Rhs + 2, iRows2, iCols2, &pdblReal2, &pdblImg2); | ||
203 | |||
204 | //fill array with incremental values for real part and decremental for imaginary part | ||
205 | //[ 23i 1+22i 2+21i 3+20i 4+19i 5+18i | ||
206 | // 6+17i 7+16i 8+15i 9+14i 10+13i 11+12i | ||
207 | // 12+11i 13+10i 14+9i 15+8i 16+7i 17+6i | ||
208 | // 18+5i 19+4i 20+3i 21+2i 22+1i 23 ] | ||
209 | for(i = 0 ; i < iRows2 ; i++) | ||
210 | { | ||
211 | for(j = 0 ; j < iCols2 ; j++) | ||
212 | { | ||
213 | pdblReal2[i + iRows2 * j] = i * iCols2 + j; | ||
214 | pdblImg2 [i + iRows2 * j] = (iRows2 * iCols2 - 1) - (i * iCols2 + j); | ||
215 | } | ||
216 | } | ||
217 | //can be written in a single loop | ||
218 | //for(i = 0 ; i < iRows2 * iCols2; i++) | ||
219 | //{ | ||
220 | // pdblReal2[i] = i; | ||
221 | // pdblImg2 [i] = (iRows2 * iCols2 - 1) - i; | ||
222 | //} | ||
223 | |||
224 | // /!\ DO NOT FREE MEMORY, in this case, it's the Scilab memory | ||
225 | |||
226 | |||
227 | //assign allocated variables to Lhs position | ||
228 | LhsVar(1) = Rhs + 1; | ||
229 | LhsVar(2) = Rhs + 2; | ||
230 | PutLhsVar(); | ||
231 | return 0; | ||
232 | } | ||
233 | ]]> | ||
234 | </programlisting> | ||
235 | </refsection> | ||
236 | |||
237 | <refsection> | ||
238 | <title>Scilab test script</title> | ||
239 | <programlisting role="code_scilab"> | ||
240 | <![CDATA[ | ||
241 | a_ref = [ 0 1 2 3; .. | ||
242 | 4 5 6 7; .. | ||
243 | 8 9 10 11]; | ||
244 | b_ref = [ 23*%i, 1+22*%i, 2+21*%i, 3+20*%i, 4+19*%i, 5+18*%i; .. | ||
245 | 6+17*%i, 7+16*%i, 8+15*%i, 9+14*%i, 10+13*%i, 11+12*%i; .. | ||
246 | 12+11*%i, 13+10*%i, 14+9*%i, 15+8*%i, 16+7*%i, 17+6*%i; .. | ||
247 | 18+5*%i, 19+4*%i, 20+3*%i, 21+2*%i, 22+1*%i, 23]; | ||
248 | [a,b] = write_double(); | ||
249 | if or(a <> a_ref) then error("failed");end | ||
250 | if or(b <>; b_ref) then error("failed");end | ||
251 | ]]> | ||
252 | </programlisting> | ||
253 | </refsection> | ||
254 | </refentry> \ No newline at end of file | ||
diff --git a/scilab/modules/core/includes/api_boolean.h b/scilab/modules/api_scilab/includes/api_boolean.h index 133d9c4..60cc9db 100644 --- a/scilab/modules/core/includes/api_boolean.h +++ b/scilab/modules/api_scilab/includes/api_boolean.h | |||
@@ -12,8 +12,7 @@ | |||
12 | #ifndef __BOOLEAN_API__ | 12 | #ifndef __BOOLEAN_API__ |
13 | #define __BOOLEAN_API__ | 13 | #define __BOOLEAN_API__ |
14 | 14 | ||
15 | #include "machine.h" | 15 | #include "dynlib_api_scilab.h" |
16 | |||
17 | /** | 16 | /** |
18 | * Get boolean variable | 17 | * Get boolean variable |
19 | * @param[in] _piAddress variable address | 18 | * @param[in] _piAddress variable address |
@@ -22,7 +21,7 @@ | |||
22 | * @param[out] _piBool return pointer on data | 21 | * @param[out] _piBool return pointer on data |
23 | * @return if the operation successed (0) or not ( !0 ) | 22 | * @return if the operation successed (0) or not ( !0 ) |
24 | */ | 23 | */ |
25 | int getMatrixOfBoolean(int* _piAddress, int* _piRows, int* _piCols, int** _piBool); | 24 | API_SCILAB_IMPEXP int getMatrixOfBoolean(int* _piAddress, int* _piRows, int* _piCols, int** _piBool); |
26 | 25 | ||
27 | /** | 26 | /** |
28 | * alloc boolean variable | 27 | * alloc boolean variable |
@@ -33,7 +32,7 @@ int getMatrixOfBoolean(int* _piAddress, int* _piRows, int* _piCols, int** _piBoo | |||
33 | * @param[out] _piAddress return pointer on new variable | 32 | * @param[out] _piAddress return pointer on new variable |
34 | * @return if the operation successed (0) or not ( !0 ) | 33 | * @return if the operation successed (0) or not ( !0 ) |
35 | */ | 34 | */ |
36 | int allocMatrixOfBoolean(int _iVar, int _iRows, int _iCols, int** _piBool); | 35 | API_SCILAB_IMPEXP int allocMatrixOfBoolean(int _iVar, int _iRows, int _iCols, int** _piBool); |
37 | 36 | ||
38 | /** | 37 | /** |
39 | * alloc boolean variable | 38 | * alloc boolean variable |
@@ -44,7 +43,7 @@ int allocMatrixOfBoolean(int _iVar, int _iRows, int _iCols, int** _piBool); | |||
44 | * @param[out] _piAddress return pointer on new variable | 43 | * @param[out] _piAddress return pointer on new variable |
45 | * @return if the operation successed (0) or not ( !0 ) | 44 | * @return if the operation successed (0) or not ( !0 ) |
46 | */ | 45 | */ |
47 | int createMatrixOfBoolean(int _iVar, int _iRows, int _iCols, int* _piBool); | 46 | API_SCILAB_IMPEXP int createMatrixOfBoolean(int _iVar, int _iRows, int _iCols, int* _piBool); |
48 | 47 | ||
49 | /** | 48 | /** |
50 | * Create boolean named variable | 49 | * Create boolean named variable |
@@ -54,7 +53,7 @@ int createMatrixOfBoolean(int _iVar, int _iRows, int _iCols, int* _piBool); | |||
54 | * @param[in] _piBool pointer on data | 53 | * @param[in] _piBool pointer on data |
55 | * @return if the operation successed (0) or not ( !0 ) | 54 | * @return if the operation successed (0) or not ( !0 ) |
56 | */ | 55 | */ |
57 | int createNamedMatrixOfBoolean(char* _pstName, int _iRows, int _iCols, int* _piBool); | 56 | API_SCILAB_IMPEXP int createNamedMatrixOfBoolean(char* _pstName, int _iRows, int _iCols, int* _piBool); |
58 | 57 | ||
59 | /** | 58 | /** |
60 | * Read boolean named variable | 59 | * Read boolean named variable |
@@ -64,6 +63,6 @@ int createNamedMatrixOfBoolean(char* _pstName, int _iRows, int _iCols, int* _piB | |||
64 | * @param[out] _piBool return data | 63 | * @param[out] _piBool return data |
65 | * @return if the operation successed (0) or not ( !0 ) | 64 | * @return if the operation successed (0) or not ( !0 ) |
66 | */ | 65 | */ |
67 | int readNamedMatrixOfBoolean(char* _pstName, int* _piRows, int* _piCols, int* _piBool); | 66 | API_SCILAB_IMPEXP int readNamedMatrixOfBoolean(char* _pstName, int* _piRows, int* _piCols, int* _piBool); |
68 | 67 | ||
69 | #endif /* __BOOLEAN_API__ */ | 68 | #endif /* __BOOLEAN_API__ */ |
diff --git a/scilab/modules/core/includes/api_boolean_sparse.h b/scilab/modules/api_scilab/includes/api_boolean_sparse.h index 4285816..bf8df95 100644 --- a/scilab/modules/core/includes/api_boolean_sparse.h +++ b/scilab/modules/api_scilab/includes/api_boolean_sparse.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #ifndef __BOOLEAN_SPARSE_API__ | 12 | #ifndef __BOOLEAN_SPARSE_API__ |
13 | #define __BOOLEAN_SPARSE_API__ | 13 | #define __BOOLEAN_SPARSE_API__ |
14 | 14 | ||
15 | #include "machine.h" | 15 | #include "dynlib_api_scilab.h" |
16 | 16 | ||
17 | /*******************************/ | 17 | /*******************************/ |
18 | /* boolean sparse functions */ | 18 | /* boolean sparse functions */ |
@@ -27,7 +27,7 @@ | |||
27 | * @param[out] _piColPos return array of item column position ( 1 indexed ) | 27 | * @param[out] _piColPos return array of item column position ( 1 indexed ) |
28 | * @return if the operation successed (0) or not ( !0 ) | 28 | * @return if the operation successed (0) or not ( !0 ) |
29 | */ | 29 | */ |
30 | int getBooleanSparseMatrix(int* _piAddress, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos); | 30 | API_SCILAB_IMPEXP int getBooleanSparseMatrix(int* _piAddress, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos); |
31 | 31 | ||
32 | /** | 32 | /** |
33 | * Alloc boolean sparse variable data | 33 | * Alloc boolean sparse variable data |
@@ -37,10 +37,9 @@ int getBooleanSparseMatrix(int* _piAddress, int* _piRows, int* _piCols, int* _pi | |||
37 | * @param[in] _iNbItem Number of item | 37 | * @param[in] _iNbItem Number of item |
38 | * @param[out] _piNbItemRow return array of number of item for each row | 38 | * @param[out] _piNbItemRow return array of number of item for each row |
39 | * @param[out] _piColPos return array of item column position ( 1 indexed ) | 39 | * @param[out] _piColPos return array of item column position ( 1 indexed ) |
40 | * @param[out] _piAddress return pointer on new variable | ||
41 | * @return if the operation successed (0) or not ( !0 ) | 40 | * @return if the operation successed (0) or not ( !0 ) |
42 | */ | 41 | */ |
43 | int allocBooleanSparseMatrix(int _iVar, int _iRows, int _iCols, int _iNbItem, int** _piNbItemRow, int** _piColPos, int** _piAddress); | 42 | API_SCILAB_IMPEXP int allocBooleanSparseMatrix(int _iVar, int _iRows, int _iCols, int _iNbItem, int** _piNbItemRow, int** _piColPos); |
44 | 43 | ||
45 | /** | 44 | /** |
46 | * Create boolean sparse variable | 45 | * Create boolean sparse variable |
@@ -50,10 +49,9 @@ int allocBooleanSparseMatrix(int _iVar, int _iRows, int _iCols, int _iNbItem, in | |||
50 | * @param[in] _iNbItem Number of item | 49 | * @param[in] _iNbItem Number of item |
51 | * @param[in] _piNbItemRow array of number of item for each row | 50 | * @param[in] _piNbItemRow array of number of item for each row |
52 | * @param[in] _piColPos array of item column position ( 1 indexed ) | 51 | * @param[in] _piColPos array of item column position ( 1 indexed ) |
53 | * @param[out] _piAddress return pointer on new variable | ||
54 | * @return if the operation successed (0) or not ( !0 ) | 52 | * @return if the operation successed (0) or not ( !0 ) |
55 | */ | 53 | */ |
56 | int createBooleanSparseMatrix(int _iVar, int _iRows, int _iCols, int _iNbItem, int* _piNbItemRow, int* _piColPos, int** _piAddress); | 54 | API_SCILAB_IMPEXP int createBooleanSparseMatrix(int _iVar, int _iRows, int _iCols, int _iNbItem, int* _piNbItemRow, int* _piColPos); |
57 | 55 | ||
58 | /** | 56 | /** |
59 | * Create named boolean sparse variable | 57 | * Create named boolean sparse variable |
@@ -66,7 +64,7 @@ int createBooleanSparseMatrix(int _iVar, int _iRows, int _iCols, int _iNbItem, i | |||
66 | * @param[out] _piAddress return pointer on new variable | 64 | * @param[out] _piAddress return pointer on new variable |
67 | * @return if the operation successed (0) or not ( !0 ) | 65 | * @return if the operation successed (0) or not ( !0 ) |
68 | */ | 66 | */ |
69 | int createNamedBooleanSparseMatrix(char* _pstName, int _iRows, int _iCols, int _iNbItem, int* _piNbItemRow, int* _piColPos); | 67 | API_SCILAB_IMPEXP int createNamedBooleanSparseMatrix(char* _pstName, int _iRows, int _iCols, int _iNbItem, int* _piNbItemRow, int* _piColPos); |
70 | 68 | ||
71 | /** | 69 | /** |
72 | * Read named boolean sparse variable | 70 | * Read named boolean sparse variable |
@@ -79,6 +77,6 @@ int createNamedBooleanSparseMatrix(char* _pstName, int _iRows, int _iCols, int _ | |||
79 | * @param[out] _piAddress return pointer on new variable | 77 | * @param[out] _piAddress return pointer on new variable |
80 | * @return if the operation successed (0) or not ( !0 ) | 78 | * @return if the operation successed (0) or not ( !0 ) |
81 | */ | 79 | */ |
82 | int readNamedBooleanSparseMatrix(char* _pstName, int* _piRows, int* _piCols, int* _piNbItem, int* _piNbItemRow, int* _piColPos); | 80 | API_SCILAB_IMPEXP int readNamedBooleanSparseMatrix(char* _pstName, int* _piRows, int* _piCols, int* _piNbItem, int* _piNbItemRow, int* _piColPos); |
83 | 81 | ||
84 | #endif /* __BOOLEAN_SPARSE_API__ */ | 82 | #endif /* __BOOLEAN_SPARSE_API__ */ |
diff --git a/scilab/modules/core/includes/api_common.h b/scilab/modules/api_scilab/includes/api_common.h index 30e0dd8..364781c 100644 --- a/scilab/modules/core/includes/api_common.h +++ b/scilab/modules/api_scilab/includes/api_common.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #ifndef __COMMON_API__ | 12 | #ifndef __COMMON_API__ |
13 | #define __COMMON_API__ | 13 | #define __COMMON_API__ |
14 | 14 | ||
15 | #include "machine.h" | 15 | #include "dynlib_api_scilab.h" |
16 | 16 | ||
17 | /* generics functions */ | 17 | /* generics functions */ |
18 | 18 | ||
@@ -22,7 +22,7 @@ | |||
22 | * @param[out] _piAddress return variable address | 22 | * @param[out] _piAddress return variable address |
23 | * @return if the operation successed (0) or not ( !0 ) | 23 | * @return if the operation successed (0) or not ( !0 ) |
24 |