Reorganization

build & load all modules

diff --git a/scilab/macros/buildmacros.sce b/scilab/macros/buildmacros.sce
index a6a70fb..eb81cc7 100644 (file)
--- a/scilab/macros/buildmacros.sce
+++ b/scilab/macros/buildmacros.sce
@@ -5,45 +5,55 @@ CurrentDirectory=pwd();
 
  Directories=["util"];
  
- Directories=[Directories;"SCI/modules/io/macros"];
- Directories=[Directories;"SCI/modules/incremental_link/macros"];
- Directories=[Directories;"SCI/modules/tfds/macros"];        
- Directories=[Directories;"SCI/modules/overloading/macros"];        
- Directories=[Directories;"SCI/modules/scilab2fortran/macros"];        
- Directories=[Directories;"SCI/modules/integer/macros"];        
- Directories=[Directories;"SCI/modules/differential_equations/macros"];        
- Directories=[Directories;"SCI/modules/core/macros"];        
- Directories=[Directories;"SCI/modules/linear_algebra/macros"];        
- Directories=[Directories;"SCI/modules/elementaries_functions/macros"];        
- Directories=[Directories;"SCI/modules/gui/macros"];        
- Directories=[Directories;"SCI/modules/statistics/macros"];      
- Directories=[Directories;"SCI/modules/cacsd/macros"];    
- Directories=[Directories;"SCI/modules/signal_processing/macros"];  
- Directories=[Directories;"SCI/modules/sparse/macros"];
- Directories=[Directories;"SCI/modules/polynomials/macros"];      
- Directories=[Directories;"SCI/modules/string/macros"];      
- Directories=[Directories;"SCI/modules/optimization/macros"];    
- Directories=[Directories;"SCI/modules/helptools/macros"];   
- Directories=[Directories;"SCI/modules/scipad/macros"];  
- Directories=[Directories;"SCI/modules/maple2scilab/macros"];
- Directories=[Directories;"SCI/modules/m2sci/macros"];
- Directories=[Directories;"SCI/modules/m2sci/macros/m2sci"];
- Directories=[Directories;"SCI/modules/m2sci/macros/mtlb"];
- Directories=[Directories;"SCI/modules/pvm/macros"];
- Directories=[Directories;"SCI/modules/graphics/macros"];
- Directories=[Directories;"SCI/modules/metanet/macros"];
- Directories=[Directories;"SCI/modules/sound/macros"];
- Directories=[Directories;"SCI/modules/tclsci/macros"];
- Directories=[Directories;"SCI/modules/time/macros"];
- 
+Directories=[Directories;"SCI/modules/arnoldi/macros"];
+Directories=[Directories;"SCI/modules/boolean/macros"];
+Directories=[Directories;"SCI/modules/cacsd/macros"];
+Directories=[Directories;"SCI/modules/core/macros"];
+Directories=[Directories;"SCI/modules/data_structures/macros"];
+Directories=[Directories;"SCI/modules/differential_equations/macros"];
+Directories=[Directories;"SCI/modules/double/macros"];
+Directories=[Directories;"SCI/modules/elementaries_functions/macros"];
+Directories=[Directories;"SCI/modules/fileio/macros"];
+Directories=[Directories;"SCI/modules/graphics/macros"];
+Directories=[Directories;"SCI/modules/gui/macros"];
+Directories=[Directories;"SCI/modules/helptools/macros"];
+Directories=[Directories;"SCI/modules/incremental_link/macros"];
+Directories=[Directories;"SCI/modules/integer/macros"];
+Directories=[Directories;"SCI/modules/interpolation/macros"];
+Directories=[Directories;"SCI/modules/intersci/macros"];
+Directories=[Directories;"SCI/modules/io/macros"];
+Directories=[Directories;"SCI/modules/Javasci/macros"];
+Directories=[Directories;"SCI/modules/jvm/macros"];
+Directories=[Directories;"SCI/modules/linear_algebra/macros"];
+Directories=[Directories;"SCI/modules/localization/macros"];
+Directories=[Directories;"SCI/modules/m2sci/macros"];
+Directories=[Directories;"SCI/modules/maple2scilab/macros"];
+Directories=[Directories;"SCI/modules/metanet/macros"];
+Directories=[Directories;"SCI/modules/mexlib/macros"];
+Directories=[Directories;"SCI/modules/optimization/macros"];
+Directories=[Directories;"SCI/modules/others/macros"];
+Directories=[Directories;"SCI/modules/overloading/macros"];
+Directories=[Directories;"SCI/modules/polynomials/macros"];
+Directories=[Directories;"SCI/modules/pvm/macros"];
+Directories=[Directories;"SCI/modules/randlib/macros"];
+Directories=[Directories;"SCI/modules/scilab2fortran/macros"];
+Directories=[Directories;"SCI/modules/scipad/macros"];
+Directories=[Directories;"SCI/modules/signal_processing/macros"];
+Directories=[Directories;"SCI/modules/sound/macros"];
+Directories=[Directories;"SCI/modules/sparse/macros"];
+Directories=[Directories;"SCI/modules/special_functions/macros"];
+Directories=[Directories;"SCI/modules/statistics/macros"];
+Directories=[Directories;"SCI/modules/string/macros"];
+Directories=[Directories;"SCI/modules/symbolic/macros"];
+Directories=[Directories;"SCI/modules/tclsci/macros"];
+Directories=[Directories;"SCI/modules/texmacs/macros"];
+Directories=[Directories;"SCI/modules/tfds/macros"];
+Directories=[Directories;"SCI/modules/time/macros"];
+Directories=[Directories;"SCI/modules/wintools/macros"];
  
 if %scicos then
-Directories=[Directories;
- "SCI/modules/scicos/macros";
- "SCI/modules/scicos/macros/scicos";
- "SCI/modules/scicos/macros/scicos_blocks";];
+Directories=[Directories;"SCI/modules/scicos/macros"];
 end
-
 Dim=size(Directories);
 
 

diff --git a/scilab/modules/Javasci/macros/buildmacros.sce b/scilab/modules/Javasci/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..3c26e91
--- /dev/null
+++ b/scilab/modules/Javasci/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2005\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+//genlib('javascilib','SCI/modules/Javasci/macros');\r
+//------------------------------------\r

diff --git a/scilab/modules/arnoldi/macros/buildmacros.sce b/scilab/modules/arnoldi/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..db9db3e
--- /dev/null
+++ b/scilab/modules/arnoldi/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2006\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+//genlib('arnoldilib','SCI/modules/arnoldi/macros');\r
+//------------------------------------\r

diff --git a/scilab/modules/boolean/macros/buildmacros.sce b/scilab/modules/boolean/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..a813a2a
--- /dev/null
+++ b/scilab/modules/boolean/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2005\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+//genlib('booleanlib','SCI/modules/boolean/macros');\r
+//------------------------------------\r

diff --git a/scilab/modules/data_structures/macros/buildmacros.sce b/scilab/modules/data_structures/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..2e52baf
--- /dev/null
+++ b/scilab/modules/data_structures/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2005\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+//genlib('dstructlib','SCI/modules/data_structures/macros');\r
+//------------------------------------\r

diff --git a/scilab/modules/double/macros/buildmacros.sce b/scilab/modules/double/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..01c08bd
--- /dev/null
+++ b/scilab/modules/double/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2005\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+//genlib('doublelib','SCI/modules/double/macros');\r
+//------------------------------------\r

diff --git a/scilab/modules/fileio/macros/buildmacros.sce b/scilab/modules/fileio/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..56b7bcb
--- /dev/null
+++ b/scilab/modules/fileio/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2006\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+genlib('fileiolib','SCI/modules/fileio/macros');\r
+//------------------------------------\r

diff --git a/scilab/macros/util/mputl.sci b/scilab/modules/fileio/macros/mputl.sci
similarity index 100%
rename from scilab/macros/util/mputl.sci
rename to scilab/modules/fileio/macros/mputl.sci

diff --git a/scilab/modules/interpolation/macros/buildmacros.sce b/scilab/modules/interpolation/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..987492b
--- /dev/null
+++ b/scilab/modules/interpolation/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2005\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+//genlib('interpolationlib','SCI/modules/interpolation/macros');\r
+//------------------------------------\r

diff --git a/scilab/modules/intersci/macros/buildmacros.sce b/scilab/modules/intersci/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..0809885
--- /dev/null
+++ b/scilab/modules/intersci/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2005\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+//genlib('interscilib','SCI/modules/intersci/macros');\r
+//------------------------------------\r

diff --git a/scilab/modules/jvm/etc/jvm.quit b/scilab/modules/jvm/etc/jvm.quit
new file mode 100644 (file)
index 0000000..1e33947
--- /dev/null
+++ b/scilab/modules/jvm/etc/jvm.quit
@@ -0,0 +1,16 @@
+// ====================================================================\r
+// This file contains command to be executed at the end \r
+// of a scilab session for jvm module\r
+// Copyright INRIA 2006\r
+// ====================================================================\r
+// delete help chapter\r
+global LANGUAGE\r
+\r
+if LANGUAGE == 'fr' then\r
+       //del_help_chapter("jvm");\r
+elseif LANGUAGE == 'eng' then\r
+       //del_help_chapter("jvm");\r
+end\r
+\r
+clear del_help_chapter LANGUAGE;\r
+// ====================================================================
\ No newline at end of file

diff --git a/scilab/modules/jvm/etc/jvm.start b/scilab/modules/jvm/etc/jvm.start
new file mode 100644 (file)
index 0000000..c1449ed
--- /dev/null
+++ b/scilab/modules/jvm/etc/jvm.start
@@ -0,0 +1,23 @@
+// ====================================================================\r
+// jvm module initialisation file \r
+// Copyright INRIA 2006\r
+// ====================================================================\r
+//Load  functions librarie\r
+//load('SCI/modules/jvm/macros/lib');\r
+// ====================================================================\r
+//add help chapter\r
+global LANGUAGE\r
+\r
+path = get_absolute_file_path('jvm.start');\r
+path = getshortpathname(path);\r
+\r
+if LANGUAGE == 'fr' then\r
+       path = pathconvert(part(path,1:(length(path)-5))+'/help/fr',%f,%f);\r
+       //add_help_chapter("jvm",path);\r
+elseif LANGUAGE == 'eng' then\r
+       path = pathconvert(part(path,1:(length(path)-5))+'/help/eng',%f,%f);\r
+       //add_help_chapter("jvm",path);\r
+end\r
+\r
+clear path get_absolute_file_path add_help_chapter LANGUAGE;\r
+// ====================================================================\r

diff --git a/scilab/modules/jvm/macros/buildmacros.sce b/scilab/modules/jvm/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..8b4b976
--- /dev/null
+++ b/scilab/modules/jvm/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2005\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+//genlib('jvmlib','SCI/modules/jvm/macros');\r
+//------------------------------------\r

diff --git a/scilab/modules/localization/etc/localization.quit b/scilab/modules/localization/etc/localization.quit
new file mode 100644 (file)
index 0000000..609f8d8
--- /dev/null
+++ b/scilab/modules/localization/etc/localization.quit
@@ -0,0 +1,16 @@
+// ====================================================================\r
+// This file contains command to be executed at the end \r
+// of a scilab session for localization module\r
+// Copyright INRIA 2006\r
+// ====================================================================\r
+// delete help chapter\r
+global LANGUAGE\r
+\r
+if LANGUAGE == 'fr' then\r
+       //del_help_chapter("localization");\r
+elseif LANGUAGE == 'eng' then\r
+       //del_help_chapter("localization");\r
+end\r
+\r
+clear del_help_chapter LANGUAGE;\r
+// ====================================================================
\ No newline at end of file

diff --git a/scilab/modules/localization/etc/localization.start b/scilab/modules/localization/etc/localization.start
new file mode 100644 (file)
index 0000000..e2df11c
--- /dev/null
+++ b/scilab/modules/localization/etc/localization.start
@@ -0,0 +1,23 @@
+// ====================================================================\r
+// localization module initialisation file \r
+// Copyright INRIA 2006\r
+// ====================================================================\r
+//Load  functions librarie\r
+//load('SCI/modules/localization/macros/lib');\r
+// ====================================================================\r
+//add help chapter\r
+global LANGUAGE\r
+\r
+path = get_absolute_file_path('localization.start');\r
+path = getshortpathname(path);\r
+\r
+if LANGUAGE == 'fr' then\r
+       path = pathconvert(part(path,1:(length(path)-5))+'/help/fr',%f,%f);\r
+       //add_help_chapter("localization",path);\r
+elseif LANGUAGE == 'eng' then\r
+       path = pathconvert(part(path,1:(length(path)-5))+'/help/eng',%f,%f);\r
+       //add_help_chapter("localization",path);\r
+end\r
+\r
+clear path get_absolute_file_path add_help_chapter LANGUAGE;\r
+// ====================================================================\r

diff --git a/scilab/modules/localization/macros/buildmacros.sce b/scilab/modules/localization/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..5d287bb
--- /dev/null
+++ b/scilab/modules/localization/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2005\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+//genlib('localizationlib','SCI/modules/localization/macros');\r
+//------------------------------------\r

diff --git a/scilab/modules/m2sci/macros/buildmacros.sce b/scilab/modules/m2sci/macros/buildmacros.sce
index ddd09df..7494a10 100644 (file)
--- a/scilab/modules/m2sci/macros/buildmacros.sce
+++ b/scilab/modules/m2sci/macros/buildmacros.sce
@@ -6,3 +6,11 @@ TMPDIR=getenv('TMPDIR');
 //------------------------------------
 genlib('libm2sci','SCI/modules/m2sci/macros');
 //------------------------------------
+disp('-- Creation of [SCI/modules/m2sci/macros/m2sci] (Macros) --');
+chdir('SCI/modules/m2sci/macros/m2sci'); 
+exec('buildmacros.sce',-1);
+//------------------------------------
+disp('-- Creation of [SCI/modules/m2sci/macros/mtlb] (Macros) --');
+chdir('SCI/modules/m2sci/macros/mtlb'); 
+exec('buildmacros.sce',-1);
+//------------------------------------
\ No newline at end of file

diff --git a/scilab/modules/mexlib/etc/mexlib.quit b/scilab/modules/mexlib/etc/mexlib.quit
new file mode 100644 (file)
index 0000000..9340272
--- /dev/null
+++ b/scilab/modules/mexlib/etc/mexlib.quit
@@ -0,0 +1,16 @@
+// ====================================================================\r
+// This file contains command to be executed at the end \r
+// of a scilab session for mexlib module\r
+// Copyright INRIA 2006\r
+// ====================================================================\r
+// delete help chapter\r
+global LANGUAGE\r
+\r
+if LANGUAGE == 'fr' then\r
+       //del_help_chapter("mexlib");\r
+elseif LANGUAGE == 'eng' then\r
+       //del_help_chapter("mexlib");\r
+end\r
+\r
+clear del_help_chapter LANGUAGE;\r
+// ====================================================================\r

diff --git a/scilab/modules/mexlib/etc/mexlib.start b/scilab/modules/mexlib/etc/mexlib.start
new file mode 100644 (file)
index 0000000..2d64b4d
--- /dev/null
+++ b/scilab/modules/mexlib/etc/mexlib.start
@@ -0,0 +1,23 @@
+// ====================================================================\r
+// signal_processing module initialisation file \r
+// Copyright INRIA 2006\r
+// ====================================================================\r
+//Load  functions librarie\r
+//load('SCI/modules/mexlib/macros/lib');\r
+// ====================================================================\r
+//add help chapter\r
+global LANGUAGE\r
+\r
+path = get_absolute_file_path('mexlib.start');\r
+path = getshortpathname(path);\r
+\r
+if LANGUAGE == 'fr' then\r
+       path = pathconvert(part(path,1:(length(path)-5))+'/help/fr',%f,%f);\r
+       //add_help_chapter("mexlib",path);\r
+elseif LANGUAGE == 'eng' then\r
+       path = pathconvert(part(path,1:(length(path)-5))+'/help/eng',%f,%f);\r
+       //add_help_chapter("mexlib",path);\r
+end\r
+\r
+clear path get_absolute_file_path add_help_chapter LANGUAGE;\r
+// ====================================================================\r

diff --git a/scilab/modules/mexlib/macros/buildmacros.sce b/scilab/modules/mexlib/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..dffda63
--- /dev/null
+++ b/scilab/modules/mexlib/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2005\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+//genlib('mexliblib','SCI/modules/mexlib/macros');\r
+//------------------------------------\r

diff --git a/scilab/macros/util/bloc2ss.sci b/scilab/modules/others/macros/bloc2ss.sci
similarity index 100%
rename from scilab/macros/util/bloc2ss.sci
rename to scilab/modules/others/macros/bloc2ss.sci

diff --git a/scilab/modules/others/macros/buildmacros.sce b/scilab/modules/others/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..c98fc5b
--- /dev/null
+++ b/scilab/modules/others/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2005\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+genlib('otherslib','SCI/modules/others/macros');\r
+//------------------------------------\r

diff --git a/scilab/modules/randlib/macros/buildmacros.sce b/scilab/modules/randlib/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..567caa1
--- /dev/null
+++ b/scilab/modules/randlib/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2005\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+//genlib('randliblib','SCI/modules/randlib/macros');\r
+//------------------------------------\r

diff --git a/scilab/modules/scicos/macros/buildmacros.sce b/scilab/modules/scicos/macros/buildmacros.sce
index 8598343..933becb 100644 (file)
--- a/scilab/modules/scicos/macros/buildmacros.sce
+++ b/scilab/modules/scicos/macros/buildmacros.sce
@@ -6,3 +6,11 @@ TMPDIR=getenv('TMPDIR');
 //------------------------------------
 genlib('libscicos','SCI/modules/scicos/macros');
 //------------------------------------
+disp('-- Creation of [SCI/modules/scicos/macros/scicos] (Macros) --');
+chdir('SCI/modules/scicos/macros/scicos'); 
+exec('buildmacros.sce',-1);
+//------------------------------------
+disp('-- Creation of [SCI/modules/scicos/macros/scicos_blocks] (Macros) --');
+chdir('SCI/modules/scicos/macros/scicos_blocks'); 
+exec('buildmacros.sce',-1);
+//------------------------------------
\ No newline at end of file

diff --git a/scilab/modules/signal_processing/etc/signal.quit b/scilab/modules/signal_processing/etc/signal_processing.quit
similarity index 100%
rename from scilab/modules/signal_processing/etc/signal.quit
rename to scilab/modules/signal_processing/etc/signal_processing.quit

diff --git a/scilab/modules/signal_processing/etc/signal.start b/scilab/modules/signal_processing/etc/signal_processing.start
similarity index 93%
rename from scilab/modules/signal_processing/etc/signal.start
rename to scilab/modules/signal_processing/etc/signal_processing.start
index ef53db7..9791a7b 100644 (file)
--- a/scilab/modules/signal_processing/etc/signal.start
+++ b/scilab/modules/signal_processing/etc/signal_processing.start
@@ -8,7 +8,7 @@ load('SCI/modules/signal_processing/macros/lib');
 //add help chapter
 global LANGUAGE
 
-path = get_absolute_file_path('signal.start');
+path = get_absolute_file_path('signal_processing.start');
 path = getshortpathname(path);
 
 if LANGUAGE == 'fr' then

diff --git a/scilab/modules/special_functions/macros/buildmacros.sce b/scilab/modules/special_functions/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..dc807d6
--- /dev/null
+++ b/scilab/modules/special_functions/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2005\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+//genlib('specfunlib','SCI/modules/special_functions/macros');\r
+//------------------------------------\r

diff --git a/scilab/modules/symbolic/macros/buildmacros.sce b/scilab/modules/symbolic/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..0404b00
--- /dev/null
+++ b/scilab/modules/symbolic/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2005\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+//genlib('symboliclib','SCI/modules/symbolic/macros');\r
+//------------------------------------\r

diff --git a/scilab/modules/texmacs/macros/buildmacros.sce b/scilab/modules/texmacs/macros/buildmacros.sce
index 2f1d7c4..768a347 100644 (file)
--- a/scilab/modules/texmacs/macros/buildmacros.sce
+++ b/scilab/modules/texmacs/macros/buildmacros.sce
@@ -4,5 +4,5 @@
 SCI=getenv('SCI'); 
 TMPDIR=getenv('TMPDIR');
 //------------------------------------
-genlib('texmacslib','SCI/modules/texmacs/macros/texmacs');
+genlib('texmacslib','SCI/modules/texmacs/macros');
 //------------------------------------

diff --git a/scilab/modules/wintools/macros/buildmacros.sce b/scilab/modules/wintools/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..e6ca828
--- /dev/null
+++ b/scilab/modules/wintools/macros/buildmacros.sce
@@ -0,0 +1,8 @@
+//------------------------------------\r
+// Allan CORNET INRIA 2006\r
+//------------------------------------\r
+SCI=getenv('SCI'); \r
+TMPDIR=getenv('TMPDIR');\r
+//------------------------------------\r
+//genlib('wintoolslib','SCI/modules/wintools/macros');\r
+//------------------------------------\r

diff --git a/scilab/scilab.start b/scilab/scilab.start
index c32a0d9..01f8d46 100644 (file)
--- a/scilab/scilab.start
+++ b/scilab/scilab.start
@@ -48,16 +48,67 @@ if verbose then
 end 
 clear verbose
 
-// use MSDOS syntax?
-MSDOS = (getos() == "Windows")
-
-load('SCI/macros/util/lib')
 
 // Create some configuration variables ================================
 // path of scilab main directory
 SCI=getenv('SCI');
 TMPDIR=getenv('TMPDIR')
+// use MSDOS syntax?
+MSDOS = (getos() == "Windows")
 PWD = getcwd()
+
+// loads modules ======================================================
+load('SCI/macros/util/lib')
+
+exec("SCI/modules/helptools/etc/helptools.start",-1);
+exec("SCI/modules/core/etc/core.start",-1);
+exec("SCI/modules/io/etc/io.start",-1);
+exec("SCI/modules/arnoldi/etc/arnoldi.start",-1);
+exec("SCI/modules/boolean/etc/boolean.start",-1);
+exec("SCI/modules/cacsd/etc/cacsd.start",-1);
+exec("SCI/modules/data_structures/etc/data_structures.start",-1);
+exec("SCI/modules/differential_equations/etc/differential_equations.start",-1);
+exec("SCI/modules/double/etc/double.start",-1);
+exec("SCI/modules/elementaries_functions/etc/elementaries_functions.start",-1);
+exec("SCI/modules/fileio/etc/fileio.start",-1);
+exec("SCI/modules/graphics/etc/graphics.start",-1);
+exec("SCI/modules/gui/etc/gui.start",-1);
+exec("SCI/modules/incremental_link/etc/incremental_link.start",-1);
+exec("SCI/modules/integer/etc/integer.start",-1);
+exec("SCI/modules/interpolation/etc/interpolation.start",-1);
+exec("SCI/modules/intersci/etc/intersci.start",-1);
+exec("SCI/modules/jvm/etc/jvm.start",-1);
+exec("SCI/modules/linear_algebra/etc/linear_algebra.start",-1);
+exec("SCI/modules/localization/etc/localization.start",-1);
+exec("SCI/modules/optimization/etc/optimization.start",-1);
+exec("SCI/modules/overloading/etc/overloading.start",-1);
+exec("SCI/modules/polynomials/etc/polynomials.start",-1);
+exec("SCI/modules/randlib/etc/randlib.start",-1);
+exec("SCI/modules/signal_processing/etc/signal_processing.start",-1);
+exec("SCI/modules/sparse/etc/sparse.start",-1);
+exec("SCI/modules/special_functions/etc/special_functions.start",-1);
+exec("SCI/modules/statistics/etc/statistics.start",-1);
+exec("SCI/modules/string/etc/string.start",-1);
+exec("SCI/modules/symbolic/etc/symbolic.start",-1);
+exec("SCI/modules/time/etc/time.start",-1);
+exec("SCI/modules/wintools/etc/wintools.start",-1);
+exec("SCI/modules/Javasci/etc/Javasci.start",-1);
+exec("SCI/modules/m2sci/etc/m2sci.start",-1);
+exec("SCI/modules/maple2scilab/etc/maple2scilab.start",-1);
+
+exec("SCI/modules/mexlib/etc/mexlib.start",-1);
+exec("SCI/modules/pvm/etc/pvm.start",-1);
+exec("SCI/modules/scicos/etc/scicos.start",-1);
+exec("SCI/modules/scilab2fortran/etc/scilab2fortran.start",-1);
+exec("SCI/modules/scipad/etc/scipad.start",-1);
+exec("SCI/modules/sound/etc/sound.start",-1);
+exec("SCI/modules/tclsci/etc/tclsci.start",-1);
+exec("SCI/modules/texmacs/etc/texmacs.start",-1);
+exec("SCI/modules/tfds/etc/tfds.start",-1);
+exec("SCI/modules/metanet/etc/metanet.start",-1);
+exec("SCI/modules/others/etc/others.start",-1);
+
+// Create some configuration variables ================================
 [home,SCIHOME]=sethomedirectory();
 clear sethomedirectory ExistScilabHomeDirectory CreateScilabHomeDirectory
 if MSDOS then
@@ -88,45 +139,6 @@ if larg<>[] & larg<=size(args,"*") then
 end
 clear  larg L
 
- exec("SCI/modules/helptools/etc/helptools.start",-1);
-
-exec("SCI/modules/io/etc/io.start",-1);
- exec("SCI/modules/incremental_link/etc/incremental_link.start",-1);
- exec("SCI/modules/tfds/etc/tfds.start",-1);
- exec("SCI/modules/overloading/etc/overloading.start",-1);
- exec("SCI/modules/scilab2fortran/etc/scilab2fortran.start",-1);
- exec("SCI/modules/data_structures/etc/data_structures.start",-1);
- exec("SCI/modules/interpolation/etc/interpolation.start",-1);
- exec("SCI/modules/double/etc/double.start",-1);
- exec("SCI/modules/integer/etc/integer.start",-1);
- exec("SCI/modules/intersci/etc/intersci.start",-1);
- exec("SCI/modules/differential_equations/etc/differential_equations.start",-1);
- exec("SCI/modules/core/etc/core.start",-1);
- exec("SCI/modules/special_functions/etc/special_functions.start",-1);
- exec("SCI/modules/linear_algebra/etc/linear_algebra.start",-1);
- exec("SCI/modules/elementaries_functions/etc/elementaries_functions.start",-1);
- exec("SCI/modules/gui/etc/gui.start",-1);
- exec("SCI/modules/statistics/etc/statistics.start",-1);
- exec("SCI/modules/cacsd/etc/cacsd.start",-1);
- exec("SCI/modules/signal_processing/etc/signal.start",-1);
- exec("SCI/modules/sparse/etc/sparse.start",-1);
- exec("SCI/modules/arnoldi/etc/arnoldi.start",-1);
- exec("SCI/modules/polynomials/etc/polynomials.start",-1);
- exec("SCI/modules/wintools/etc/wintools.start",-1);
- exec("SCI/modules/string/etc/string.start",-1);
- exec("SCI/modules/optimization/etc/optimization.start",-1);
- exec("SCI/modules/scipad/etc/scipad.start",-1);
- exec("SCI/modules/maple2scilab/etc/maple2scilab.start",-1);
- exec("SCI/modules/m2sci/etc/m2sci.start",-1);
- exec("SCI/modules/graphics/etc/graphics.start",-1);
- exec("SCI/modules/Javasci/etc/javasci.start",-1);
- exec("SCI/modules/metanet/etc/metanet.start",-1);
- exec("SCI/modules/sound/etc/sound.start",-1);
- exec("SCI/modules/tclsci/etc/tclsci.start",-1);
- exec("SCI/modules/time/etc/time.start",-1);
- exec("SCI/modules/scicos/etc/scicos.start",-1);
- exec("SCI/modules/pvm/etc/pvm.start",-1);
- exec("SCI/modules/texmacs/etc/texmacs.start",-1);
  
  // Define Initial demo tables, ========================================
 //demolist is a two column matrix of strings

diff --git a/scilab/util/genmacros.sce b/scilab/util/genmacros.sce
index 6e1f141..f685905 100644 (file)
--- a/scilab/util/genmacros.sce
+++ b/scilab/util/genmacros.sce
@@ -26,7 +26,10 @@ function RemoveMinimalMacros()
     unix('if EXIST ""'+'OS_Version.bin'+'"" del /F ""'+'OS_Version.bin'+'""');
     unix('if EXIST ""'+'isdir.bin'+'"" del /F ""'+'isdir.bin'+'""');
     unix('if EXIST ""'+'basename.bin'+'"" del /F ""'+'basename.bin'+'""');
+    
+    chdir(SCI+'/modules/fileio/macros');
     unix('if EXIST ""'+'mputl.bin'+'"" del /F ""'+'mputl.bin'+'""');
+    
     chdir(SCI+'/modules/overloading/macros');
     unix('if EXIST ""'+'%c_a_c.bin'+'"" del /F ""'+'%c_a_c.bin'+'""');
     chdir(CurrentDir);
@@ -42,7 +45,7 @@ function RemoveMinimalMacros()
     unix('rm -f '+SCI+'/macros/util/isdir.bin');
     unix('rm -f '+SCI+'/modules/overloading/macros/%c_a_c.bin');
     unix('rm -f '+SCI+'/macros/util/basename.bin');
-    unix('rm -f '+SCI+'/macros/util/mputl.bin');
+    unix('rm -f '+SCI+'/modules/fileio/macros/mputl.bin');
   end
   clear MSDOS;
   clear SCI;
@@ -75,7 +78,7 @@ function BuildMinimalMacros()
   unix(startline+cmd+endline);
   unix(SCI+LineToDo);
 
-  cmd=scilabstart+'getf(SCI+''/macros/util/mputl.sci'');save(SCI+''/macros/util/mputl.bin'');'+scilabquit;
+  cmd=scilabstart+'getf(SCI+''/modules/fileio/macros/mputl.sci'');save(SCI+''/modules/fileio/macros/mputl.bin'');'+scilabquit;
   unix(startline+cmd+endline);
   unix(SCI+LineToDo);
   
@@ -150,7 +153,7 @@ load(SCI+'/macros/util/OS_Version.bin');
 load(SCI+'/macros/util/isdir.bin');
 load(SCI+'/modules/overloading/macros/%c_a_c.bin');
 load(SCI+'/macros/util/basename.bin');
-load(SCI+'/macros/util/mputl.bin');
+load(SCI+'/modules/fileio/macros/mputl.bin');
 load(SCI+'/macros/util/genlib.bin');
 clear SCI;
 // Need to remove macros binary files before build by genlib