Update of /cvsroot/quantlibaddin/QuantLibAddin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17144 Modified Files: Contributors.txt Makefile.am QuantLibAddin.nsi QuantLibAddin.sln QuantLibAddin_vc8.sln QuantLibObjects_vc8.vcproj configure.ac Log Message: merge R000313f0-branch Index: QuantLibAddin_vc8.sln =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/QuantLibAddin_vc8.sln,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** QuantLibAddin_vc8.sln 3 Aug 2006 11:47:34 -0000 1.11 --- QuantLibAddin_vc8.sln 28 Aug 2006 10:05:21 -0000 1.12 *************** *** 1,12 ****  Microsoft Visual Studio Solution File, Format Version 9.00 ! # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AddinC", "Addins\C\AddinC_vc8.vcproj", "{ACCA0906-34AF-4CC4-8426-C3EF41315BF5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AddinCalc", "Addins\Calc\AddinCalc_vc8.vcproj", "{10DC0D9D-ABB3-4737-B14D-4FFAD4810A72}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientCDemo", "Clients\C\ClientCDemo_vc8.vcproj", "{B598DA76-9F89-4F2D-97D0-54C34C1E3CB4}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientCppDemo", "Clients\C++\ClientCppDemo_vc8.vcproj", "{8F04F015-23CA-4D7E-83BE-FF9371D3964D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuantLibObjects", "QuantLibObjects_vc8.vcproj", "{CAB8330C-6424-4455-9285-3654587EF71F}" --- 1,21 ----  Microsoft Visual Studio Solution File, Format Version 9.00 ! # Visual C++ Express 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AddinC", "Addins\C\AddinC_vc8.vcproj", "{ACCA0906-34AF-4CC4-8426-C3EF41315BF5}" + ProjectSection(ProjectDependencies) = postProject + {CAB8330C-6424-4455-9285-3654587EF71F} = {CAB8330C-6424-4455-9285-3654587EF71F} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AddinCalc", "Addins\Calc\AddinCalc_vc8.vcproj", "{10DC0D9D-ABB3-4737-B14D-4FFAD4810A72}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientCDemo", "Clients\C\ClientCDemo_vc8.vcproj", "{B598DA76-9F89-4F2D-97D0-54C34C1E3CB4}" + ProjectSection(ProjectDependencies) = postProject + {ACCA0906-34AF-4CC4-8426-C3EF41315BF5} = {ACCA0906-34AF-4CC4-8426-C3EF41315BF5} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientCppDemo", "Clients\C++\ClientCppDemo_vc8.vcproj", "{8F04F015-23CA-4D7E-83BE-FF9371D3964D}" + ProjectSection(ProjectDependencies) = postProject + {CAB8330C-6424-4455-9285-3654587EF71F} = {CAB8330C-6424-4455-9285-3654587EF71F} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuantLibObjects", "QuantLibObjects_vc8.vcproj", "{CAB8330C-6424-4455-9285-3654587EF71F}" Index: QuantLibAddin.nsi =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/QuantLibAddin.nsi,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** QuantLibAddin.nsi 31 Jul 2006 08:48:37 -0000 1.4 --- QuantLibAddin.nsi 28 Aug 2006 10:05:21 -0000 1.5 *************** *** 57,66 **** SetOutPath $INSTDIR\Addins\Calc ! File "Addins\Calc\Makefile.vc.debug.crtdll" File "Addins\Calc\QuantLibAddinCalc.def" File "Addins\Calc\QuantLibAddinCalc.idl" SetOutPath $INSTDIR\Clients\Calc ! File /r "Clients\Calc\*.sxc" SetOutPath $INSTDIR\Clients\Guile --- 57,66 ---- SetOutPath $INSTDIR\Addins\Calc ! File "Addins\Calc\Makefile.vc" File "Addins\Calc\QuantLibAddinCalc.def" File "Addins\Calc\QuantLibAddinCalc.idl" SetOutPath $INSTDIR\Clients\Calc ! File /r "Clients\Calc\*.ods" SetOutPath $INSTDIR\Clients\Guile *************** *** 68,71 **** --- 68,90 ---- SetOutPath "$INSTDIR\Docs" + File "Docs\QuantLibAddin-docs-${VER_NUMBER}.chm" + File "Docs\*.doxy" + File "Docs\*.html" + File "Docs\Makefile.vc" + File "Docs\style.css" + + SetOutPath "$INSTDIR\Docs\images" + File "Docs\images\*.ico" + File "Docs\images\*.jpg" + File "Docs\images\*.png" + File "Docs\images\*.gif" + + SetOutPath "$INSTDIR\Docs\pages" + File "Docs\pages\*.docs" + + SetOutPath "$INSTDIR\Docs\auto.pages" + File "Docs\auto.pages\*.docs" + + SetOutPath "$INSTDIR\Docs" File /nonfatal "Docs\QuantLibAddin-docs-${VER_NUMBER}.chm" Index: configure.ac =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/configure.ac,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure.ac 29 Jul 2006 19:45:29 -0000 1.4 --- configure.ac 28 Aug 2006 10:05:21 -0000 1.5 *************** *** 94,102 **** Clients/Guile/Makefile Docs/Makefile - gensrc/config/Makefile gensrc/Makefile - gensrc/metadata/Makefile - gensrc/scripts/Makefile - gensrc/stubs/Makefile Makefile qlo/Makefile]) --- 94,98 ---- Index: Makefile.am =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 27 Jul 2006 14:06:30 -0000 1.2 --- Makefile.am 28 Aug 2006 10:05:21 -0000 1.3 *************** *** 2,9 **** SUBDIRS = \ gensrc \ - gensrc/config \ - gensrc/metadata \ - gensrc/scripts \ - gensrc/stubs \ qlo \ Addins/C \ --- 2,5 ---- Index: QuantLibAddin.sln =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/QuantLibAddin.sln,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** QuantLibAddin.sln 29 Jul 2006 15:32:31 -0000 1.11 --- QuantLibAddin.sln 28 Aug 2006 10:05:21 -0000 1.12 *************** *** 77,94 **** {FE5EE378-AD4E-4B32-8030-C089D7067336}.Release SingleThread.ActiveCfg = Release CRTDLL|Win32 {FE5EE378-AD4E-4B32-8030-C089D7067336}.Release SingleThread.Build.0 = Release CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.All.ActiveCfg = Debug|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.All.Build.0 = Debug|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Debug.ActiveCfg = Debug|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Debug.Build.0 = Debug|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Debug CRTDLL.ActiveCfg = Debug CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Debug CRTDLL.Build.0 = Debug CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Debug SingleThread.ActiveCfg = Debug|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Debug SingleThread.Build.0 = Debug|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Release.ActiveCfg = Debug|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Release.Build.0 = Debug|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Release CRTDLL.ActiveCfg = Debug|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Release CRTDLL.Build.0 = Debug|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Release SingleThread.ActiveCfg = Debug|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Release SingleThread.Build.0 = Debug|Win32 {5719B9B4-8566-4CD9-8F74-A3E98BCC55BD}.All.ActiveCfg = Debug CRTDLL|Win32 {5719B9B4-8566-4CD9-8F74-A3E98BCC55BD}.All.Build.0 = Debug CRTDLL|Win32 --- 77,94 ---- {FE5EE378-AD4E-4B32-8030-C089D7067336}.Release SingleThread.ActiveCfg = Release CRTDLL|Win32 {FE5EE378-AD4E-4B32-8030-C089D7067336}.Release SingleThread.Build.0 = Release CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.All.ActiveCfg = Release CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.All.Build.0 = Release CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Debug.ActiveCfg = Release CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Debug.Build.0 = Release CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Debug CRTDLL.ActiveCfg = Release CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Debug CRTDLL.Build.0 = Release CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Debug SingleThread.ActiveCfg = Release CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Debug SingleThread.Build.0 = Release CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Release.ActiveCfg = Release CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Release.Build.0 = Release CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Release CRTDLL.ActiveCfg = Release CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Release CRTDLL.Build.0 = Release CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Release SingleThread.ActiveCfg = Release CRTDLL|Win32 ! {D8B630DB-69ED-455C-AC79-22903E750175}.Release SingleThread.Build.0 = Release CRTDLL|Win32 {5719B9B4-8566-4CD9-8F74-A3E98BCC55BD}.All.ActiveCfg = Debug CRTDLL|Win32 {5719B9B4-8566-4CD9-8F74-A3E98BCC55BD}.All.Build.0 = Debug CRTDLL|Win32 Index: Contributors.txt =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Contributors.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Contributors.txt 29 Jul 2006 19:45:29 -0000 1.2 --- Contributors.txt 28 Aug 2006 10:05:21 -0000 1.3 *************** *** 1,4 **** ! We gratefully acknowledge contributions from Luigi Ballabio, Cristina Duminuco, ! Silvia Frasson, Marco Marchioro, Walter Penschke, Lars Schouw. --- 1,5 ---- ! We gratefully acknowledge contributions from Luigi Ballabio, Marco Bianchetti, ! Cristina Duminuco, Giorgio Facchinetti, Chiara Fornarola, Silvia Frasson, Marco ! Marchioro, Walter Penschke, Mario Pucci, Lars Schouw. Index: QuantLibObjects_vc8.vcproj =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/QuantLibObjects_vc8.vcproj,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** QuantLibObjects_vc8.vcproj 17 Aug 2006 15:20:10 -0000 1.33 --- QuantLibObjects_vc8.vcproj 28 Aug 2006 10:05:21 -0000 1.34 *************** *** 43,47 **** Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="./,$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" StringPooling="true" --- 43,47 ---- Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories=".,$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" StringPooling="true" *************** *** 120,124 **** Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="./,$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" StringPooling="true" --- 120,124 ---- Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories=".,$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" StringPooling="true" *************** *** 196,200 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="./,$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" MinimalRebuild="true" --- 196,200 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=".,$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" MinimalRebuild="true" *************** *** 273,277 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="./,$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" MinimalRebuild="true" --- 273,277 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=".,$(OBJECT_HANDLER_DIR),$(QL_DIR),$(QL_DIR)/functions" PreprocessorDefinitions="WIN32;_DEBUG;_LIB" MinimalRebuild="true" *************** *** 327,342 **** <Files> <Filter - Name="MarketModels" - > - <File - RelativePath="qlo\marketmodels.cpp" - > - </File> - <File - RelativePath="qlo\marketmodels.hpp" - > - </File> - </Filter> - <Filter Name="Enumerations" > --- 327,330 ---- *************** *** 442,453 **** </File> <File - RelativePath="qlo\vo_marketmodels.cpp" - > - </File> - <File - RelativePath="qlo\vo_marketmodels.hpp" - > - </File> - <File RelativePath="qlo\vo_mathf.cpp" > --- 430,433 ---- |
