summaryrefslogtreecommitdiffstats
path: root/scilab/modules/dynamic_link
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-03-08 09:28:07 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-03-08 09:28:07 +0100
commit8b7ac05e63459066060daee277f1a41d5b8905d3 (patch)
tree4279ccbffa71e2a0697c866471a0f02e12148c58 /scilab/modules/dynamic_link
parent4c6a4300d0c9a42b71fb8572e6a656ee3bcb3bdf (diff)
downloadscilab-8b7ac05e63459066060daee277f1a41d5b8905d3.zip
scilab-8b7ac05e63459066060daee277f1a41d5b8905d3.tar.gz
MSDOS replaced by getos() == 'Windows'
Diffstat (limited to 'scilab/modules/dynamic_link')
-rw-r--r--scilab/modules/dynamic_link/etc/dynamic_link.start2
-rw-r--r--scilab/modules/dynamic_link/help/en_US/G_make.xml2
-rw-r--r--scilab/modules/dynamic_link/help/en_US/dllinfo.xml2
-rw-r--r--scilab/modules/dynamic_link/macros/G_make.sci2
-rw-r--r--scilab/modules/dynamic_link/macros/configure_lcc.sci2
-rw-r--r--scilab/modules/dynamic_link/macros/configure_msifort.sci2
-rw-r--r--scilab/modules/dynamic_link/macros/configure_msvc.sci2
-rw-r--r--scilab/modules/dynamic_link/macros/detectmsifort64tools.sci2
-rw-r--r--scilab/modules/dynamic_link/macros/detectmsvc64tools.sci2
-rw-r--r--scilab/modules/dynamic_link/macros/dllinfo.sci2
-rw-r--r--scilab/modules/dynamic_link/macros/findlcccompiler.sci2
-rw-r--r--scilab/modules/dynamic_link/macros/findmsifortcompiler.sci4
-rw-r--r--scilab/modules/dynamic_link/macros/findmsvccompiler.sci4
-rw-r--r--scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci2
-rw-r--r--scilab/modules/dynamic_link/macros/haveacompiler.sci2
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_build.sci8
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_compile.sci4
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_for_link.sci4
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_gen_cleaner.sci6
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_gen_loader.sci2
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_mex_build.sci2
-rw-r--r--scilab/modules/dynamic_link/macros/with_lcc.sci2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3532.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3532.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3561.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3561.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_4298.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_4298.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_4548.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_4548.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_4853.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_4853.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_4919.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_4919.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_5138.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_5138.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_5433.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_5484.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_5484.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/G_make.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/G_make.unix.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/G_make.win.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/dllinfo.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/dllinfo.unix.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/dllinfo.win.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.macosx.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.unix.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.win.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_build_f90.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_build_f90.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.macosx.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.unix.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.win.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/link.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/link.encoding.dia.ref2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/link.encoding.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/link.tst2
59 files changed, 68 insertions, 68 deletions
diff --git a/scilab/modules/dynamic_link/etc/dynamic_link.start b/scilab/modules/dynamic_link/etc/dynamic_link.start
index ff4b8ed..e1bbea1 100644
--- a/scilab/modules/dynamic_link/etc/dynamic_link.start
+++ b/scilab/modules/dynamic_link/etc/dynamic_link.start
@@ -12,7 +12,7 @@
12load('SCI/modules/dynamic_link/macros/lib'); 12load('SCI/modules/dynamic_link/macros/lib');
13 13
14// Configure Environment Variables for Ms Visual C ==================== 14// Configure Environment Variables for Ms Visual C ====================
15if MSDOS then 15if getos() == 'Windows' then
16 if (~isdef('WSCI')) then 16 if (~isdef('WSCI')) then
17 WSCI = getlongpathname( pathconvert(SCI, %f, %f, 'w') ); 17 WSCI = getlongpathname( pathconvert(SCI, %f, %f, 'w') );
18 end 18 end
diff --git a/scilab/modules/dynamic_link/help/en_US/G_make.xml b/scilab/modules/dynamic_link/help/en_US/G_make.xml
index 0db5a54..23e4b08 100644
--- a/scilab/modules/dynamic_link/help/en_US/G_make.xml
+++ b/scilab/modules/dynamic_link/help/en_US/G_make.xml
@@ -59,7 +59,7 @@
59 <refsection> 59 <refsection>
60 <title>Examples</title> 60 <title>Examples</title>
61 <programlisting role="example"><![CDATA[ 61 <programlisting role="example"><![CDATA[
62if MSDOS then 62if getos() == 'Windows' then
63 txt = ['ex1c.dll:', 63 txt = ['ex1c.dll:',
64 ' @echo ------------------------------------------', 64 ' @echo ------------------------------------------',
65 ' @echo From Makefile.mak', 65 ' @echo From Makefile.mak',
diff --git a/scilab/modules/dynamic_link/help/en_US/dllinfo.xml b/scilab/modules/dynamic_link/help/en_US/dllinfo.xml
index 112ee1c..cb2d23f 100644
--- a/scilab/modules/dynamic_link/help/en_US/dllinfo.xml
+++ b/scilab/modules/dynamic_link/help/en_US/dllinfo.xml
@@ -84,7 +84,7 @@
84 <title>Examples</title> 84 <title>Examples</title>
85 85
86 <programlisting role="example"><![CDATA[ 86 <programlisting role="example"><![CDATA[
87if MSDOS then 87if getos() == 'Windows' then
88 filename = SCI+'\bin\libscilab.dll'; 88 filename = SCI+'\bin\libscilab.dll';
89 89
90 dllinfolist = dllinfo(filename,'machine'); 90 dllinfolist = dllinfo(filename,'machine');
diff --git a/scilab/modules/dynamic_link/macros/G_make.sci b/scilab/modules/dynamic_link/macros/G_make.sci
index 2186ba5..2fdb26e 100644
--- a/scilab/modules/dynamic_link/macros/G_make.sci
+++ b/scilab/modules/dynamic_link/macros/G_make.sci
@@ -23,7 +23,7 @@ function [res]=G_make(files,objects_or_dll)
23 23
24 msg = ''; 24 msg = '';
25 25
26 if MSDOS then // WINDOWS 26 if getos() == 'Windows' then // WINDOWS
27 27
28 if typeof(objects_or_dll)<>'string' then 28 if typeof(objects_or_dll)<>'string' then
29 error(sprintf(gettext('%s: Wrong type for input argument #%d: String expected.'),'G_make',2)); 29 error(sprintf(gettext('%s: Wrong type for input argument #%d: String expected.'),'G_make',2));
diff --git a/scilab/modules/dynamic_link/macros/configure_lcc.sci b/scilab/modules/dynamic_link/macros/configure_lcc.sci
index 89baade..eb643a9 100644
--- a/scilab/modules/dynamic_link/macros/configure_lcc.sci
+++ b/scilab/modules/dynamic_link/macros/configure_lcc.sci
@@ -11,7 +11,7 @@
11function bOK = configure_lcc() 11function bOK = configure_lcc()
12 bOK = %F; 12 bOK = %F;
13 13
14 if MSDOS then 14 if getos() == 'Windows' then
15 15
16 try 16 try
17 lccincludepath = winqueryreg('HKEY_CURRENT_USER','Software\lcc\compiler','includepath'); 17 lccincludepath = winqueryreg('HKEY_CURRENT_USER','Software\lcc\compiler','includepath');
diff --git a/scilab/modules/dynamic_link/macros/configure_msifort.sci b/scilab/modules/dynamic_link/macros/configure_msifort.sci
index 16316e4..5c12638 100644
--- a/scilab/modules/dynamic_link/macros/configure_msifort.sci
+++ b/scilab/modules/dynamic_link/macros/configure_msifort.sci
@@ -116,7 +116,7 @@ function bOK = set_commons_msi9and10(ifpath,machinepath)
116endfunction 116endfunction
117//========================================== 117//==========================================
118 bOK = %F; 118 bOK = %F;
119 if MSDOS then 119 if getos() == 'Windows' then
120 ifortcompiler = findmsifortcompiler(); 120 ifortcompiler = findmsifortcompiler();
121 if ifortcompiler <> 'unknown' then 121 if ifortcompiler <> 'unknown' then
122 if_path = getIFpath(ifortcompiler); 122 if_path = getIFpath(ifortcompiler);
diff --git a/scilab/modules/dynamic_link/macros/configure_msvc.sci b/scilab/modules/dynamic_link/macros/configure_msvc.sci
index d3fafae..b8bb17e 100644
--- a/scilab/modules/dynamic_link/macros/configure_msvc.sci
+++ b/scilab/modules/dynamic_link/macros/configure_msvc.sci
@@ -576,7 +576,7 @@ function bOK = commons_msvc90_x64(MS_VS_DIRECTORY)
576endfunction 576endfunction
577//========================================== 577//==========================================
578 578
579 if MSDOS then 579 if getos() == 'Windows' then
580 msvc = findmsvccompiler(); 580 msvc = findmsvccompiler();
581 bOK = %F; 581 bOK = %F;
582 582
diff --git a/scilab/modules/dynamic_link/macros/detectmsifort64tools.sci b/scilab/modules/dynamic_link/macros/detectmsifort64tools.sci
index 94bb77e..c13beab 100644
--- a/scilab/modules/dynamic_link/macros/detectmsifort64tools.sci
+++ b/scilab/modules/dynamic_link/macros/detectmsifort64tools.sci
@@ -13,7 +13,7 @@
13function bOK = detectmsifort64tools() 13function bOK = detectmsifort64tools()
14 14
15 bOK = %F; 15 bOK = %F;
16 if MSDOS & win64() then 16 if getos() == 'Windows' & win64() then
17 IFORTPATH = ''; 17 IFORTPATH = '';
18 ifortcomp = findmsifortcompiler(); 18 ifortcomp = findmsifortcompiler();
19 if ifortcomp <> 'unknown' then 19 if ifortcomp <> 'unknown' then
diff --git a/scilab/modules/dynamic_link/macros/detectmsvc64tools.sci b/scilab/modules/dynamic_link/macros/detectmsvc64tools.sci
index 256115b..cf1d42b7 100644
--- a/scilab/modules/dynamic_link/macros/detectmsvc64tools.sci
+++ b/scilab/modules/dynamic_link/macros/detectmsvc64tools.sci
@@ -13,7 +13,7 @@
13function bOK = detectmsvc64tools() 13function bOK = detectmsvc64tools()
14 14
15 bOK = %F; 15 bOK = %F;
16 if MSDOS & win64() then 16 if getos() == 'Windows' & win64() then
17 compiler = findmsvccompiler(); 17 compiler = findmsvccompiler();
18 if ( (compiler == 'msvc90pro') | .. 18 if ( (compiler == 'msvc90pro') | ..
19 (compiler == 'msvc90std') | .. 19 (compiler == 'msvc90std') | ..
diff --git a/scilab/modules/dynamic_link/macros/dllinfo.sci b/scilab/modules/dynamic_link/macros/dllinfo.sci
index 7d0ac54..408af98 100644
--- a/scilab/modules/dynamic_link/macros/dllinfo.sci
+++ b/scilab/modules/dynamic_link/macros/dllinfo.sci
@@ -125,7 +125,7 @@ endfunction
125 125
126 dllinfolist = list(); 126 dllinfolist = list();
127 127
128 if MSDOS then 128 if getos() == 'Windows' then
129 if findmsvccompiler() <> 'unknown' then 129 if findmsvccompiler() <> 'unknown' then
130 if strcmpi(options,'imports')== 0 then 130 if strcmpi(options,'imports')== 0 then
131 dllinfolist = dllinfoimports(dllname); 131 dllinfolist = dllinfoimports(dllname);
diff --git a/scilab/modules/dynamic_link/macros/findlcccompiler.sci b/scilab/modules/dynamic_link/macros/findlcccompiler.sci
index dd3928a..b27af9b 100644
--- a/scilab/modules/dynamic_link/macros/findlcccompiler.sci
+++ b/scilab/modules/dynamic_link/macros/findlcccompiler.sci
@@ -12,7 +12,7 @@
12//========================================== 12//==========================================
13function res = findlcccompiler() 13function res = findlcccompiler()
14 res = %F; 14 res = %F;
15 if MSDOS then 15 if getos() == 'Windows' then
16 try 16 try
17 lccincludepath = winqueryreg('HKEY_CURRENT_USER', .. 17 lccincludepath = winqueryreg('HKEY_CURRENT_USER', ..
18 'Software\lcc\compiler', .. 18 'Software\lcc\compiler', ..
diff --git a/scilab/modules/dynamic_link/macros/findmsifortcompiler.sci b/scilab/modules/dynamic_link/macros/findmsifortcompiler.sci
index 9002a35..b596deb 100644
--- a/scilab/modules/dynamic_link/macros/findmsifortcompiler.sci
+++ b/scilab/modules/dynamic_link/macros/findmsifortcompiler.sci
@@ -13,7 +13,7 @@ function ifortCompiler = findmsifortcompiler()
13 13
14 ifortCompiler='unknown'; // unknown 14 ifortCompiler='unknown'; // unknown
15 15
16 if MSDOS then 16 if getos() == 'Windows' then
17 if getenv('IFORT_COMPILER11','NOK') <> 'NOK' then 17 if getenv('IFORT_COMPILER11','NOK') <> 'NOK' then
18 ifortCompiler='ifort11'; 18 ifortCompiler='ifort11';
19 else 19 else
@@ -25,7 +25,7 @@ function ifortCompiler = findmsifortcompiler()
25 end 25 end
26 end 26 end
27 end 27 end
28 else // NOT MSDOS 28 else // NOT Windows
29 ifortCompiler = 'unknown'; // unknown 29 ifortCompiler = 'unknown'; // unknown
30 end 30 end
31endfunction 31endfunction
diff --git a/scilab/modules/dynamic_link/macros/findmsvccompiler.sci b/scilab/modules/dynamic_link/macros/findmsvccompiler.sci
index c036a33..c5015b7 100644
--- a/scilab/modules/dynamic_link/macros/findmsvccompiler.sci
+++ b/scilab/modules/dynamic_link/macros/findmsvccompiler.sci
@@ -184,7 +184,7 @@ endfunction
184 184
185 MSCompiler='unknown'; // unknown 185 MSCompiler='unknown'; // unknown
186 186
187 if MSDOS then 187 if getos() == 'Windows' then
188 188
189 if is_msvc100express() then 189 if is_msvc100express() then
190 MSCompiler = 'msvc100express'; // Microsoft Visual 2010 Express 190 MSCompiler = 'msvc100express'; // Microsoft Visual 2010 Express
@@ -231,7 +231,7 @@ endfunction
231 return; 231 return;
232 end 232 end
233 233
234 else // NOT MSDOS 234 else // NOT WINDOWS
235 MSCompiler = 'unknown'; // unknown 235 MSCompiler = 'unknown'; // unknown
236 end 236 end
237endfunction 237endfunction
diff --git a/scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci b/scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci
index f4db23a..bd8932f 100644
--- a/scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci
+++ b/scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci
@@ -10,7 +10,7 @@
10 10
11function cmd = gencompilationflags_unix(ldflags, cflags, fflags, cc) 11function cmd = gencompilationflags_unix(ldflags, cflags, fflags, cc)
12 // This function is restricted to Linux/Unix user only 12 // This function is restricted to Linux/Unix user only
13 if MSDOS then 13 if getos() == 'Windows' then
14 error(msprintf(gettext("%s: Feature not available under Microsoft Windows.\n"),'gencompilationflags_unix')); 14 error(msprintf(gettext("%s: Feature not available under Microsoft Windows.\n"),'gencompilationflags_unix'));
15 return; 15 return;
16 end 16 end
diff --git a/scilab/modules/dynamic_link/macros/haveacompiler.sci b/scilab/modules/dynamic_link/macros/haveacompiler.sci
index 51dcf50..422b213 100644
--- a/scilab/modules/dynamic_link/macros/haveacompiler.sci
+++ b/scilab/modules/dynamic_link/macros/haveacompiler.sci
@@ -9,7 +9,7 @@
9 9
10//========================================== 10//==========================================
11function bOK = haveacompiler() 11function bOK = haveacompiler()
12 if MSDOS then 12 if getos() == 'Windows' then
13 bOK = %F; 13 bOK = %F;
14 msvc = findmsvccompiler(); 14 msvc = findmsvccompiler();
15 if ( msvc == 'unknown' ) then 15 if ( msvc == 'unknown' ) then
diff --git a/scilab/modules/dynamic_link/macros/ilib_build.sci b/scilab/modules/dynamic_link/macros/ilib_build.sci
index 3823241..a180c28 100644
--- a/scilab/modules/dynamic_link/macros/ilib_build.sci
+++ b/scilab/modules/dynamic_link/macros/ilib_build.sci
@@ -37,7 +37,7 @@ function ilib_build(ilib_name,table,files,libs,makename,ldflags,cflags,fflags,is
37 error(999,msprintf(_("%s: Wrong size for input argument #%d: A matrix of strings < 999 expected.\n"),'ilib_build',2)); 37 error(999,msprintf(_("%s: Wrong size for input argument #%d: A matrix of strings < 999 expected.\n"),'ilib_build',2));
38 end 38 end
39 39
40 if ~MSDOS & strncpy(ilib_name,3) <> "lib" then 40 if getos() <> 'Windows' & strncpy(ilib_name,3) <> "lib" then
41 // We add a leading lib under Linux/Unix because it is the way 41 // We add a leading lib under Linux/Unix because it is the way
42 ilib_name="lib" + ilib_name; 42 ilib_name="lib" + ilib_name;
43 end 43 end
@@ -49,7 +49,7 @@ function ilib_build(ilib_name,table,files,libs,makename,ldflags,cflags,fflags,is
49 if rhs <= 8 then ismex = %f; end 49 if rhs <= 8 then ismex = %f; end
50 if rhs <= 9 then cc = ''; end 50 if rhs <= 9 then cc = ''; end
51 51
52 if MSDOS then 52 if getos() == 'Windows' then
53 if isdef('makename') then 53 if isdef('makename') then
54 if (makename == []) | (makename == '') then 54 if (makename == []) | (makename == '') then
55 makename = 'makelib'; 55 makename = 'makelib';
@@ -83,14 +83,14 @@ function ilib_build(ilib_name,table,files,libs,makename,ldflags,cflags,fflags,is
83 83
84 // generate a Makefile 84 // generate a Makefile
85 if ( ilib_verbose() <> 0 ) then 85 if ( ilib_verbose() <> 0 ) then
86 if MSDOS 86 if getos() == 'Windows'
87 mprintf(_(" Generate a Makefile: %s\n"),'Makelib'); 87 mprintf(_(" Generate a Makefile: %s\n"),'Makelib');
88 else 88 else
89 mprintf(_(" Generate a Makefile\n")); 89 mprintf(_(" Generate a Makefile\n"));
90 end 90 end
91 end 91 end
92 92
93 if ~MSDOS then // Needs to copy the libfoo.c which contains important stuff 93 if getos() <> 'Windows' then // Needs to copy the libfoo.c which contains important stuff
94 files = files(:)'; 94 files = files(:)';
95 files = [files,ilib_name + '.c']; 95 files = [files,ilib_name + '.c'];
96 end 96 end
diff --git a/scilab/modules/dynamic_link/macros/ilib_compile.sci b/scilab/modules/dynamic_link/macros/ilib_compile.sci
index 4c0346d..058e504 100644
--- a/scilab/modules/dynamic_link/macros/ilib_compile.sci
+++ b/scilab/modules/dynamic_link/macros/ilib_compile.sci
@@ -57,7 +57,7 @@ function libn = ilib_compile(lib_name,makename,files, ..
57 57
58 58
59 // first try to build each file step by step 59 // first try to build each file step by step
60 if MSDOS then 60 if getos() == 'Windows' then
61 //** ----------- Windows section ----------------- 61 //** ----------- Windows section -----------------
62 msgs_make = ''; 62 msgs_make = '';
63 nf = size(files,'*'); 63 nf = size(files,'*');
@@ -194,7 +194,7 @@ function [make_command,lib_name_make,lib_name,path,makename,files] = ilib_compil
194 lib_name = lib_name+getdynlibext(); 194 lib_name = lib_name+getdynlibext();
195 lib_name_make = lib_name; 195 lib_name_make = lib_name;
196 196
197 if MSDOS then // WINDOWS 197 if getos() == 'Windows' then // WINDOWS
198 FILES = []; 198 FILES = [];
199 for x = files(:)' 199 for x = files(:)'
200 [ptmp,ftmp,fext] = fileparts(x); 200 [ptmp,ftmp,fext] = fileparts(x);
diff --git a/scilab/modules/dynamic_link/macros/ilib_for_link.sci b/scilab/modules/dynamic_link/macros/ilib_for_link.sci
index 340fbae..cd916cb 100644
--- a/scilab/modules/dynamic_link/macros/ilib_for_link.sci
+++ b/scilab/modules/dynamic_link/macros/ilib_for_link.sci
@@ -36,7 +36,7 @@ function libn = ilib_for_link(names, ..
36 if rhs <= 9 then fflags = ""; end 36 if rhs <= 9 then fflags = ""; end
37 if rhs <= 10 then cc = ""; end 37 if rhs <= 10 then cc = ""; end
38 38
39 if MSDOS then 39 if getos() == 'Windows' then
40 if isdef('makename') then 40 if isdef('makename') then
41 if (makename == []) | (makename == '') then 41 if (makename == []) | (makename == '') then
42 makename = 'makelib'; 42 makename = 'makelib';
@@ -111,7 +111,7 @@ function ilib_link_gen_Make(names, ..
111 if rhs <= 8 then cc = ""; end 111 if rhs <= 8 then cc = ""; end
112 if rhs <= 9 then flag = "c"; end 112 if rhs <= 9 then flag = "c"; end
113 113
114 if MSDOS then // Windows 114 if getos() == 'Windows' then // Windows
115 // Visual Studio C++ 115 // Visual Studio C++
116 if ( findmsvccompiler() <> 'unknown' ) then 116 if ( findmsvccompiler() <> 'unknown' ) then
117 Makename = makename+'.mak'; 117 Makename = makename+'.mak';
diff --git a/scilab/modules/dynamic_link/macros/ilib_gen_cleaner.sci b/scilab/modules/dynamic_link/macros/ilib_gen_cleaner.sci
index 766f183..4e0a49b 100644
--- a/scilab/modules/dynamic_link/macros/ilib_gen_cleaner.sci
+++ b/scilab/modules/dynamic_link/macros/ilib_gen_cleaner.sci
@@ -39,7 +39,7 @@ function ilib_gen_cleaner(makename,loadername,files)
39 mfprintf(fd,"end\n"); 39 mfprintf(fd,"end\n");
40 mfprintf(fd,"// ------------------------------------------------------\n"); 40 mfprintf(fd,"// ------------------------------------------------------\n");
41 41
42 if MSDOS then 42 if getos() == 'Windows' then
43 make_command = get_make_command(makename); 43 make_command = get_make_command(makename);
44 mfprintf(fd,"if fileinfo(''%s%s'') <> [] then\n",makename,get_makefile_ext()); 44 mfprintf(fd,"if fileinfo(''%s%s'') <> [] then\n",makename,get_makefile_ext());
45 mfprintf(fd," unix_s(''%s'');\n",make_command); 45 mfprintf(fd," unix_s(''%s'');\n",make_command);
@@ -69,7 +69,7 @@ function ilib_gen_cleaner(makename,loadername,files)
69endfunction 69endfunction
70//========================================== 70//==========================================
71function cmd = get_make_command(makename) 71function cmd = get_make_command(makename)
72 if MSDOS then // WINDOWS 72 if getos() == 'Windows' then // WINDOWS
73 // Visual Studio C++ 73 // Visual Studio C++
74 if ( findmsvccompiler() <> 'unknown' ) then 74 if ( findmsvccompiler() <> 'unknown' ) then
75 cmd = 'nmake /Y /nologo /f ' + makename + '.mak' + ' clean'; 75 cmd = 'nmake /Y /nologo /f ' + makename + '.mak' + ' clean';
@@ -87,7 +87,7 @@ function cmd = get_make_command(makename)
87endfunction 87endfunction
88//========================================== 88//==========================================
89function ext = get_makefile_ext() 89function ext = get_makefile_ext()
90 if MSDOS then // WINDOWS 90 if getos() == 'Windows' then // WINDOWS
91 // Visual Studio C++ 91 // Visual Studio C++
92 if ( findmsvccompiler() <> 'unknown' ) then 92 if ( findmsvccompiler() <> 'unknown' ) then
93 ext = '.mak'; 93 ext = '.mak';
diff --git a/scilab/modules/dynamic_link/macros/ilib_gen_loader.sci b/scilab/modules/dynamic_link/macros/ilib_gen_loader.sci
index ebdeb00..3d9317f 100644
--- a/scilab/modules/dynamic_link/macros/ilib_gen_loader.sci
+++ b/scilab/modules/dynamic_link/macros/ilib_gen_loader.sci
@@ -144,7 +144,7 @@ function ilib_4_link_gen_loader(names, flag, loadername, libs, libname)
144 end 144 end
145 145
146 // we manage .f90 as .f on windows 146 // we manage .f90 as .f on windows
147 if MSDOS then 147 if getos() == 'Windows' then
148 if findmsifortcompiler()<> "unknown" then 148 if findmsifortcompiler()<> "unknown" then
149 if flag == "f90" then 149 if flag == "f90" then
150 flag = "f"; 150 flag = "f";
diff --git a/scilab/modules/dynamic_link/macros/ilib_mex_build.sci b/scilab/modules/dynamic_link/macros/ilib_mex_build.sci
index 5370b22..c06a5e9 100644
--- a/scilab/modules/dynamic_link/macros/ilib_mex_build.sci
+++ b/scilab/modules/dynamic_link/macros/ilib_mex_build.sci
@@ -28,7 +28,7 @@ function ilib_mex_build(ilib_name,table,files,libs,makename,ldflags,cflags,fflag
28 if rhs <= 7 then fflags = ''; end 28 if rhs <= 7 then fflags = ''; end
29 if rhs <= 8 then cc = ''; end 29 if rhs <= 8 then cc = ''; end
30 30
31 if ~MSDOS then 31 if getos() <> 'Windows' then
32 // These flags are important... The rename of the fly the name of the 32 // These flags are important... The rename of the fly the name of the
33 // function in the C / C++ / Fortran code 33 // function in the C / C++ / Fortran code
34 cflags=" -DmexFunction=mex_\$* " + cflags 34 cflags=" -DmexFunction=mex_\$* " + cflags
diff --git a/scilab/modules/dynamic_link/macros/with_lcc.sci b/scilab/modules/dynamic_link/macros/with_lcc.sci
index 20f7b7e..1e5d5d7 100644
--- a/scilab/modules/dynamic_link/macros/with_lcc.sci
+++ b/scilab/modules/dynamic_link/macros/with_lcc.sci
@@ -10,7 +10,7 @@
10//========================================== 10//==========================================
11function r = with_lcc() 11function r = with_lcc()
12 12
13 if MSDOS then // Windows 13 if getos() == 'Windows' then // Windows
14 // Visual Studio C++ 14 // Visual Studio C++
15 if ( findmsvccompiler() <> 'unknown' ) then 15 if ( findmsvccompiler() <> 'unknown' ) then
16 r = %F; 16 r = %F;
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3532.dia.ref b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3532.dia.ref
index 326da9c..b2b173d 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3532.dia.ref
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3532.dia.ref
@@ -14,7 +14,7 @@
14// <-- Short Description --> 14// <-- Short Description -->
15// link does not manage column vector as scilab 4.x 15// link does not manage column vector as scilab 4.x
16ilib_verbose(0); 16ilib_verbose(0);
17if MSDOS then 17if getos() == 'Windows' then
18 warning('off'); 18 warning('off');
19 Cfunctions = ''; 19 Cfunctions = '';
20 ierr = execstr("link(SCI+''/bin/scilab_windows.dll'',Cfunctions,''c'');",'errcatch'); 20 ierr = execstr("link(SCI+''/bin/scilab_windows.dll'',Cfunctions,''c'');",'errcatch');
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3532.tst b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3532.tst
index 56bf1dc..5701108 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3532.tst
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3532.tst
@@ -18,7 +18,7 @@
18 18
19ilib_verbose(0); 19ilib_verbose(0);
20 20
21if MSDOS then 21if getos() == 'Windows' then
22 warning('off'); 22 warning('off');
23 Cfunctions = ''; 23 Cfunctions = '';
24 ierr = execstr("link(SCI+''/bin/scilab_windows.dll'',Cfunctions,''c'');",'errcatch'); 24 ierr = execstr("link(SCI+''/bin/scilab_windows.dll'',Cfunctions,''c'');",'errcatch');
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3561.dia.ref b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3561.dia.ref
index 6dbadc6..a436482 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3561.dia.ref
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3561.dia.ref
@@ -14,7 +14,7 @@
14// <-- Short Description --> 14// <-- Short Description -->
15// My DLL "C" functions returning character strings do not work with SciLab 5.0.x. 15// My DLL "C" functions returning character strings do not work with SciLab 5.0.x.
16ilib_verbose(0); 16ilib_verbose(0);
17if MSDOS then 17if getos() == 'Windows' then
18currentpath = pwd(); 18currentpath = pwd();
19cd TMPDIR; 19cd TMPDIR;
20mkdir(TMPDIR,'bug_3561'); 20mkdir(TMPDIR,'bug_3561');
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3561.tst b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3561.tst
index c8e29b9..9e42d13 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3561.tst
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_3561.tst
@@ -18,7 +18,7 @@
18 18
19ilib_verbose(0); 19ilib_verbose(0);
20 20
21if MSDOS then 21if getos() == 'Windows' then
22 22
23currentpath = pwd(); 23currentpath = pwd();
24cd TMPDIR; 24cd TMPDIR;
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4298.dia.ref b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4298.dia.ref
index 1737eb3..4e9a4a5 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4298.dia.ref
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4298.dia.ref
@@ -12,7 +12,7 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14// ilib_for_link fails with lcc-win32 14// ilib_for_link fails with lcc-win32
15if MSDOS then 15if getos() == 'Windows' then
16 if with_lcc() then 16 if with_lcc() then
17 if fileinfo(SCIHOME + '/lcclib/blaspluslcc.lib') <> [] then bugmes();quit;end 17 if fileinfo(SCIHOME + '/lcclib/blaspluslcc.lib') <> [] then bugmes();quit;end
18 if fileinfo(SCIHOME + '/lcclib/blasplus.lib') == [] then bugmes();quit;end 18 if fileinfo(SCIHOME + '/lcclib/blasplus.lib') == [] then bugmes();quit;end
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4298.tst b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4298.tst
index b71d67a..491d895 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4298.tst
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4298.tst
@@ -16,7 +16,7 @@
16// <-- Short Description --> 16// <-- Short Description -->
17// ilib_for_link fails with lcc-win32 17// ilib_for_link fails with lcc-win32
18 18
19if MSDOS then 19if getos() == 'Windows' then
20 if with_lcc() then 20 if with_lcc() then
21 if fileinfo(SCIHOME + '/lcclib/blaspluslcc.lib') <> [] then pause,end 21 if fileinfo(SCIHOME + '/lcclib/blaspluslcc.lib') <> [] then pause,end
22 if fileinfo(SCIHOME + '/lcclib/blasplus.lib') == [] then pause,end 22 if fileinfo(SCIHOME + '/lcclib/blasplus.lib') == [] then pause,end
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4548.dia.ref b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4548.dia.ref
index 01a892d..4e4d5b3 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4548.dia.ref
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4548.dia.ref
@@ -56,7 +56,7 @@ src = [' subroutine intsifdec()'
56'']; 56''];
57mputl(src,'intsifdec.f'); 57mputl(src,'intsifdec.f');
58files=['intsifdec.f']; 58files=['intsifdec.f'];
59if MSDOS then 59if getos() == 'Windows' then
60 [a,b]=getversion(); 60 [a,b]=getversion();
61 if grep(b,'debug')<> [] then 61 if grep(b,'debug')<> [] then
62 setenv('DEBUG_SCILAB_DYNAMIC_LINK','YES'); 62 setenv('DEBUG_SCILAB_DYNAMIC_LINK','YES');
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4548.tst b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4548.tst
index 5076cac..02f91d2 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4548.tst
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4548.tst
@@ -61,7 +61,7 @@ src = [' subroutine intsifdec()'
61 61
62mputl(src,'intsifdec.f'); 62mputl(src,'intsifdec.f');
63files=['intsifdec.f']; 63files=['intsifdec.f'];
64if MSDOS then 64if getos() == 'Windows' then
65 [a,b]=getversion(); 65 [a,b]=getversion();
66 if grep(b,'debug')<> [] then 66 if grep(b,'debug')<> [] then
67 setenv('DEBUG_SCILAB_DYNAMIC_LINK','YES'); 67 setenv('DEBUG_SCILAB_DYNAMIC_LINK','YES');
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4853.dia.ref b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4853.dia.ref
index 9bfa7cd..e1cfa88 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4853.dia.ref
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4853.dia.ref
@@ -13,7 +13,7 @@
13// <-- Short Description --> 13// <-- Short Description -->
14// dll generated by scilab have a wrong dependency on fortran runtime libs 14// dll generated by scilab have a wrong dependency on fortran runtime libs
15// test only for windows 15// test only for windows
16if MSDOS then 16if getos() == 'Windows' then
17 ilib_verbose(0); 17 ilib_verbose(0);
18 exec SCI/modules/dynamic_link/tests/unit_tests/addinter.tst; 18 exec SCI/modules/dynamic_link/tests/unit_tests/addinter.tst;
19 r = dllinfo(TMPDIR + '/addinter/libintertest.dll','imports'); 19 r = dllinfo(TMPDIR + '/addinter/libintertest.dll','imports');
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4853.tst b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4853.tst
index 7c6aae2..6a252f0 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4853.tst
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4853.tst
@@ -17,7 +17,7 @@
17 17
18// test only for windows 18// test only for windows
19 19
20if MSDOS then 20if getos() == 'Windows' then
21 ilib_verbose(0); 21 ilib_verbose(0);
22 exec SCI/modules/dynamic_link/tests/unit_tests/addinter.tst; 22 exec SCI/modules/dynamic_link/tests/unit_tests/addinter.tst;
23 r = dllinfo(TMPDIR + '/addinter/libintertest.dll','imports'); 23 r = dllinfo(TMPDIR + '/addinter/libintertest.dll','imports');
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4919.dia.ref b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4919.dia.ref
index 9a268ce..88249ae 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4919.dia.ref
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4919.dia.ref
@@ -13,7 +13,7 @@
13// <-- Short Description --> 13// <-- Short Description -->
14// If the source file was stored in TMPDIR, the dynamic link 14// If the source file was stored in TMPDIR, the dynamic link
15// was removing the content of this file. 15// was removing the content of this file.
16if ~MSDOS then 16if getos() <> 'Windows' then
17 ilib_verbose(0); 17 ilib_verbose(0);
18 chdir(TMPDIR); 18 chdir(TMPDIR);
19 f1=['int ext1c(int *n, double *a, double *b, double *c)' 19 f1=['int ext1c(int *n, double *a, double *b, double *c)'
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4919.tst b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4919.tst
index 1604737..3c3c6e8 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4919.tst
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_4919.tst
@@ -16,7 +16,7 @@
16// If the source file was stored in TMPDIR, the dynamic link 16// If the source file was stored in TMPDIR, the dynamic link
17// was removing the content of this file. 17// was removing the content of this file.
18 18
19if ~MSDOS then 19if getos() <> 'Windows' then
20 ilib_verbose(0); 20 ilib_verbose(0);
21 chdir(TMPDIR); 21 chdir(TMPDIR);
22 f1=['int ext1c(int *n, double *a, double *b, double *c)' 22 f1=['int ext1c(int *n, double *a, double *b, double *c)'
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5138.dia.ref b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5138.dia.ref
index 930ed4b..0e3550a 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5138.dia.ref
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5138.dia.ref
@@ -11,7 +11,7 @@
11// http://bugzilla.scilab.org/show_bug.cgi?id=5138 11// http://bugzilla.scilab.org/show_bug.cgi?id=5138
12// <-- Short Description --> 12// <-- Short Description -->
13// if the "makefile name" argument is an empty matrix, the generated Makefile is ".mak" 13// if the "makefile name" argument is an empty matrix, the generated Makefile is ".mak"
14if MSDOS then 14if getos() == 'Windows' then
15 ilib_verbose(0); 15 ilib_verbose(0);
16 mkdir(pathconvert(TMPDIR+"/string_writing_api")); 16 mkdir(pathconvert(TMPDIR+"/string_writing_api"));
17 cd(pathconvert(TMPDIR+"/string_writing_api")); 17 cd(pathconvert(TMPDIR+"/string_writing_api"));
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5138.tst b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5138.tst
index 2b7924d..2e62db2 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5138.tst
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5138.tst
@@ -14,7 +14,7 @@
14// <-- Short Description --> 14// <-- Short Description -->
15// if the "makefile name" argument is an empty matrix, the generated Makefile is ".mak" 15// if the "makefile name" argument is an empty matrix, the generated Makefile is ".mak"
16 16
17if MSDOS then 17if getos() == 'Windows' then
18 ilib_verbose(0); 18 ilib_verbose(0);
19 mkdir(pathconvert(TMPDIR+"/string_writing_api")); 19 mkdir(pathconvert(TMPDIR+"/string_writing_api"));
20 cd(pathconvert(TMPDIR+"/string_writing_api")); 20 cd(pathconvert(TMPDIR+"/string_writing_api"));
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5433.tst b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5433.tst
index 77866c3..52d9f3d 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5433.tst
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5433.tst
@@ -15,7 +15,7 @@
15// <-- Short Description --> 15// <-- Short Description -->
16// LCC-Win32 does not work with scicos 16// LCC-Win32 does not work with scicos
17 17
18if MSDOS then 18if getos() == 'Windows' then
19// Install scilab 19// Install scilab
20// Install lcc-win32 20// Install lcc-win32
21// launch modelica demos 21// launch modelica demos
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5484.dia.ref b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5484.dia.ref
index 585bdce..6756365 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5484.dia.ref
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5484.dia.ref
@@ -12,7 +12,7 @@
12// http://bugzilla.scilab.org/show_bug.cgi?id=5484 12// http://bugzilla.scilab.org/show_bug.cgi?id=5484
13// <-- Short Description --> 13// <-- Short Description -->
14// LCC-Win32 does not work with this example 14// LCC-Win32 does not work with this example
15if MSDOS then 15if getos() == 'Windows' then
16 ilib_verbose(0); 16 ilib_verbose(0);
17 if with_lcc() then 17 if with_lcc() then
18 copyfile(SCI + '/modules/dynamic_link/tests/nonreg_tests/bug_5484.c',TMPDIR + '/bug_5484.c'); 18 copyfile(SCI + '/modules/dynamic_link/tests/nonreg_tests/bug_5484.c',TMPDIR + '/bug_5484.c');
diff --git a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5484.tst b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5484.tst
index 531f488..f206702 100644
--- a/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5484.tst
+++ b/scilab/modules/dynamic_link/tests/nonreg_tests/bug_5484.tst
@@ -16,7 +16,7 @@
16// <-- Short Description --> 16// <-- Short Description -->
17// LCC-Win32 does not work with this example 17// LCC-Win32 does not work with this example
18 18
19if MSDOS then 19if getos() == 'Windows' then
20 ilib_verbose(0); 20 ilib_verbose(0);
21 if with_lcc() then 21 if with_lcc() then
22 copyfile(SCI + '/modules/dynamic_link/tests/nonreg_tests/bug_5484.c',TMPDIR + '/bug_5484.c'); 22 copyfile(SCI + '/modules/dynamic_link/tests/nonreg_tests/bug_5484.c',TMPDIR + '/bug_5484.c');
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/G_make.tst b/scilab/modules/dynamic_link/tests/unit_tests/G_make.tst
index 6f77c5a..1d1394c 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/G_make.tst
+++ b/scilab/modules/dynamic_link/tests/unit_tests/G_make.tst
@@ -8,7 +8,7 @@
8 8
9// <-- JVM NOT MANDATORY --> 9// <-- JVM NOT MANDATORY -->
10 10
11if MSDOS then 11if getos() == 'Windows' then
12 txt = ['message:', 12 txt = ['message:',
13 ' @echo ------------------------------------------', 13 ' @echo ------------------------------------------',
14 ' @echo From Makefile.mak', 14 ' @echo From Makefile.mak',
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/G_make.unix.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/G_make.unix.dia.ref
index 2b3ec32..83fbdb2 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/G_make.unix.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/G_make.unix.dia.ref
@@ -6,7 +6,7 @@
6// This file is distributed under the same license as the Scilab package. 6// This file is distributed under the same license as the Scilab package.
7// ============================================================================= 7// =============================================================================
8// <-- JVM NOT MANDATORY --> 8// <-- JVM NOT MANDATORY -->
9if MSDOS then 9if getos() == 'Windows' then
10 txt = ['message:', 10 txt = ['message:',
11 ' @echo ------------------------------------------', 11 ' @echo ------------------------------------------',
12 ' @echo From Makefile.mak', 12 ' @echo From Makefile.mak',
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/G_make.win.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/G_make.win.dia.ref
index 2b3ec32..83fbdb2 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/G_make.win.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/G_make.win.dia.ref
@@ -6,7 +6,7 @@
6// This file is distributed under the same license as the Scilab package. 6// This file is distributed under the same license as the Scilab package.
7// ============================================================================= 7// =============================================================================
8// <-- JVM NOT MANDATORY --> 8// <-- JVM NOT MANDATORY -->
9if MSDOS then 9if getos() == 'Windows' then
10 txt = ['message:', 10 txt = ['message:',
11 ' @echo ------------------------------------------', 11 ' @echo ------------------------------------------',
12 ' @echo From Makefile.mak', 12 ' @echo From Makefile.mak',
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.tst b/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.tst
index 8744266..b7f2e6e 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.tst
+++ b/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.tst
@@ -8,7 +8,7 @@
8 8
9// <-- JVM NOT MANDATORY --> 9// <-- JVM NOT MANDATORY -->
10 10
11if MSDOS then 11if getos() == 'Windows' then
12 info = dllinfo(SCI+'\bin\scilex.exe','machine'); 12 info = dllinfo(SCI+'\bin\scilex.exe','machine');
13 if info(2) <> 'x86' & info(2) <> 'x64' then pause,end 13 if info(2) <> 'x86' & info(2) <> 'x64' then pause,end
14 14
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.unix.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.unix.dia.ref
index e7c4dda..4c0ecee 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.unix.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.unix.dia.ref
@@ -6,7 +6,7 @@
6// This file is distributed under the same license as the Scilab package. 6// This file is distributed under the same license as the Scilab package.
7// ============================================================================= 7// =============================================================================
8// <-- JVM NOT MANDATORY --> 8// <-- JVM NOT MANDATORY -->
9if MSDOS then 9if getos() == 'Windows' then
10 info = dllinfo(SCI+'\bin\scilex.exe','machine'); 10 info = dllinfo(SCI+'\bin\scilex.exe','machine');
11 if info(2) <> 'x86' & info(2) <> 'x64' then bugmes();quit;end 11 if info(2) <> 'x86' & info(2) <> 'x64' then bugmes();quit;end
12 info = dllinfo(SCI+'\bin\libscilab.dll','machine'); 12 info = dllinfo(SCI+'\bin\libscilab.dll','machine');
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.win.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.win.dia.ref
index 117da09..a9635a7 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.win.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/dllinfo.win.dia.ref
@@ -4,7 +4,7 @@
4// 4//
5// This file is distributed under the same license as the Scilab package. 5// This file is distributed under the same license as the Scilab package.
6// ============================================================================= 6// =============================================================================
7if MSDOS then 7if getos() == 'Windows' then
8 info = dllinfo(SCI+'\bin\scilex.exe','machine'); 8 info = dllinfo(SCI+'\bin\scilex.exe','machine');
9 if info(2) <> 'x86' & info(2) <> 'x64' then bugmes();quit;end 9 if info(2) <> 'x86' & info(2) <> 'x64' then bugmes();quit;end
10 info = dllinfo(SCI+'\bin\libscilab.dll','machine'); 10 info = dllinfo(SCI+'\bin\libscilab.dll','machine');
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.macosx.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.macosx.dia.ref
index 684fad9..2a0fd8a 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.macosx.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.macosx.dia.ref
@@ -7,7 +7,7 @@
7// ============================================================================= 7// =============================================================================
8// <-- ENGLISH IMPOSED --> 8// <-- ENGLISH IMPOSED -->
9// <-- JVM NOT MANDATORY --> 9// <-- JVM NOT MANDATORY -->
10if MSDOS then 10if getos() == 'Windows' then
11 TMP_OS_DIR = getenv('TMP','err'); 11 TMP_OS_DIR = getenv('TMP','err');
12 if (TMP_OS_DIR == 'err') then bugmes();quit;end; 12 if (TMP_OS_DIR == 'err') then bugmes();quit;end;
13else 13else
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.tst b/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.tst
index 1dd362c..05a246d 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.tst
+++ b/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.tst
@@ -9,7 +9,7 @@
9// <-- ENGLISH IMPOSED --> 9// <-- ENGLISH IMPOSED -->
10// <-- JVM NOT MANDATORY --> 10// <-- JVM NOT MANDATORY -->
11 11
12if MSDOS then 12if getos() == 'Windows' then
13 TMP_OS_DIR = getenv('TMP','err'); 13 TMP_OS_DIR = getenv('TMP','err');
14 if (TMP_OS_DIR == 'err') then pause,end; 14 if (TMP_OS_DIR == 'err') then pause,end;
15else 15else
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.unix.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.unix.dia.ref
index 46a7c84..a14c2b5 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.unix.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.unix.dia.ref
@@ -7,7 +7,7 @@
7// ============================================================================= 7// =============================================================================
8// <-- ENGLISH IMPOSED --> 8// <-- ENGLISH IMPOSED -->
9// <-- JVM NOT MANDATORY --> 9// <-- JVM NOT MANDATORY -->
10if MSDOS then 10if getos() == 'Windows' then
11 TMP_OS_DIR = getenv('TMP','err'); 11 TMP_OS_DIR = getenv('TMP','err');
12 if (TMP_OS_DIR == 'err') then bugmes();quit;end; 12 if (TMP_OS_DIR == 'err') then bugmes();quit;end;
13else 13else
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.win.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.win.dia.ref
index 7d1b9cb..3c1d55c 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.win.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.win.dia.ref
@@ -7,7 +7,7 @@
7// ============================================================================= 7// =============================================================================
8// <-- ENGLISH IMPOSED --> 8// <-- ENGLISH IMPOSED -->
9// <-- JVM NOT MANDATORY --> 9// <-- JVM NOT MANDATORY -->
10if MSDOS then 10if getos() == 'Windows' then
11 TMP_OS_DIR = getenv('TMP','err'); 11 TMP_OS_DIR = getenv('TMP','err');
12 if (TMP_OS_DIR == 'err') then bugmes();quit;end; 12 if (TMP_OS_DIR == 'err') then bugmes();quit;end;
13else 13else
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_f90.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_f90.dia.ref
index 28958f4..9d81e57 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_f90.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_f90.dia.ref
@@ -13,7 +13,7 @@
13//creating the interface file 13//creating the interface file
14// Checks on windows that we have a Fortran 90 compiler (Intel) 14// Checks on windows that we have a Fortran 90 compiler (Intel)
15if haveacompiler() then 15if haveacompiler() then
16 if ( (MSDOS & findmsifortcompiler() <> 'unknown') | (~MSDOS) ) then 16 if ( (getos() == 'Windows' & findmsifortcompiler() <> 'unknown') | (~MSDOS) ) then
17 ilib_verbose(0); 17 ilib_verbose(0);
18 sourcecode=['subroutine incrdoublef90(x,y)' 18 sourcecode=['subroutine incrdoublef90(x,y)'
19 ' implicit none' 19 ' implicit none'
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_f90.tst b/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_f90.tst
index a605837..2309b41 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_f90.tst
+++ b/scilab/modules/dynamic_link/tests/unit_tests/ilib_build_f90.tst
@@ -17,7 +17,7 @@
17// Checks on windows that we have a Fortran 90 compiler (Intel) 17// Checks on windows that we have a Fortran 90 compiler (Intel)
18 18
19if haveacompiler() then 19if haveacompiler() then
20 if ( (MSDOS & findmsifortcompiler() <> 'unknown') | (~MSDOS) ) then 20 if ( (getos() == 'Windows' & findmsifortcompiler() <> 'unknown') | (~MSDOS) ) then
21 ilib_verbose(0); 21 ilib_verbose(0);
22 sourcecode=['subroutine incrdoublef90(x,y)' 22 sourcecode=['subroutine incrdoublef90(x,y)'
23 ' implicit none' 23 ' implicit none'
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.macosx.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.macosx.dia.ref
index a7a00c8..b163a42 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.macosx.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.macosx.dia.ref
@@ -7,7 +7,7 @@
7// ============================================================================= 7// =============================================================================
8// <-- ENGLISH IMPOSED --> 8// <-- ENGLISH IMPOSED -->
9// <-- JVM NOT MANDATORY --> 9// <-- JVM NOT MANDATORY -->
10if MSDOS then 10if getos() == 'Windows' then
11 TMP_OS_DIR = getenv('TMP','err'); 11 TMP_OS_DIR = getenv('TMP','err');
12 if (TMP_OS_DIR == 'err') then bugmes();quit;end; 12 if (TMP_OS_DIR == 'err') then bugmes();quit;end;
13else 13else
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.tst b/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.tst
index ee9809d..7784646 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.tst
+++ b/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.tst
@@ -9,7 +9,7 @@
9// <-- ENGLISH IMPOSED --> 9// <-- ENGLISH IMPOSED -->
10// <-- JVM NOT MANDATORY --> 10// <-- JVM NOT MANDATORY -->
11 11
12if MSDOS then 12if getos() == 'Windows' then
13 TMP_OS_DIR = getenv('TMP','err'); 13 TMP_OS_DIR = getenv('TMP','err');
14 if (TMP_OS_DIR == 'err') then pause,end; 14 if (TMP_OS_DIR == 'err') then pause,end;
15else 15else
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.unix.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.unix.dia.ref
index fa4c092..92c16c7 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.unix.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.unix.dia.ref
@@ -7,7 +7,7 @@
7// ============================================================================= 7// =============================================================================
8// <-- ENGLISH IMPOSED --> 8// <-- ENGLISH IMPOSED -->
9// <-- JVM NOT MANDATORY --> 9// <-- JVM NOT MANDATORY -->
10if MSDOS then 10if getos() == 'Windows' then
11 TMP_OS_DIR = getenv('TMP','err'); 11 TMP_OS_DIR = getenv('TMP','err');
12 if (TMP_OS_DIR == 'err') then bugmes();quit;end; 12 if (TMP_OS_DIR == 'err') then bugmes();quit;end;
13else 13else
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.win.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.win.dia.ref
index 53aff70..08ec91f 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.win.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.win.dia.ref
@@ -7,7 +7,7 @@
7// ============================================================================= 7// =============================================================================
8// <-- ENGLISH IMPOSED --> 8// <-- ENGLISH IMPOSED -->
9// <-- JVM NOT MANDATORY --> 9// <-- JVM NOT MANDATORY -->
10if MSDOS then 10if getos() == 'Windows' then
11 TMP_OS_DIR = getenv('TMP','err'); 11 TMP_OS_DIR = getenv('TMP','err');
12 if (TMP_OS_DIR == 'err') then bugmes();quit;end; 12 if (TMP_OS_DIR == 'err') then bugmes();quit;end;
13else 13else
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/link.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/link.dia.ref
index b1767f1..5300e3a 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/link.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/link.dia.ref
@@ -8,7 +8,7 @@
8// <-- ENGLISH IMPOSED --> 8// <-- ENGLISH IMPOSED -->
9// <-- JVM NOT MANDATORY --> 9// <-- JVM NOT MANDATORY -->
10ilib_verbose(0); 10ilib_verbose(0);
11if MSDOS then 11if getos() == 'Windows' then
12 TMP_OS_DIR = getenv('TMP','err'); 12 TMP_OS_DIR = getenv('TMP','err');
13 if (TMP_OS_DIR == 'err') then bugmes();quit;end; 13 if (TMP_OS_DIR == 'err') then bugmes();quit;end;
14else 14else
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/link.encoding.dia.ref b/scilab/modules/dynamic_link/tests/unit_tests/link.encoding.dia.ref
index 0b3ee24..86ab86d 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/link.encoding.dia.ref
+++ b/scilab/modules/dynamic_link/tests/unit_tests/link.encoding.dia.ref
@@ -6,7 +6,7 @@
6// ============================================================================= 6// =============================================================================
7ilib_verbose(0); 7ilib_verbose(0);
8cd(TMPDIR); 8cd(TMPDIR);
9if MSDOS then 9if getos() == 'Windows' then
10 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir"); 10 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir");
11else 11else
12 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir"); 12 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir");
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/link.encoding.tst b/scilab/modules/dynamic_link/tests/unit_tests/link.encoding.tst
index aec41f6..6190efe 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/link.encoding.tst
+++ b/scilab/modules/dynamic_link/tests/unit_tests/link.encoding.tst
@@ -9,7 +9,7 @@
9ilib_verbose(0); 9ilib_verbose(0);
10cd(TMPDIR); 10cd(TMPDIR);
11 11
12if MSDOS then 12if getos() == 'Windows' then
13 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir"); 13 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir");
14else 14else
15 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir"); 15 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir");
diff --git a/scilab/modules/dynamic_link/tests/unit_tests/link.tst b/scilab/modules/dynamic_link/tests/unit_tests/link.tst
index 4afed22..38c84ac 100644
--- a/scilab/modules/dynamic_link/tests/unit_tests/link.tst
+++ b/scilab/modules/dynamic_link/tests/unit_tests/link.tst
@@ -11,7 +11,7 @@
11 11
12ilib_verbose(0); 12ilib_verbose(0);
13 13
14if MSDOS then 14if getos() == 'Windows' then
15 TMP_OS_DIR = getenv('TMP','err'); 15 TMP_OS_DIR = getenv('TMP','err');
16 if (TMP_OS_DIR == 'err') then pause,end; 16 if (TMP_OS_DIR == 'err') then pause,end;
17else 17else