Changeset 9308

Timestamp:

08/11/11 17:00:01 (14 years ago)

Author:

Mathieu Morlighem

Message:

some fixing

Location:

issm/trunk/doxygen

Files:

• createchtmldoc.sh (moved) (moved from issm/trunk/doxygen/doc_c/createchtmldoc.sh ) (1 diff)
• creatematlabhtmldoc.sh (moved) (moved from issm/trunk/doxygen/doc_m/creatematlabhtmldoc.sh ) (2 diffs)
• doc_c/doxygen.config (modified) (1 diff)

issm/trunk/doxygen/createchtmldoc.sh

@@ -8 +8 @@
 
 #Symlink the doxygen configuration file to root dir.
-ln -s "$ISSM_DIR/website/doc_c/doxygen.config" ./doxygen.config
-ln -s "$ISSM_DIR/website/doc_c/doxygenissm.css" ./doxygenissm.css
-ln -s "$ISSM_DIR/website/doc_c/layoutissm.xml" ./layoutissm.xml
+ln -s "$ISSM_TIER/doxygen/doc_c/doxygen.config" ./doxygen.config
+ln -s "$ISSM_TIER/doxygen/doc_c/doxygenissm.css" ./doxygenissm.css
+ln -s "$ISSM_TIER/doxygen/doc_c/layoutissm.xml" ./layoutissm.xml
 
 #Run doxygen

issm/trunk/doxygen/creatematlabhtmldoc.sh

@@ -2 +2 @@
 
 #remove previous doc
-rm -rf "$ISSM_TIER/doc/website/doc_m/matlabhtml"
+rm -rf "$ISSM_TIER/doxygen/doc_m/matlabhtml"
 
 #copy issm_template in m2html
-cd "$ISSM_TIER/externalpackages/m2html/install/templates"
-ln -s "$ISSM_TIER/../website/doc_m/template_issm" ./template_issm
+cd $ISSM_TIER/externalpackages/m2html/install/templates
+ln -s $ISSM_TIER/doxygen/doc_m/template_issm ./template_issm
 
 #go to the main directory
@@ -13 +13 @@
 #launch matlab
 matlab -nodisplay << EOF
-        %get ISSM_TIER, brief name
-        [status,ISSM_TIER_BRIEF]=system('basename `pwd`');
-        ISSM_TIER_BRIEF=ISSM_TIER_BRIEF(1:end-1); %skip the \n character
-        if status~=0 | isempty(ISSM_TIER_BRIEF) | length(ISSM_TIER_BRIEF)==1,
-                error('startup error message: could not retrieve ISSM_TIER brief name');
-        end
 
         %Add m2html in path
-        addpath(genpath_ice([ISSM_TIER '/externalpackages/m2html/install']));
-
-        cd ../
+        addpath(genpath_ice([issmtier() '/externalpackages/m2html/install']));
 
         %Here are the subdirectories we want to go through:
-        mfiles={[ISSM_TIER_BRIEF '/src/m']};
-        %mfiles={[ISSM_TIER_BRIEF '/src/m/classes/public/plot']};
+        mfiles={'src/m'};
 
         %run m2html, and dump the documentation in ISSM_TIER/doc/website/doc_m/matlabhtml
-        m2html('htmldir',[ISSM_TIER '/../website/doc_m/matlabhtml'],'recursive','on','source','on',...
+        m2html('htmldir',[issmtier() '/doxygen/doc_m/matlabhtml'],'recursive','on','source','on',...
         'syntaxHighlighting','on','globalHypertextLinks','on','global','on','template','template_issm',...
-        'graph','on','index','menu','mFiles',mfiles);
+        'graph','off','index','menu','mFiles',mfiles);
 EOF
 

issm/trunk/doxygen/doc_c/doxygen.config

@@ -39 +39 @@
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       =  ../website/doc_c
+OUTPUT_DIRECTORY       =  ./doxygen/doc_c/
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create