|
From: Eric E. <eri...@us...> - 2006-08-28 10:02:45
|
Update of /cvsroot/objecthandler/ObjectHandler/Docs In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21619/Docs Modified Files: .cvsignore Makefile.am objecthandler.doxy oh_footer.html oh_header.html oh_headeronline.html Added Files: Makefile.vc docs.vcproj docs_vc8.vcproj Removed Files: ObjectHandler-docs.hhp Log Message: merge R000104f0-branch Index: oh_footer.html =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Docs/oh_footer.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** oh_footer.html 19 May 2006 15:12:41 -0000 1.1 --- oh_footer.html 28 Aug 2006 10:02:10 -0000 1.2 *************** *** 4,8 **** <tr> ! <td><img src="menu_bottom.jpg" alt="menu bottom" border="0" width="185" height="13"></td> <td></td> </tr> --- 4,8 ---- <tr> ! <td><img src="images/menu_bottom.jpg" alt="menu bottom" border="0" width="185" height="13"></td> <td></td> </tr> --- NEW FILE: docs_vc8.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="8.00" Name="docs" ProjectGUID="{74479EEA-CD1C-487E-8D31-F3EBF506ED40}" Keyword="MakeFileProj" > <Platforms> <Platform Name="Win32" /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="All|Win32" OutputDirectory="build\vc" IntermediateDirectory="build\vc" ConfigurationType="0" > <Tool Name="VCNMakeTool" BuildCommandLine="NMAKE /f "Makefile.vc"" ReBuildCommandLine="NMAKE /f "Makefile.vc" /a" CleanCommandLine="NMAKE /f "Makefile.vc" /clean" Output="" PreprocessorDefinitions="WIN32;_DEBUG" IncludeSearchPath="" ForcedIncludes="" AssemblySearchPath="" ForcedUsingAssemblies="" CompileAsManaged="" /> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="pages" > <File RelativePath=".\pages\design.docs" > </File> <File RelativePath=".\pages\examples.docs" > </File> <File RelativePath=".\pages\excelbinding.docs" > </File> <File RelativePath=".\pages\history.docs" > </File> <File RelativePath=".\pages\index.docs" > </File> <File RelativePath=".\pages\installation.docs" > </File> <File RelativePath=".\pages\license.docs" > </File> <File RelativePath=".\pages\ohfunctions.docs" > </File> <File RelativePath=".\pages\people.docs" > </File> </Filter> <File RelativePath=".\Makefile.vc" > </File> <File RelativePath=".\objecthandler.doxy" > </File> <File RelativePath=".\oh_footer.html" > </File> <File RelativePath=".\oh_header.html" > </File> <File RelativePath=".\oh_headeronline.html" > </File> <File RelativePath=".\style.css" > </File> </Files> <Globals> </Globals> </VisualStudioProject> Index: oh_headeronline.html =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Docs/oh_headeronline.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** oh_headeronline.html 19 May 2006 15:12:41 -0000 1.1 --- oh_headeronline.html 28 Aug 2006 10:02:10 -0000 1.2 *************** *** 14,35 **** <tr valign="top"> ! <td background="menu_middle.jpg"> <table class="layout" cellpadding=0 cellspacing=0> <tr> ! <td colspan="3"><img src="menu_0.jpg" alt="menu" border="0" width="185" height="25"></td> </tr> <tr> ! <td><img src="menu_1_0.jpg" alt="menu" border="0" width="25" height="65"></td> ! <td align=center><a href="http://quantlib.org/"><img src="logo_ql.jpg" alt="QuantLib Logo" border="0" width="125" height="65"></a></td> ! <td><img src="menu_1_2.jpg" alt="menu" border="0" width="35" height="65"></td> </tr> <tr> ! <td colspan="3"><img src="menu_2.jpg" alt="menu" border="0" width="185" height="12"></td> </tr> <tr> ! <td><img src="menu_3_0.jpg" alt="menu" border="0" width="25" height="65"></td> ! <td align=center><a class="menugraphic" href="index.html"><img src="logo_oh.jpg" alt="ObjectHandler Logo" border="0" width="125" height="65"></a></td> ! <td><img src="menu_3_2.jpg" alt="menu" border="0" width="35" height="65"></td> </tr> </table> --- 14,35 ---- <tr valign="top"> ! <td background="images/menu_middle.jpg"> <table class="layout" cellpadding=0 cellspacing=0> <tr> ! <td colspan="3"><img src="images/menu_0.jpg" alt="menu" border="0" width="185" height="25"></td> </tr> <tr> ! <td><img src="images/menu_1_0.jpg" alt="menu" border="0" width="25" height="35"></td> ! <td align=center><a href="http://quantlib.org/"><img src="images/logo_ql.jpg" alt="QuantLib Logo" border="0" width="125" height="35"></a></td> ! <td><img src="images/menu_1_2.jpg" alt="menu" border="0" width="35" height="35"></td> </tr> <tr> ! <td colspan="3"><img src="images/menu_2.jpg" alt="menu" border="0" width="185" height="12"></td> </tr> <tr> ! <td><img src="images/menu_3_0.jpg" alt="menu" border="0" width="25" height="65"></td> ! <td align=center><a class="menugraphic" href="index.html"><img src="images/logo_oh.jpg" alt="ObjectHandler Logo" border="0" width="125" height="65"></a></td> ! <td><img src="images/menu_3_2.jpg" alt="menu" border="0" width="35" height="65"></td> </tr> </table> *************** *** 42,46 **** <table class="layout" cellpadding=0 cellspacing=0> ! <tr><td><img src="transp.gif" width="25" height="1"></td> <td> <table class="layout" cellpadding=0 cellspacing=0> --- 42,46 ---- <table class="layout" cellpadding=0 cellspacing=0> ! <tr><td><img src="images/transp.gif" width="25" height="1"></td> <td> <table class="layout" cellpadding=0 cellspacing=0> *************** *** 51,59 **** <tr><td><a class="menu" href="license.html">License</a></td></tr> <tr><td><a class="menu" href="people.html">People</a></td></tr> ! <tr><td><img src="transp.gif" width="1" height="5"></td> <tr><td class="menuheadernolink">Functional<br>Documentation</td></tr> <tr><td><a class="menu" href="ohfunctions.html">Functions</a></td></tr> <tr><td><a class="menu" href="excelbinding.html">Excel Binding</a></td></tr> ! <tr><td><img src="transp.gif" width="1" height="5"></td> <tr><td class="menuheadernolink">Technical<br>Documentation</td></tr> <tr><td><a class="menu" href="annotated.html">Class List</a></td></tr> --- 51,59 ---- <tr><td><a class="menu" href="license.html">License</a></td></tr> <tr><td><a class="menu" href="people.html">People</a></td></tr> ! <tr><td><img src="images/transp.gif" width="1" height="5"></td> <tr><td class="menuheadernolink">Functional<br>Documentation</td></tr> <tr><td><a class="menu" href="ohfunctions.html">Functions</a></td></tr> <tr><td><a class="menu" href="excelbinding.html">Excel Binding</a></td></tr> ! <tr><td><img src="images/transp.gif" width="1" height="5"></td> <tr><td class="menuheadernolink">Technical<br>Documentation</td></tr> <tr><td><a class="menu" href="annotated.html">Class List</a></td></tr> *************** *** 62,66 **** <tr><td><a class="menu" href="files.html">File List</a></td></tr> <tr><td><a class="menu" href="examples.html">Examples</a></td></tr> ! <tr><td><img src="transp.gif" width="1" height="10"></td></tr> </table> </td> --- 62,66 ---- <tr><td><a class="menu" href="files.html">File List</a></td></tr> <tr><td><a class="menu" href="examples.html">Examples</a></td></tr> ! <tr><td><img src="images/transp.gif" width="1" height="10"></td></tr> </table> </td> --- ObjectHandler-docs.hhp DELETED --- Index: oh_header.html =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Docs/oh_header.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** oh_header.html 19 May 2006 15:12:41 -0000 1.1 --- oh_header.html 28 Aug 2006 10:02:10 -0000 1.2 *************** *** 14,35 **** <tr valign="top"> ! <td background="menu_middle.jpg"> <table class="layout" cellpadding=0 cellspacing=0> <tr> ! <td colspan="3"><img src="menu_0.jpg" alt="menu" border="0" width="185" height="25"></td> </tr> <tr> ! <td><img src="menu_1_0.jpg" alt="menu" border="0" width="25" height="65"></td> ! <td align=center><a href="http://quantlib.org/"><img src="logo_ql.jpg" alt="QuantLib Logo" border="0" width="125" height="65"></a></td> ! <td><img src="menu_1_2.jpg" alt="menu" border="0" width="35" height="65"></td> </tr> <tr> ! <td colspan="3"><img src="menu_2.jpg" alt="menu" border="0" width="185" height="12"></td> </tr> <tr> ! <td><img src="menu_3_0.jpg" alt="menu" border="0" width="25" height="65"></td> ! <td align=center><a class="menugraphic" href="index.html"><img src="logo_oh.jpg" alt="ObjectHandler Logo" border="0" width="125" height="65"></a></td> ! <td><img src="menu_3_2.jpg" alt="menu" border="0" width="35" height="65"></td> </tr> </table> --- 14,35 ---- <tr valign="top"> ! <td background="images/menu_middle.jpg"> <table class="layout" cellpadding=0 cellspacing=0> <tr> ! <td colspan="3"><img src="images/menu_0.jpg" alt="menu" border="0" width="185" height="25"></td> </tr> <tr> ! <td><img src="images/menu_1_0.jpg" alt="menu" border="0" width="25" height="35"></td> ! <td align=center><a href="http://quantlib.org/"><img src="images/logo_ql.jpg" alt="QuantLib Logo" border="0" width="125" height="35"></a></td> ! <td><img src="images/menu_1_2.jpg" alt="menu" border="0" width="35" height="35"></td> </tr> <tr> ! <td colspan="3"><img src="images/menu_2.jpg" alt="menu" border="0" width="185" height="12"></td> </tr> <tr> ! <td><img src="images/menu_3_0.jpg" alt="menu" border="0" width="25" height="65"></td> ! <td align=center><a class="menugraphic" href="index.html"><img src="images/logo_oh.jpg" alt="ObjectHandler Logo" border="0" width="125" height="65"></a></td> ! <td><img src="images/menu_3_2.jpg" alt="menu" border="0" width="35" height="65"></td> </tr> </table> *************** *** 42,46 **** <table class="layout" cellpadding=0 cellspacing=0> ! <tr><td><img src="transp.gif" width="25" height="1"></td> <td> <table class="layout" cellpadding=0 cellspacing=0> --- 42,46 ---- <table class="layout" cellpadding=0 cellspacing=0> ! <tr><td><img src="images/transp.gif" width="25" height="1"></td> <td> <table class="layout" cellpadding=0 cellspacing=0> *************** *** 51,59 **** <tr><td><a class="menu" href="license.html">License</a></td></tr> <tr><td><a class="menu" href="people.html">People</a></td></tr> ! <tr><td><img src="transp.gif" width="1" height="5"></td> <tr><td class="menuheadernolink">Functional<br>Documentation</td></tr> <tr><td><a class="menu" href="ohfunctions.html">Functions</a></td></tr> <tr><td><a class="menu" href="excelbinding.html">Excel Binding</a></td></tr> ! <tr><td><img src="transp.gif" width="1" height="5"></td> <tr><td class="menuheadernolink">Technical<br>Documentation</td></tr> <tr><td><a class="menu" href="annotated.html">Class List</a></td></tr> --- 51,59 ---- <tr><td><a class="menu" href="license.html">License</a></td></tr> <tr><td><a class="menu" href="people.html">People</a></td></tr> ! <tr><td><img src="images/transp.gif" width="1" height="5"></td> <tr><td class="menuheadernolink">Functional<br>Documentation</td></tr> <tr><td><a class="menu" href="ohfunctions.html">Functions</a></td></tr> <tr><td><a class="menu" href="excelbinding.html">Excel Binding</a></td></tr> ! <tr><td><img src="images/transp.gif" width="1" height="5"></td> <tr><td class="menuheadernolink">Technical<br>Documentation</td></tr> <tr><td><a class="menu" href="annotated.html">Class List</a></td></tr> *************** *** 62,66 **** <tr><td><a class="menu" href="files.html">File List</a></td></tr> <tr><td><a class="menu" href="examples.html">Examples</a></td></tr> ! <tr><td><img src="transp.gif" width="1" height="10"></td></tr> </table> </td> --- 62,66 ---- <tr><td><a class="menu" href="files.html">File List</a></td></tr> <tr><td><a class="menu" href="examples.html">Examples</a></td></tr> ! <tr><td><img src="images/transp.gif" width="1" height="10"></td></tr> </table> </td> *************** *** 69,73 **** <table class="layout" cellpadding=0 cellspacing=0 width=100%> ! <tr><td align=center><a href="http://sourceforge.net"><img src="sfnetlogo.png" alt="SourceForge Logo" border="0" width="88" height="31"></a></td></tr> </table> --- 69,73 ---- <table class="layout" cellpadding=0 cellspacing=0 width=100%> ! <tr><td align=center><a href="http://sourceforge.net"><img src="images/sfnetlogo.png" alt="SourceForge Logo" border="0" width="88" height="31"></a></td></tr> </table> Index: Makefile.am =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Docs/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 19 May 2006 15:12:41 -0000 1.1 --- Makefile.am 28 Aug 2006 10:02:09 -0000 1.2 *************** *** 1,9 **** EXTRA_DIST = \ ! ObjectHandler-docs.hhp \ objecthandler.doxy \ oh_footer.html \ oh_header.html \ oh_headeronline.html \ style.css --- 1,11 ---- EXTRA_DIST = \ ! docs.vcproj \ ! docs_vc8.vcproj \ objecthandler.doxy \ oh_footer.html \ oh_header.html \ oh_headeronline.html \ + Makefile.vc \ style.css *************** *** 35,42 **** docs-html: .time-stamp-html .time-stamp-html: .time-stamp ! cp images/*.gif html ! cp images/*.ico html ! cp images/*.jpg html ! cp images/*.png html touch .time-stamp-html --- 37,45 ---- docs-html: .time-stamp-html .time-stamp-html: .time-stamp ! mkdir -p html/images ! cp images/*.gif html/images ! cp images/*.ico html/images ! cp images/*.jpg html/images ! cp images/*.png html/images touch .time-stamp-html *************** *** 50,64 **** .time-stamp-online: $(DOXYGEN_CONFIG) $(DOXYGEN_CUSTOM) $(DOXYGEN_INPUT) $(SED) -e "s/oh_header/oh_headeronline/" \ - -e "s/GENERATE_HTML = NO/GENERATE_HTML = YES/" \ -e "s/HTML_OUTPUT = html/HTML_OUTPUT = html-online/" \ -e "s|oh_basepath|${BASEPATH}/|" \ -e "s|oh_version|$(VERSION)|" \ ! objecthandler.doxy > .objecthandler.doxy $(DOXYGEN) .objecthandler.doxy rm .objecthandler.doxy ! cp images/*.gif html-online ! cp images/*.ico html-online ! cp images/*.jpg html-online ! cp images/*.png html-online touch .time-stamp-online --- 53,69 ---- .time-stamp-online: $(DOXYGEN_CONFIG) $(DOXYGEN_CUSTOM) $(DOXYGEN_INPUT) $(SED) -e "s/oh_header/oh_headeronline/" \ -e "s/HTML_OUTPUT = html/HTML_OUTPUT = html-online/" \ + -e "s/HAVE_DOT = NO/HAVE_DOT = YES/" \ + -e "s/GENERATE_HTMLHELP = YES/GENERATE_HTMLHELP = NO/" \ -e "s|oh_basepath|${BASEPATH}/|" \ -e "s|oh_version|$(VERSION)|" \ ! objecthandler.doxy > .objecthandler.doxy $(DOXYGEN) .objecthandler.doxy rm .objecthandler.doxy ! mkdir -p html-online/images ! cp images/*.gif html-online/images ! cp images/*.ico html-online/images ! cp images/*.jpg html-online/images ! cp images/*.png html-online/images touch .time-stamp-online *************** *** 68,75 **** .time-stamp: $(DOXYGEN_CONFIG) $(DOXYGEN_CUSTOM) $(DOXYGEN_INPUT) ! $(SED) -e "s/GENERATE_HTML = NO/GENERATE_HTML = YES/" \ ! -e "s|oh_basepath|${BASEPATH}/|" \ -e "s|oh_version|$(VERSION)|" \ ! objecthandler.doxy > .objecthandler.doxy $(DOXYGEN) .objecthandler.doxy rm .objecthandler.doxy --- 73,81 ---- .time-stamp: $(DOXYGEN_CONFIG) $(DOXYGEN_CUSTOM) $(DOXYGEN_INPUT) ! $(SED) -e "s|oh_basepath|${BASEPATH}/|" \ -e "s|oh_version|$(VERSION)|" \ ! -e "s/HAVE_DOT = NO/HAVE_DOT = YES/" \ ! -e "s/GENERATE_HTMLHELP = YES/GENERATE_HTMLHELP = NO/" \ ! objecthandler.doxy > .objecthandler.doxy $(DOXYGEN) .objecthandler.doxy rm .objecthandler.doxy --- NEW FILE: docs.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="docs" ProjectGUID="{8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}" Keyword="MakeFileProj"> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="All|Win32" OutputDirectory="build\vc" IntermediateDirectory="build\vc" ConfigurationType="0"> <Tool Name="VCNMakeTool" BuildCommandLine="NMAKE /f "Makefile.vc"" ReBuildCommandLine="NMAKE /f "Makefile.vc" /a" CleanCommandLine="NMAKE /f "Makefile.vc" /clean"/> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="pages" Filter=""> <File RelativePath=".\pages\design.docs"> </File> <File RelativePath=".\pages\examples.docs"> </File> <File RelativePath=".\pages\excelbinding.docs"> </File> <File RelativePath=".\pages\history.docs"> </File> <File RelativePath=".\pages\index.docs"> </File> <File RelativePath=".\pages\installation.docs"> </File> <File RelativePath=".\pages\license.docs"> </File> <File RelativePath=".\pages\ohfunctions.docs"> </File> <File RelativePath=".\pages\people.docs"> </File> </Filter> <File RelativePath=".\Makefile.vc"> </File> <File RelativePath=".\objecthandler.doxy"> </File> <File RelativePath=".\oh_footer.html"> </File> <File RelativePath=".\oh_header.html"> </File> <File RelativePath=".\oh_headeronline.html"> </File> <File RelativePath=".\style.css"> </File> </Files> <Globals> </Globals> </VisualStudioProject> Index: objecthandler.doxy =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Docs/objecthandler.doxy,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** objecthandler.doxy 19 May 2006 15:12:41 -0000 1.1 --- objecthandler.doxy 28 Aug 2006 10:02:10 -0000 1.2 *************** *** 104,108 **** ## configuration options related to the HTML output ##--------------------------------------------------------------------------- ! GENERATE_HTML = NO HTML_OUTPUT = html HTML_FILE_EXTENSION = .html --- 104,108 ---- ## configuration options related to the HTML output ##--------------------------------------------------------------------------- ! GENERATE_HTML = YES HTML_OUTPUT = html HTML_FILE_EXTENSION = .html *************** *** 111,116 **** HTML_STYLESHEET = style.css HTML_ALIGN_MEMBERS = YES ! GENERATE_HTMLHELP = NO ! CHM_FILE = ../ObjectHandler-docs-oh_version.chm HHC_LOCATION = hhc.exe GENERATE_CHI = NO --- 111,116 ---- HTML_STYLESHEET = style.css HTML_ALIGN_MEMBERS = YES ! GENERATE_HTMLHELP = YES ! CHM_FILE = ../ObjectHandler-docs-0.1.4.chm HHC_LOCATION = hhc.exe GENERATE_CHI = NO *************** *** 198,202 **** CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = NO ! HAVE_DOT = YES CLASS_GRAPH = YES COLLABORATION_GRAPH = NO --- 198,202 ---- CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = NO ! HAVE_DOT = NO CLASS_GRAPH = YES COLLABORATION_GRAPH = NO --- NEW FILE: Makefile.vc --- # ObjectHandler\Docs\Makefile.vc BUILD_DIR=build\vc HTML_DIR=html IMG_DIR=html\images BUILDFLAG=$(BUILD_DIR)\buildflag DOXYGEN=doxygen.exe DOXY_CONFIG=objecthandler.doxy ALL : $(BUILDFLAG) $(BUILD_DIR) : if not exist $(BUILD_DIR) mkdir $(BUILD_DIR) $(IMG_DIR) : if not exist $(HTML_DIR) mkdir $(HTML_DIR) if not exist $(IMG_DIR) mkdir $(IMG_DIR) $(BUILDFLAG) : $(DEPENDENCIES) $(BUILD_DIR) $(IMG_DIR) $(DOXY_CONFIG) copy /Y images\* $(IMG_DIR) $(DOXYGEN) $(DOXY_CONFIG) echo flagged > $@ CLEAN : -@ if EXIST $(BUILD_DIR)\* del /f /q $(BUILD_DIR)\* Index: .cvsignore =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Docs/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 19 May 2006 15:12:41 -0000 1.1 --- .cvsignore 28 Aug 2006 10:02:09 -0000 1.2 *************** *** 1,10 **** ! ObjectHandler-docs-*.* html html-online - latex - doxywarnings.txt Makefile Makefile.in ! .time-stamp* ! man ! .objecthandler.doxy --- 1,11 ---- ! *.chm ! *.user ! .objecthandler.doxy ! .time-stamp* ! build ! doxywarnings.txt html html-online Makefile Makefile.in ! ObjectHandler-docs-*-html.tar.gz |
