From: nadir Date: Tue, 18 Nov 2003 09:11:34 +0000 (+0000) Subject: merge with the branch br_for_V1_3_0_b1 (branch to build the V1_3_0 version of X-Git-Tag: V1_3_0_b2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a37761f690edc00761f6acbcde2652c7c5b21273;p=tools%2Fmedcoupling.git merge with the branch br_for_V1_3_0_b1 (branch to build the V1_3_0 version of the module. --- diff --git a/doc/html/INPUT/HTML/Med_Gen.html b/doc/html/INPUT/HTML/Med_Gen.html index b3e7758e0..44b43940b 100644 --- a/doc/html/INPUT/HTML/Med_Gen.html +++ b/doc/html/INPUT/HTML/Med_Gen.html @@ -1,7 +1,7 @@ - + diff --git a/doc/html/INPUT/doxyfile b/doc/html/INPUT/doxyfile index bce8b4633..a866cb0cc 100755 --- a/doc/html/INPUT/doxyfile +++ b/doc/html/INPUT/doxyfile @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # General configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME PRO - MED - v.1.2" +PROJECT_NAME = "SALOME - MED - v.1.3.0" PROJECT_NUMBER = id#1.1 OUTPUT_DIRECTORY = ../ OUTPUT_LANGUAGE = English @@ -57,7 +57,7 @@ WARN_LOGFILE = log.txt # configuration options related to the input files #--------------------------------------------------------------------------- INPUT = ../../../share/salome/idl/MED.idl \ - ../../../share/salome/idl/Med_Gen.idl + ../../../share/salome/idl/MED_Gen.idl FILE_PATTERNS = RECURSIVE = NO EXCLUDE = diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in index d52af4892..d364ac76d 100644 --- a/doc/html/Makefile.in +++ b/doc/html/Makefile.in @@ -6,6 +6,7 @@ # # source path top_srcdir=@top_srcdir@ +root_srcdir=@ROOT_SRCDIR@ top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@ @@ -16,7 +17,7 @@ doxygen=@DOXYGEN@ doc: cp -fr $(srcdir)/INPUT ./; \ cd INPUT; \ - sed 's|../../../share/salome|../$(top_srcdir)|' doxyfile > doxyfile1; \ + sed 's|../../../share/salome|$(root_srcdir)|' doxyfile > doxyfile1; \ mv -f doxyfile1 doxyfile; \ $(doxygen) ./doxyfile; \ cd ..; \
interface Med_Gen
interface MED_Gen
IDL file
Python