summaryrefslogtreecommitdiffstats
path: root/scilab/modules/tclsci
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/tclsci
parent4c6a4300d0c9a42b71fb8572e6a656ee3bcb3bdf (diff)
downloadscilab-8b7ac05e63459066060daee277f1a41d5b8905d3.zip
scilab-8b7ac05e63459066060daee277f1a41d5b8905d3.tar.gz
MSDOS replaced by getos() == 'Windows'
Diffstat (limited to 'scilab/modules/tclsci')
-rw-r--r--scilab/modules/tclsci/demos/tk/scroll.dem.sce4
-rw-r--r--scilab/modules/tclsci/macros/gettklib.sci2
-rw-r--r--scilab/modules/tclsci/tests/nonreg_tests/bug_3223.dia.ref2
-rw-r--r--scilab/modules/tclsci/tests/nonreg_tests/bug_3223.tst2
-rw-r--r--scilab/modules/tclsci/tests/nonreg_tests/bug_488.dia.ref2
-rw-r--r--scilab/modules/tclsci/tests/nonreg_tests/bug_488.tst2
6 files changed, 7 insertions, 7 deletions
diff --git a/scilab/modules/tclsci/demos/tk/scroll.dem.sce b/scilab/modules/tclsci/demos/tk/scroll.dem.sce
index 1de3c05..735ce78 100644
--- a/scilab/modules/tclsci/demos/tk/scroll.dem.sce
+++ b/scilab/modules/tclsci/demos/tk/scroll.dem.sce
@@ -10,7 +10,7 @@ tkpath = get_absolute_file_path("scroll.dem.sce");
10 10
11TCL_EvalFile(tkpath+'cscroll') 11TCL_EvalFile(tkpath+'cscroll')
12 12
13if MSDOS then 13if getos() == 'Windows' then
14 consolestatus = consolebox(); 14 consolestatus = consolebox();
15 if consolestatus == 'off' then 15 if consolestatus == 'off' then
16 consolebox("on"); 16 consolebox("on");
@@ -23,7 +23,7 @@ while %t //wait for toplevel to disapear
23 sleep(1); 23 sleep(1);
24end 24end
25 25
26if MSDOS then 26if getos() == 'Windows' then
27 consolebox(consolestatus); 27 consolebox(consolestatus);
28end 28end
29 29
diff --git a/scilab/modules/tclsci/macros/gettklib.sci b/scilab/modules/tclsci/macros/gettklib.sci
index 16a6a4c..0dd1f5e 100644
--- a/scilab/modules/tclsci/macros/gettklib.sci
+++ b/scilab/modules/tclsci/macros/gettklib.sci
@@ -14,7 +14,7 @@ function tklib=gettklib()
14 // don't use string() but msprintf because of format() - see bug 3602 14 // don't use string() but msprintf because of format() - see bug 3602
15 major = msprintf("%d",tcltkver(1)); 15 major = msprintf("%d",tcltkver(1));
16 minor = msprintf("%d",tcltkver(2)); 16 minor = msprintf("%d",tcltkver(2));
17 if MSDOS then 17 if getos() == 'Windows' then
18 tklib = 'tk' + major + minor + getdynlibext(); 18 tklib = 'tk' + major + minor + getdynlibext();
19 else 19 else
20 cur_verbose = ilib_verbose(); 20 cur_verbose = ilib_verbose();
diff --git a/scilab/modules/tclsci/tests/nonreg_tests/bug_3223.dia.ref b/scilab/modules/tclsci/tests/nonreg_tests/bug_3223.dia.ref
index 3daa3d8..1c95fe7 100644
--- a/scilab/modules/tclsci/tests/nonreg_tests/bug_3223.dia.ref
+++ b/scilab/modules/tclsci/tests/nonreg_tests/bug_3223.dia.ref
@@ -9,7 +9,7 @@
9// <-- Bugzilla URL --> 9// <-- Bugzilla URL -->
10// http://bugzilla.scilab.org/show_bug.cgi?id=3223 10// http://bugzilla.scilab.org/show_bug.cgi?id=3223
11// 11//
12if MSDOS then 12if getos() == 'Windows' then
13 ierr = execstr("TCL_EvalStr(''package require registry'')",'errcatch'); 13 ierr = execstr("TCL_EvalStr(''package require registry'')",'errcatch');
14 if ierr <> 0 then bugmes();quit;end 14 if ierr <> 0 then bugmes();quit;end
15end \ No newline at end of file 15end \ No newline at end of file
diff --git a/scilab/modules/tclsci/tests/nonreg_tests/bug_3223.tst b/scilab/modules/tclsci/tests/nonreg_tests/bug_3223.tst
index 678eab1..291f23c 100644
--- a/scilab/modules/tclsci/tests/nonreg_tests/bug_3223.tst
+++ b/scilab/modules/tclsci/tests/nonreg_tests/bug_3223.tst
@@ -11,7 +11,7 @@
11// http://bugzilla.scilab.org/show_bug.cgi?id=3223 11// http://bugzilla.scilab.org/show_bug.cgi?id=3223
12// 12//
13 13
14if MSDOS then 14if getos() == 'Windows' then
15 ierr = execstr("TCL_EvalStr(''package require registry'')",'errcatch'); 15 ierr = execstr("TCL_EvalStr(''package require registry'')",'errcatch');
16 if ierr <> 0 then pause,end 16 if ierr <> 0 then pause,end
17end 17end
diff --git a/scilab/modules/tclsci/tests/nonreg_tests/bug_488.dia.ref b/scilab/modules/tclsci/tests/nonreg_tests/bug_488.dia.ref
index 0125741..1372911 100644
--- a/scilab/modules/tclsci/tests/nonreg_tests/bug_488.dia.ref
+++ b/scilab/modules/tclsci/tests/nonreg_tests/bug_488.dia.ref
@@ -36,7 +36,7 @@
36// rechercher l'existance du r�pertoire tcl sous Scilab 36// rechercher l'existance du r�pertoire tcl sous Scilab
37tcl_dir = getenv('SCI')+"/modules/tclsci/tcl"; 37tcl_dir = getenv('SCI')+"/modules/tclsci/tcl";
38if ~(isdir(tcl_dir)) then bugmes();quit;end 38if ~(isdir(tcl_dir)) then bugmes();quit;end
39if isdir(tcl_dir) & MSDOS then 39if isdir(tcl_dir) & (getos() == 'Windows') then
40 // si oui rechercher l'existance du fichier init.tcl sous un repertoire de tcl 40 // si oui rechercher l'existance du fichier init.tcl sous un repertoire de tcl
41 tcl_list = basename(listfiles(listfiles(tcl_dir+"/tcl*")+"/init.*")); 41 tcl_list = basename(listfiles(listfiles(tcl_dir+"/tcl*")+"/init.*"));
42 if (grep ( tcl_list , "init") == []) & ( grep ( tcl_list , "INIT") == []) then bugmes();quit;end 42 if (grep ( tcl_list , "init") == []) & ( grep ( tcl_list , "INIT") == []) then bugmes();quit;end
diff --git a/scilab/modules/tclsci/tests/nonreg_tests/bug_488.tst b/scilab/modules/tclsci/tests/nonreg_tests/bug_488.tst
index 2bf25ed3..0dfe206 100644
--- a/scilab/modules/tclsci/tests/nonreg_tests/bug_488.tst
+++ b/scilab/modules/tclsci/tests/nonreg_tests/bug_488.tst
@@ -42,7 +42,7 @@
42tcl_dir = getenv('SCI')+"/modules/tclsci/tcl"; 42tcl_dir = getenv('SCI')+"/modules/tclsci/tcl";
43if ~(isdir(tcl_dir)) then pause,end 43if ~(isdir(tcl_dir)) then pause,end
44 44
45if isdir(tcl_dir) & MSDOS then 45if isdir(tcl_dir) & (getos() == 'Windows') then
46 // si oui rechercher l'existance du fichier init.tcl sous un repertoire de tcl 46 // si oui rechercher l'existance du fichier init.tcl sous un repertoire de tcl
47 tcl_list = basename(listfiles(listfiles(tcl_dir+"/tcl*")+"/init.*")); 47 tcl_list = basename(listfiles(listfiles(tcl_dir+"/tcl*")+"/init.*"));
48 if (grep ( tcl_list , "init") == []) & ( grep ( tcl_list , "INIT") == []) then pause,end 48 if (grep ( tcl_list , "init") == []) & ( grep ( tcl_list , "INIT") == []) then pause,end