summaryrefslogtreecommitdiffstats
path: root/scilab/modules/helptools
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-02-12 08:55:20 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-02-12 08:55:20 +0100
commit799529ce497fcc5c8b7cc6c4ce2de5a697b6c36e (patch)
tree0e0a15b5433b1883829b53c7193046b18ce8d8d3 /scilab/modules/helptools
parent5cab8be6b0af1c1c11316619f2aa2e5a4c70b308 (diff)
downloadscilab-799529ce497fcc5c8b7cc6c4ce2de5a697b6c36e.zip
scilab-799529ce497fcc5c8b7cc6c4ce2de5a697b6c36e.tar.gz
%helps_module defined only when we need
Diffstat (limited to 'scilab/modules/helptools')
-rw-r--r--scilab/modules/helptools/etc/helptools.quit5
-rw-r--r--scilab/modules/helptools/etc/helptools.start5
-rw-r--r--scilab/modules/helptools/macros/add_module_help_chapter.sci8
-rw-r--r--scilab/modules/helptools/macros/check_help.sci6
-rw-r--r--scilab/modules/helptools/macros/extract_help_examples.sci6
-rw-r--r--scilab/modules/helptools/macros/find_links.sci6
-rw-r--r--scilab/modules/helptools/macros/manedit.sci6
-rw-r--r--scilab/modules/helptools/macros/xmltoformat.sci10
8 files changed, 36 insertions, 16 deletions
diff --git a/scilab/modules/helptools/etc/helptools.quit b/scilab/modules/helptools/etc/helptools.quit
index 83097f4..8a0f997 100644
--- a/scilab/modules/helptools/etc/helptools.quit
+++ b/scilab/modules/helptools/etc/helptools.quit
@@ -8,8 +8,3 @@
8// are also available at 8// are also available at
9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 10
11// Delete help chapter
12// =============================================================================
13if WITH_HELPTOOLS then
14 del_help_chapter("helptools",%t);
15end
diff --git a/scilab/modules/helptools/etc/helptools.start b/scilab/modules/helptools/etc/helptools.start
index 5f9af34..afd1ef9 100644
--- a/scilab/modules/helptools/etc/helptools.start
+++ b/scilab/modules/helptools/etc/helptools.start
@@ -12,8 +12,3 @@
12// ============================================================================= 12// =============================================================================
13load('SCI/modules/helptools/macros/lib'); 13load('SCI/modules/helptools/macros/lib');
14 14
15// Add help chapter
16// =============================================================================
17if WITH_HELPTOOLS then
18 add_module_help_chapter("helptools");
19end
diff --git a/scilab/modules/helptools/macros/add_module_help_chapter.sci b/scilab/modules/helptools/macros/add_module_help_chapter.sci
index c1f36af..f98ae65 100644
--- a/scilab/modules/helptools/macros/add_module_help_chapter.sci
+++ b/scilab/modules/helptools/macros/add_module_help_chapter.sci
@@ -19,10 +19,8 @@ function add_module_help_chapter(modulename)
19 path_addchapter = SCI+"/modules/"+modulename+"/help/"+getdefaultlanguage()+"/addchapter.sce"; 19 path_addchapter = SCI+"/modules/"+modulename+"/help/"+getdefaultlanguage()+"/addchapter.sce";
20 end 20 end
21 21
22 //try 22 if ( fileinfo(path_addchapter) <> [] ) then
23 exec(path_addchapter); 23 exec(path_addchapter);
24 //catch 24 end
25 // warning(gettext("Incorrect module path ")+path_addchapter);
26 //end
27 25
28endfunction 26endfunction
diff --git a/scilab/modules/helptools/macros/check_help.sci b/scilab/modules/helptools/macros/check_help.sci
index d5cf3ac..868d4d5 100644
--- a/scilab/modules/helptools/macros/check_help.sci
+++ b/scilab/modules/helptools/macros/check_help.sci
@@ -39,6 +39,12 @@ function check_help(dirs)
39 39
40 global %helps; 40 global %helps;
41 global %helps_modules 41 global %helps_modules
42 if %helps_modules == [] then
43 moduleslist = getmodules();
44 for i = 1:size(moduleslist,'*')
45 add_module_help_chapter(moduleslist(i));
46 end
47 end
42 %HELPS=[%helps_modules;%helps]; 48 %HELPS=[%helps_modules;%helps];
43 dirs_to_build = %HELPS; 49 dirs_to_build = %HELPS;
44 clear %HELPS; 50 clear %HELPS;
diff --git a/scilab/modules/helptools/macros/extract_help_examples.sci b/scilab/modules/helptools/macros/extract_help_examples.sci
index d163f85..866dbfa 100644
--- a/scilab/modules/helptools/macros/extract_help_examples.sci
+++ b/scilab/modules/helptools/macros/extract_help_examples.sci
@@ -17,6 +17,12 @@ function extract_help_examples(dirpaths)
17 17
18 global %helps 18 global %helps
19 global %helps_modules 19 global %helps_modules
20 if %helps_modules == [] then
21 moduleslist = getmodules();
22 for i = 1:size(moduleslist,'*')
23 add_module_help_chapter(moduleslist(i));
24 end
25 end
20 %HELPS=[%helps_modules;%helps]; 26 %HELPS=[%helps_modules;%helps];
21 27
22 logfile=mopen('extract_help_examples.log','w') 28 logfile=mopen('extract_help_examples.log','w')
diff --git a/scilab/modules/helptools/macros/find_links.sci b/scilab/modules/helptools/macros/find_links.sci
index d4d3069..49da177 100644
--- a/scilab/modules/helptools/macros/find_links.sci
+++ b/scilab/modules/helptools/macros/find_links.sci
@@ -98,6 +98,12 @@ function t=getlink(name,absolute_path,path)
98 98
99 global %helps; 99 global %helps;
100 global %helps_modules; 100 global %helps_modules;
101 if %helps_modules == [] then
102 moduleslist = getmodules();
103 for i = 1:size(moduleslist,'*')
104 add_module_help_chapter(moduleslist(i));
105 end
106 end
101 %HELPS=[%helps_modules;%helps]; 107 %HELPS=[%helps_modules;%helps];
102 108
103 name=stripblanks(name) 109 name=stripblanks(name)
diff --git a/scilab/modules/helptools/macros/manedit.sci b/scilab/modules/helptools/macros/manedit.sci
index 4b228026..eace0e4 100644
--- a/scilab/modules/helptools/macros/manedit.sci
+++ b/scilab/modules/helptools/macros/manedit.sci
@@ -46,6 +46,12 @@ function path = get_item_xml_path(manitem)
46 46
47 global %helps 47 global %helps
48 global %helps_modules; 48 global %helps_modules;
49 if %helps_modules == [] then
50 moduleslist = getmodules();
51 for i = 1:size(moduleslist,'*')
52 add_module_help_chapter(moduleslist(i));
53 end
54 end
49 %HELPS=[%helps_modules;%helps]; 55 %HELPS=[%helps_modules;%helps];
50 56
51 for k=1:size(%HELPS(:,1),'*') 57 for k=1:size(%HELPS(:,1),'*')
diff --git a/scilab/modules/helptools/macros/xmltoformat.sci b/scilab/modules/helptools/macros/xmltoformat.sci
index 6757b89..1a4218d 100644
--- a/scilab/modules/helptools/macros/xmltoformat.sci
+++ b/scilab/modules/helptools/macros/xmltoformat.sci
@@ -30,7 +30,15 @@ function generated_files = xmltoformat(output_format,dirs,titles,directory_langu
30 30
31 global %helps; 31 global %helps;
32 global %helps_modules; 32 global %helps_modules;
33 %HELPS=[%helps_modules;%helps]; 33
34 if %helps_modules == [] then
35 moduleslist = getmodules();
36 for i = 1:size(moduleslist,'*')
37 add_module_help_chapter(moduleslist(i));
38 end
39 end
40
41 %HELPS = [%helps_modules; %helps];
34 42
35 SCI_long = pathconvert(getlongpathname(SCI),%F,%F); 43 SCI_long = pathconvert(getlongpathname(SCI),%F,%F);
36 44