summaryrefslogtreecommitdiffstats
path: root/scilab/modules/functions
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/functions
parent4c6a4300d0c9a42b71fb8572e6a656ee3bcb3bdf (diff)
downloadscilab-8b7ac05e63459066060daee277f1a41d5b8905d3.zip
scilab-8b7ac05e63459066060daee277f1a41d5b8905d3.tar.gz
MSDOS replaced by getos() == 'Windows'
Diffstat (limited to 'scilab/modules/functions')
-rw-r--r--scilab/modules/functions/macros/check_gateways.sci2
-rw-r--r--scilab/modules/functions/macros/genlib.sci2
-rw-r--r--scilab/modules/functions/macros/genlib_old.sci2
-rw-r--r--scilab/modules/functions/macros/getd.sci2
-rw-r--r--scilab/modules/functions/scripts/buildmacros/cleanmacros.sce2
-rw-r--r--scilab/modules/functions/tests/unit_tests/libraryinfo.encoding.dia.ref2
-rw-r--r--scilab/modules/functions/tests/unit_tests/libraryinfo.encoding.tst2
7 files changed, 7 insertions, 7 deletions
diff --git a/scilab/modules/functions/macros/check_gateways.sci b/scilab/modules/functions/macros/check_gateways.sci
index aefbd00..ac94af8 100644
--- a/scilab/modules/functions/macros/check_gateways.sci
+++ b/scilab/modules/functions/macros/check_gateways.sci
@@ -18,7 +18,7 @@ function ret=check_gateways(varargin)
18 printf(gettext("Checking: %s.\n"),modules(i)) 18 printf(gettext("Checking: %s.\n"),modules(i))
19 if (fileinfo(file_to_check)<>[]) then 19 if (fileinfo(file_to_check)<>[]) then
20 try 20 try
21 if MSDOS then 21 if getos() == 'Windows' then
22 stat = unix_w(SCI+"\modules\helptools\bin\xmllint\xmllint --noout --valid "+file_to_check); 22 stat = unix_w(SCI+"\modules\helptools\bin\xmllint\xmllint --noout --valid "+file_to_check);
23 else 23 else
24 stat = unix_w("xmllint --noout --valid "+file_to_check); 24 stat = unix_w("xmllint --noout --valid "+file_to_check);
diff --git a/scilab/modules/functions/macros/genlib.sci b/scilab/modules/functions/macros/genlib.sci
index 4ae81ba..5d47d61 100644
--- a/scilab/modules/functions/macros/genlib.sci
+++ b/scilab/modules/functions/macros/genlib.sci
@@ -52,7 +52,7 @@ function [success,funcs,success_files,failed_files] = genlib(nam,path,force,verb
52 updatelib = %t; 52 updatelib = %t;
53 end 53 end
54 54
55 // convert path according to MSDOS flag 55 // convert path according to getos() == 'Windows' flag
56 // without env variable substitution 56 // without env variable substitution
57 57
58 path1 = pathconvert(path,%t,%f); 58 path1 = pathconvert(path,%t,%f);
diff --git a/scilab/modules/functions/macros/genlib_old.sci b/scilab/modules/functions/macros/genlib_old.sci
index 5adf575..c0d43b3 100644
--- a/scilab/modules/functions/macros/genlib_old.sci
+++ b/scilab/modules/functions/macros/genlib_old.sci
@@ -39,7 +39,7 @@ function genlib_old(nam,path,force,verbose,names)
39 updatelib=%t 39 updatelib=%t
40 end 40 end
41 41
42 // convert path according to MSDOS flag 42 // convert path according to getos() == 'Windows' flag
43 // without env variable substitution 43 // without env variable substitution
44 path1 = pathconvert(path,%t,%f); 44 path1 = pathconvert(path,%t,%f);
45 // with env subsitution 45 // with env subsitution
diff --git a/scilab/modules/functions/macros/getd.sci b/scilab/modules/functions/macros/getd.sci
index c210400..7195d64 100644
--- a/scilab/modules/functions/macros/getd.sci
+++ b/scilab/modules/functions/macros/getd.sci
@@ -18,7 +18,7 @@ function getd(path,option)
18 path='./'; 18 path='./';
19 end 19 end
20 20
21 // convert path according to MSDOS flag 21 // convert path according to getos() == 'Windows' flag
22 // and with env var substitutions 22 // and with env var substitutions
23 path = pathconvert(path,%t,%t); 23 path = pathconvert(path,%t,%t);
24 24
diff --git a/scilab/modules/functions/scripts/buildmacros/cleanmacros.sce b/scilab/modules/functions/scripts/buildmacros/cleanmacros.sce
index 24825976..ddb2f1d 100644
--- a/scilab/modules/functions/scripts/buildmacros/cleanmacros.sce
+++ b/scilab/modules/functions/scripts/buildmacros/cleanmacros.sce
@@ -13,7 +13,7 @@ lines(0);
13CurrentDirectory=pwd(); 13CurrentDirectory=pwd();
14 14
15chdir ('SCI/modules'); 15chdir ('SCI/modules');
16if MSDOS then 16if getos() == 'Windows' then
17 dos('del *.bin /s 2>NUL','-echo'); 17 dos('del *.bin /s 2>NUL','-echo');
18 dos('del lib /s 2>NUL','-echo'); 18 dos('del lib /s 2>NUL','-echo');
19 dos('del names /s 2>NUL','-echo'); 19 dos('del names /s 2>NUL','-echo');
diff --git a/scilab/modules/functions/tests/unit_tests/libraryinfo.encoding.dia.ref b/scilab/modules/functions/tests/unit_tests/libraryinfo.encoding.dia.ref
index 06ab64d..b4d77e6 100644
--- a/scilab/modules/functions/tests/unit_tests/libraryinfo.encoding.dia.ref
+++ b/scilab/modules/functions/tests/unit_tests/libraryinfo.encoding.dia.ref
@@ -5,7 +5,7 @@
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// =============================================================================
7cd(TMPDIR); 7cd(TMPDIR);
8if MSDOS then 8if getos() == 'Windows' then
9 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir"); 9 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir");
10else 10else
11 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir"); 11 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir");
diff --git a/scilab/modules/functions/tests/unit_tests/libraryinfo.encoding.tst b/scilab/modules/functions/tests/unit_tests/libraryinfo.encoding.tst
index 280192a..1fb5a81 100644
--- a/scilab/modules/functions/tests/unit_tests/libraryinfo.encoding.tst
+++ b/scilab/modules/functions/tests/unit_tests/libraryinfo.encoding.tst
@@ -7,7 +7,7 @@
7 7
8cd(TMPDIR); 8cd(TMPDIR);
9 9
10if MSDOS then 10if getos() == 'Windows' then
11 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir"); 11 unix_w(jre_path()+"\bin\java.exe -cp "+SCI+"\modules\localization\tests\unit_tests CreateDir");
12else 12else
13 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir"); 13 unix_w(jre_path()+"/bin/java -classpath "+SCI+"/modules/localization/tests/unit_tests CreateDir");