SCI,TMPDIR,MSDOS are predefined in C code.
Allan Cornet [Sun, 10 Sep 2006 16:38:49 +0000 (16:38 +0000)]
72 files changed:
scilab/modules/arnoldi/macros/buildmacros.sce
scilab/modules/boolean/macros/buildmacros.sce
scilab/modules/cacsd/macros/buildmacros.sce
scilab/modules/core/macros/buildmacros.sce
scilab/modules/core/src/c/inisci-c.c
scilab/modules/core/src/fortran/inisci.f
scilab/modules/data_structures/macros/buildmacros.sce
scilab/modules/differential_equations/macros/buildmacros.sce
scilab/modules/double/macros/buildmacros.sce
scilab/modules/elementaries_functions/macros/buildmacros.sce
scilab/modules/fileio/macros/buildmacros.sce
scilab/modules/functions/macros/buildmacros.sce
scilab/modules/functions/scripts/buildmacros/buildmacros.sce
scilab/modules/functions/scripts/buildmacros/cleanmacros.sce
scilab/modules/functions/scripts/buildmacros/genmacros.sce
scilab/modules/graphics/macros/buildmacros.sce
scilab/modules/gui/macros/buildmacros.sce
scilab/modules/helptools/macros/buildmacros.sce
scilab/modules/incremental_link/macros/buildmacros.sce
scilab/modules/integer/macros/buildmacros.sce
scilab/modules/interpolation/macros/buildmacros.sce
scilab/modules/intersci/macros/buildmacros.sce
scilab/modules/io/macros/buildmacros.sce
scilab/modules/javasci/macros/buildmacros.sce
scilab/modules/jvm/macros/buildmacros.sce
scilab/modules/linear_algebra/macros/buildmacros.sce
scilab/modules/localization/macros/buildmacros.sce
scilab/modules/m2sci/macros/buildmacros.sce
scilab/modules/m2sci/macros/m2sci/kernel/buildmacros.sce
scilab/modules/m2sci/macros/m2sci/percent/buildmacros.sce
scilab/modules/m2sci/macros/m2sci/sci_files/buildmacros.sce
scilab/modules/m2sci/macros/mtlb/buildmacros.sce
scilab/modules/maple2scilab/macros/buildmacros.sce
scilab/modules/metanet/macros/buildmacros.sce
scilab/modules/mexlib/macros/buildmacros.sce
scilab/modules/optimization/macros/buildmacros.sce
scilab/modules/others/macros/buildmacros.sce
scilab/modules/others/macros/scitest.sci
scilab/modules/overloading/macros/buildmacros.sce
scilab/modules/polynomials/macros/buildmacros.sce
scilab/modules/pvm/macros/buildmacros.sce
scilab/modules/randlib/macros/buildmacros.sce
scilab/modules/scicos/macros/buildmacros.sce
scilab/modules/scicos/macros/genlib.sce
scilab/modules/scicos/macros/genmoc.sce
scilab/modules/scicos/macros/scicos/buildmacros.sce
scilab/modules/scicos/macros/scicos_blocks/Branching/buildmacros.sce
scilab/modules/scicos/macros/scicos_blocks/Electrical/buildmacros.sce
scilab/modules/scicos/macros/scicos_blocks/Events/buildmacros.sce
scilab/modules/scicos/macros/scicos_blocks/Hydraulics/buildmacros.sce
scilab/modules/scicos/macros/scicos_blocks/Linear/buildmacros.sce
scilab/modules/scicos/macros/scicos_blocks/Misc/buildmacros.sce
scilab/modules/scicos/macros/scicos_blocks/NonLinear/buildmacros.sce
scilab/modules/scicos/macros/scicos_blocks/PDE/buildmacros.sce
scilab/modules/scicos/macros/scicos_blocks/Sinks/buildmacros.sce
scilab/modules/scicos/macros/scicos_blocks/Sources/buildmacros.sce
scilab/modules/scicos/macros/scicos_blocks/Threshold/buildmacros.sce
scilab/modules/scilab2fortran/macros/buildmacros.sce
scilab/modules/scipad/macros/buildmacros.sce
scilab/modules/signal_processing/macros/buildmacros.sce
scilab/modules/sound/macros/buildmacros.sce
scilab/modules/sparse/macros/buildmacros.sce
scilab/modules/special_functions/macros/buildmacros.sce
scilab/modules/statistics/macros/buildmacros.sce
scilab/modules/string/macros/buildmacros.sce
scilab/modules/symbolic/macros/buildmacros.sce
scilab/modules/tclsci/macros/buildmacros.sce
scilab/modules/texmacs/macros/buildmacros.sce
scilab/modules/tfds/macros/buildmacros.sce
scilab/modules/time/macros/buildmacros.sce
scilab/modules/wintools/macros/buildmacros.sce
scilab/scilab.start

index f6d57bb..104d06d 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2006
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 //genlib('arnoldilib','SCI/modules/arnoldi/macros');
 //------------------------------------
index 477b6ac..7d5c9d0 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 //genlib('booleanlib','SCI/modules/boolean/macros');
 //------------------------------------
index b90b3d0..5ed6731 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2006
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('cacsdlib','SCI/modules/cacsd/macros');
 //------------------------------------
index 6ed2cd5..e6eb7b1 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2006
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('corelib','SCI/modules/core/macros');
 //------------------------------------
index adc60ca..8aeb349 100644 (file)
@@ -110,6 +110,16 @@ int C2F(withjavasci)(int *rep)
   return 0;
 }
 /*************************************************************************************************/
+int C2F(withmsdos)(int *rep)
+{
+#ifdef _MSC_VER
+       *rep =1;
+#else
+       *rep =0; 
+#endif
+       return 0;
+}
+/*************************************************************************************************/
 int C2F(getcomp)(char *buf,int *nbuf,long int lbuf)
 {
   int ierr,iflag=0,l1buf=lbuf;
@@ -119,6 +129,40 @@ int C2F(getcomp)(char *buf,int *nbuf,long int lbuf)
   return 0;
 }
 /*************************************************************************************************/
+int C2F(getsci)(char *buf,int *nbuf,long int lbuf)
+{
+       int ierr,iflag=0,l1buf=lbuf;
+       C2F(getenvc)(&ierr,"SCI",buf,&l1buf,&iflag);
+       if ( ierr== 1) 
+       {
+               #if  _MSC_VER
+               MessageBox(NULL,"SCI not defined.","Warning",MB_ICONWARNING);
+               #else
+               printf("SCI not defined.\n");
+               #endif
+               exit(1);
+       }
+       *nbuf = strlen(buf);
+       return 0;
+}
+/*************************************************************************************************/
+int C2F(gettmpdir)(char *buf,int *nbuf,long int lbuf)
+{
+       int ierr,iflag=0,l1buf=lbuf;
+       C2F(getenvc)(&ierr,"TMPDIR",buf,&l1buf,&iflag);
+       if ( ierr== 1) 
+       {
+#if  _MSC_VER
+               MessageBox(NULL,"TMPDIR not defined.","Warning",MB_ICONWARNING);
+#else
+               printf("TMPDIR not defined.\n");
+#endif
+               exit(1);
+       }
+       *nbuf = strlen(buf);
+       return 0;
+}
+/*************************************************************************************************/
 #ifdef _MSC_VER
 BOOL FileExist(char *filename)
 {
index 6134e37..41f3161 100644 (file)
@@ -237,8 +237,8 @@ c     . hard predefined variables
       gbot=isizt
       lstk(gbot)=lstk(gtop+1)+vsizg-1
 c
-c     14 is the number of predefined variables 
-      bot=isiz-14
+c     18 is the number of predefined variables 
+      bot=isiz-18
       bbot=bot
       bot0=bot
 c     memory requested for predefined variables 
@@ -246,7 +246,9 @@ c     mxn bmat -> size : sadr(2+m*n+2)
 c     $        -> size : sadr(10-1) + 2 
 c     mxn mat  -> size : sadr(3)+m*n*(it+1)
 c     string   -> size : sadr(6+nchar)+1
-      call getcomp(buf,nbuf)
+
+c     . SCI
+      call getsci(buf,nbuf)
       lpvar = (sadr(10-1) + 2) 
      $     + 5*sadr(5) 
      $     + 4*(sadr(3)+1)
@@ -255,19 +257,40 @@ c     string   -> size : sadr(6+nchar)+1
       l=vsizr-lpvar
       k=bot
       lstk(k)=lstk(1)-1+l
+      vname = ' '
+      vname(1:3) = "SCI"
+      call cvname(idloc,vname,0)
+      call cresmatvar(idloc,k,buf,nbuf)
+      k=k+1
 c     . COMPILER
+      call getcomp(buf,nbuf)
       vname = ' '
       vname(1:8) = "COMPILER"
       call cvname(idloc,vname,0)
       call cresmatvar(idloc,k,buf,nbuf)
       k=k+1
+c     . TMPDIR
+      call gettmpdir(buf,nbuf)
+      vname = ' '
+      vname(1:6) = "TMPDIR"
+      call cvname(idloc,vname,0)
+      call cresmatvar(idloc,k,buf,nbuf)
+      k=k+1
+c     . MSDOS
+       vname = ' '
+      vname(1:5) = "MSDOS"
+      call withmsdos(irep)
+      call cvname(idloc,vname,0)
+      call crebmatvar(idloc,k,1,1,irep)
+      k=k+1 
 c     . %scicos
-           vname = ' '
+       vname = ' '
       vname(1:7) = "%scicos"
       call withscicos(irep)
       call cvname(idloc,vname,0)
       call crebmatvar(idloc,k,1,1,irep)
-      k=k+1     
+      k=k+1 
+          
 c     . %gtk 
       vname = ' '
       vname(1:4) = "%gtk"
index 396ada6..a9cc094 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('dstructlib','SCI/modules/data_structures/macros');
 //------------------------------------
index f57a24d..5551f3c 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('diffequlib','SCI/modules/differential_equations/macros');
 //------------------------------------
index c9d751a..aa3fdfa 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 //genlib('doublelib','SCI/modules/double/macros');
 //------------------------------------
index fb6be9e..799e894 100644 (file)
@@ -1,9 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2006
 //------------------------------------
-MSDOS=(getos()=='Windows');
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('elemlib','SCI/modules/elementaries_functions/macros');
 //------------------------------------
index 31c7dca..055a995 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2006
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('fileiolib','SCI/modules/fileio/macros');
 //------------------------------------
index 1e6e08b..2f9a5b6 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('functionslib','SCI/modules/functions/macros');
 //------------------------------------
index 9b35389..5ab6f0e 100644 (file)
@@ -4,7 +4,6 @@
 // ------------------------------------\r
 \r
 lines(0);\r
-MSDOS=(getos()=='Windows');\r
 \r
 CurrentDirectory=pwd();\r
 \r
index bc1630b..86f67ac 100644 (file)
@@ -3,7 +3,6 @@
 // INRIA 2006\r
 // ------------------------------------\r
 lines(0);\r
-MSDOS=(getos()=='Windows');\r
 \r
 CurrentDirectory=pwd();\r
 \r
index 163aef4..66bb6f4 100644 (file)
@@ -8,8 +8,6 @@ clear all;
 mode(-1);\r
 //------------------------------------\r
 function RemoveMinimalMacros()\r
-  SCI=getenv('SCI');\r
-  MSDOS=(getos()=='Windows')\r
   if MSDOS then\r
     CurrentDir=pwd();\r
     chdir(SCI+'/modules/functions/macros');\r
@@ -50,12 +48,9 @@ function RemoveMinimalMacros()
     unix('rm -f '+SCI+'/modules/fileio/macros/basename.bin');\r
     unix('rm -f '+SCI+'/modules/fileio/macros/mputl.bin');\r
   end\r
-  clear MSDOS;\r
-  clear SCI;\r
 endfunction\r
 //------------------------------------\r
 function BuildMinimalMacros()\r
-  MSDOS=(getos()=='Windows');\r
   LineToDo='';\r
   startline='';\r
   endline='';\r
@@ -69,8 +64,7 @@ function BuildMinimalMacros()
     endline='"">cmd.sce';\r
   end\r
   \r
-  SCI=getenv('SCI');\r
-  scilabstart="SCI=getenv(''SCI'');MSDOS=(getos()==''Windows'');TMPDIR=getenv(''TMPDIR'');"\r
+  scilabstart=""\r
   scilabquit='clear;quit;'\r
   \r
   cmd=scilabstart+'getf(SCI+''/modules/core/macros/OS_Version.sci'');save(SCI+''/modules/core/macros/OS_Version.bin'');'+scilabquit\r
@@ -134,14 +128,11 @@ function BuildMinimalMacros()
     unix('rm -f cmd.sce');\r
   end\r
   \r
-  clear MSDOS\r
-  \r
 endfunction\r
 //------------------------------------\r
 RemoveMinimalMacros();\r
 BuildMinimalMacros();\r
 clear BuildMinimalMacros;\r
-SCI=getenv('SCI');\r
 load(SCI+'/modules/fileio/macros/fileparts.bin');\r
 load(SCI+'/modules/core/macros/getshell.bin');\r
 load(SCI+'/modules/fileio/macros/pathconvert.bin');\r
@@ -154,7 +145,6 @@ load(SCI+'/modules/overloading/macros/%c_a_c.bin');
 load(SCI+'/modules/fileio/macros/basename.bin');\r
 load(SCI+'/modules/fileio/macros/mputl.bin');\r
 load(SCI+'/modules/functions/macros/genlib.bin');\r
-clear SCI;\r
 // Need to remove macros binary files before build by genlib\r
 RemoveMinimalMacros();\r
 clear RemoveMinimalMacros;\r
index 793e542..e06a533 100644 (file)
@@ -1,9 +1,5 @@
 //------------------------------------
 // Allan CORNET        INRIA 2005
-// Jean-Baptiste Silvy INRIA 2006
-//------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
 //------------------------------------
 genlib('graphics','SCI/modules/graphics/macros');
 //------------------------------------
index 9ba99f3..0546018 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('guilib','SCI/modules/gui/macros');
 //------------------------------------
index 96844be..7300cfb 100644 (file)
@@ -3,8 +3,6 @@
 // Scilab Team
 // Copyright INRIA
 // ==========================================================================
-
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-
 genlib('helptoolslib','SCI/modules/helptools/macros');
+// ==========================================================================
+
index 121fbff..0507010 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2006
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('ilinklib','SCI/modules/incremental_link/macros');
 //------------------------------------
index e88c133..2ce093f 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('intlib','SCI/modules/integer/macros');
 //------------------------------------
index ceb3696..c566381 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 //genlib('interpolationlib','SCI/modules/interpolation/macros');
 //------------------------------------
index 5d95c59..c0334dc 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 //genlib('interscilib','SCI/modules/intersci/macros');
 //------------------------------------
index 2b0db6f..6662324 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2006
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('iolib','SCI/modules/io/macros');
 //------------------------------------
index 30d3ace..26ca039 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 //genlib('javascilib','SCI/modules/Javasci/macros');
 //------------------------------------
index dea7e8b..18aeff4 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 //genlib('jvmlib','SCI/modules/jvm/macros');
 //------------------------------------
index ad24e0e..ab52300 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2006
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('alglib','SCI/modules/linear_algebra/macros');
 //------------------------------------
index a475cfd..26783a9 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('localizationlib','SCI/modules/localization/macros');
 //------------------------------------
index 7494a10..c5bfb6e 100644 (file)
@@ -1,9 +1,6 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('libm2sci','SCI/modules/m2sci/macros');
 //------------------------------------
 disp('-- Creation of [SCI/modules/m2sci/macros/m2sci] (Macros) --');
index 659f61f..e655668 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('m2skernellib','SCI/modules/m2sci/macros/m2sci/kernel');
 //------------------------------------
index 9034698..43f3e77 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('m2spercentlib','SCI/modules/m2sci/macros/m2sci/percent');
 //------------------------------------
index 75c6f91..c6bcd6e 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('m2ssci_fileslib','SCI/modules/m2sci/macros/m2sci/sci_files');
 //------------------------------------
index 06d826f..0e0be88 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('mtlblib','SCI/modules/m2sci/macros/mtlb');
 //------------------------------------
index 148aeca..7b50f3b 100644 (file)
@@ -4,8 +4,5 @@
 // Copyright INRIA
 // Date : Aout 2006
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('maplelib','SCI/modules/maple2scilab/macros');
 //------------------------------------
index 37c55d4..d0bee20 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('metanetlib','SCI/modules/metanet/macros');
 //------------------------------------
index fddf0ba..fcab5fc 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 //genlib('mexliblib','SCI/modules/mexlib/macros');
 //------------------------------------
index 961a81f..7fb8933 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('optlib','SCI/modules/optimization/macros');
 //------------------------------------
index 168c770..4d3a14a 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('otherslib','SCI/modules/others/macros');
 //------------------------------------
index 180ca12..61c5d35 100644 (file)
@@ -27,7 +27,6 @@ function scitest(tstfile,force,error_check,keep_prompt,postscript_graphics)
   //Reset standard globals
   rand('seed',0);rand('uniform');
   if MSDOS then
-    SCI=strsubst(SCI,'/','\')
     tmpfiles=strsubst(TMPDIR,'/','\')+'\tmp.'
   else
      tmpfiles=TMPDIR+'/tmp.'
index d5f5c61..2eda64f 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('percentlib','SCI/modules/overloading/macros');
 //------------------------------------
index b22f791..a474e5c 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('polylib','SCI/modules/polynomials/macros');
 //------------------------------------
index 4891c51..60e7c68 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2006
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('pvmlib','SCI/modules/pvm/macros');
 //------------------------------------
index e732308..cac9497 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 //genlib('randliblib','SCI/modules/randlib/macros');
 //------------------------------------
index 933becb..7c30dbb 100644 (file)
@@ -1,9 +1,6 @@
 //------------------------------------
 // Allan CORNET INRIA 2006
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('libscicos','SCI/modules/scicos/macros');
 //------------------------------------
 disp('-- Creation of [SCI/modules/scicos/macros/scicos] (Macros) --');
index 2e643e2..fce28b5 100644 (file)
@@ -10,9 +10,6 @@ load('SCI/modules/differential_equations/macros/lib')
 load('SCI/modules/polynomials/macros/lib')
 load('SCI/modules/overloading/macros/lib')
 
-SCI=getenv('SCI')  
-MSDOS = getenv('WIN32','NO')=='OK'
-
 names=stripblanks(mgetl('names'));
 args=sciargs()
 genlib(args($-1),args($),names=names,verbose=%t)
index ba5f392..0792aaa 100644 (file)
@@ -13,11 +13,6 @@ if ~isdef('genmoc_verbose') then
   genmoc_verbose=%f
 end
 
-SCI=getenv('SCI')  
-MSDOS = getenv('WIN32','NO')=='OK' & ..
-       or(COMPILER==['VC++' 'gcc'])
-
-TMPDIR=getenv('TMPDIR');
 
 if ~with_modelica_compiler() then quit,end
 models=stripblanks(mgetl('models'))
index 4b06e5c..a5ca9bc 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('scicos_lib','SCI/modules/scicos/macros/scicos');
 //------------------------------------
index b8af1a9..8f99670 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('scsbranchinglib','SCI/modules/scicos/macros/scicos_blocks/Branching');
 //------------------------------------
index 399b607..2d80faa 100644 (file)
@@ -1,10 +1,6 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-MSDOS=(getos()=='Windows');
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('scselectricallib','SCI/modules/scicos/macros/scicos_blocks/Electrical');
 //------------------------------------
 if MSDOS then
index 97a3058..b2f9797 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('scseventslib','SCI/modules/scicos/macros/scicos_blocks/Events');
 //------------------------------------
index e9ca6c9..a004794 100644 (file)
@@ -1,10 +1,6 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-MSDOS=(getos()=='Windows');
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('scshydraulicslib','SCI/modules/scicos/macros/scicos_blocks/Hydraulics'); 
 //------------------------------------
 if MSDOS then
index 978a90e..a344a49 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('scslinearlib','SCI/modules/scicos/macros/scicos_blocks/Linear');
 //------------------------------------
index ea6b9a9..5d80c9d 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('scsmisclib','SCI/modules/scicos/macros/scicos_blocks/Misc');
 //------------------------------------
index 721a8c8..40536ef 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('scsnonlinearlib','SCI/modules/scicos/macros/scicos_blocks/NonLinear');
 //------------------------------------
index f8040e3..70bd503 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2006
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('PDElib','SCI/modules/scicos/macros/scicos_blocks/PDE');
 //------------------------------------
\ No newline at end of file
index 92658e1..1268609 100644 (file)
@@ -1,9 +1,6 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('scssinkslib','SCI/modules/scicos/macros/scicos_blocks/Sinks');
 //------------------------------------
 
index a82820e..aa65b38 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('scssourceslib','SCI/modules/scicos/macros/scicos_blocks/Sources');
 //------------------------------------
index 425cb78..6a4681c 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('scsthresholdlib','SCI/modules/scicos/macros/scicos_blocks/Threshold');
 //------------------------------------
index dab4b60..ded74bb 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('s2flib','SCI/modules/scilab2fortran/macros');
 //------------------------------------
index 586b6e4..874363c 100644 (file)
@@ -4,8 +4,5 @@
 // Copyright INRIA
 // Date :  Aout 2006
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('scipadlib','SCI/modules/scipad/macros');
 //------------------------------------
index f164ba0..8cccfec 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('siglib','SCI/modules/signal_processing/macros');
 //------------------------------------
index 21c66e4..d9c3db3 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('soundlib','SCI/modules/sound/macros');
 //------------------------------------
index 8f1408d..bb20eaa 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('sparselib','SCI/modules/sparse/macros');
 //------------------------------------
index d6e61da..84d1991 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 //genlib('specfunlib','SCI/modules/special_functions/macros');
 //------------------------------------
index feb3784..ee05fef 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('statslib','SCI/modules/statistics/macros');
 //------------------------------------
index 68a6214..1731243 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('stringlib','SCI/modules/string/macros');
 //------------------------------------
index 7204828..3908cd4 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 //genlib('symboliclib','SCI/modules/symbolic/macros');
 //------------------------------------
index d3bc69b..c53bb03 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('tclscilib','SCI/modules/tclsci/macros');
 //------------------------------------
index 768a347..ea3d940 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2006
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('texmacslib','SCI/modules/texmacs/macros');
 //------------------------------------
index 21e575a..a28fa47 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('tfdslib','SCI/modules/tfds/macros');
 //------------------------------------
index 795a5c4..2d85ec6 100644 (file)
@@ -4,8 +4,5 @@
 // Copyright INRIA
 // Date :  d├ęcembre 2005
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 genlib('timelib','SCI/modules/time/macros');
 //------------------------------------
index c1e46d3..718336f 100644 (file)
@@ -1,8 +1,5 @@
 //------------------------------------
 // Allan CORNET INRIA 2006
 //------------------------------------
-SCI=getenv('SCI'); 
-TMPDIR=getenv('TMPDIR');
-//------------------------------------
 //genlib('wintoolslib','SCI/modules/wintools/macros');
 //------------------------------------
index ecda4be..617c3ef 100644 (file)
@@ -50,11 +50,6 @@ clear verbose
 
 
 // Create some configuration variables ================================
-// path of scilab main directory
-SCI=getenv('SCI');
-TMPDIR=getenv('TMPDIR')
-// use MSDOS syntax?
-MSDOS = (getos() == "Windows")
 PWD = getcwd()
 
 // Set LANGUAGE  ======================================================
@@ -130,7 +125,6 @@ exec("SCI/modules/others/etc/others.start",-1);
 [home,SCIHOME]=sethomedirectory();
 clear sethomedirectory ExistScilabHomeDirectory CreateScilabHomeDirectory
 if MSDOS then
-  SCI=strsubst(getshortpathname(SCI),'\','/');
   // path of scilab main directory for Windows
   WSCI=getlongpathname(pathconvert(SCI,%f,%f,'w'))
   clear pathconvert