|
From: Eric E. <eri...@us...> - 2006-08-02 13:03:50
|
Update of /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27038/Addins/Calc Modified Files: Tag: R000313f0-branch AddinCalc.vcproj AddinCalc_vc8.vcproj qladdin.cpp Added Files: Tag: R000313f0-branch Makefile.vc Removed Files: Tag: R000313f0-branch Makefile.vc.debug.crtdll Log Message: upgrade Calc addin from OOo 1 to 2 --- NEW FILE: Makefile.vc --- OFFICE_PROGRAM_PATH=C:\Program Files\OpenOffice.org 2.0\program OFFICE_SDK_PATH=C:\OpenOffice.org_2.0_SDK COMPONENT_NAME=QuantLibAddinCalc DLL_NAME=$(COMPONENT_NAME)-vc71-mt-gd-0_3_12 DLL_DIR=dll INT_DIR=build\vc71\DebugCRTDLL IDL_DIR="$(OFFICE_SDK_PATH)\idl" TYP_FILE="$(OFFICE_PROGRAM_PATH)\types.rdb" URD_FILE=$(COMPONENT_NAME).urd RDB_FILE=$(DLL_NAME).rdb DLL_FILE=$(DLL_NAME).dll FLAG1=$(INT_DIR)\$(COMPONENT_NAME).flag1 FLAG2=$(INT_DIR)\$(COMPONENT_NAME).flag2 FLAG3=$(INT_DIR)\$(COMPONENT_NAME).flag3 FLAG4=$(INT_DIR)\$(COMPONENT_NAME).flag4 FLAG5=$(INT_DIR)\$(COMPONENT_NAME).flag5 FLAG6=$(INT_DIR)\$(COMPONENT_NAME).flag6 CC_INCLUDES=-I. -I..\.. -I"$(QL_DIR)" -I"$(OBJECT_HANDLER_DIR)" \ -I"$(LOG4CXX_DIR)/include" -I"$(OFFICE_SDK_PATH)\include" CC_FLAGS=/c /nologo /MD /GX /GR \ /wd4251 /wd4275 /wd4290 /wd4675 /wd4786 /wd4800 \ /DWIN32 /DWNT /DCPPU_ENV=msci /Fo"$(INT_DIR)\\" # - CC_FLAGS that will be required for debug build #/Zi full debug info in pdb #/Od disable optimization #/GZ runtime error checks # - other defines that may be needed? #CC_DEFINES=/D_DEBUG /DWINDOWS /D_MBCS /D_USRDLL OBJECTS= \ "$(INT_DIR)\calcutils.obj" \ "$(INT_DIR)\conversions.obj" \ "$(INT_DIR)\exercise.obj" \ "$(INT_DIR)\funcdef.obj" \ "$(INT_DIR)\options.obj" \ "$(INT_DIR)\payoffs.obj" \ "$(INT_DIR)\pricingengines.obj" \ "$(INT_DIR)\processes.obj" \ "$(INT_DIR)\qladdin.obj" \ "$(INT_DIR)\session.obj" \ "$(INT_DIR)\utilities.obj" \ "$(INT_DIR)\volatilities.obj" LFLAGS=/nologo /dll /out:$(DLL_FILE) \ /def:.\$(COMPONENT_NAME).def \ /libpath:. /libpath:..\..\lib \ /libpath:"$(OFFICE_SDK_PATH)\windows\lib" \ /libpath:"$(QL_DIR)\lib" \ /libpath:"$(LOG4CXX_DIR)\msvc\lib" \ /libpath:"$(OBJECT_HANDLER_DIR)\lib" \ kernel32.lib wsock32.lib advapi32.lib \ oldnames.lib netapi32.lib advapi32.lib gdi32.lib comdlg32.lib \ comctl32.lib user32.lib winspool.lib shell32.lib ole32.lib \ oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ icppuhelper.lib icppu.lib isal.lib \ msvcrt.lib msvcprt.lib TYPES = -Tcom.sun.star.sheet.XAddIn \ -Tcom.sun.star.lang.XServiceName \ -Tcom.sun.star.lang.XServiceInfo \ -Tcom.sun.star.uno.XWeak \ -Tcom.sun.star.lang.XSingleServiceFactory \ -Tcom.sun.star.lang.XMultiServiceFactory \ -Tcom.sun.star.uno.XAggregation \ -Tcom.sun.star.lang.XTypeProvider \ -Tcom.sun.star.uno.XComponentContext \ -Tcom.sun.star.lang.XSingleComponentFactory \ -Tcom.sun.star.registry.XRegistryKey \ -Tcom.sun.star.sheet.addin.XQL ALL : $(FLAG6) $(URD_FILE) : $(COMPONENT_NAME).idl IDLC -I$(IDL_DIR) $(COMPONENT_NAME).idl "$(INT_DIR)" : if not exist "$(INT_DIR)" mkdir "$(INT_DIR)" "$(DLL_DIR)" : if not exist "$(DLL_DIR)" mkdir "$(DLL_DIR)" $(FLAG1) : $(URD_FILE) $(INT_DIR) REGMERGE $(RDB_FILE) /UCR $(URD_FILE) echo flagged > $@ $(FLAG2) : $(FLAG1) CPPUMAKER -BUCR $(TYPES) $(TYP_FILE) $(RDB_FILE) echo flagged > $@ $(OBJECTS) : $(FLAG2) .cpp{$(INT_DIR)}.obj: CL $(CC_FLAGS) $(CC_INCLUDES) $< $(FLAG3) : $(FLAG1) $(OBJECTS) LINK $(LFLAGS) $(OBJECTS) echo flagged > $@ $(FLAG4) : $(FLAG3) REGCOMP -register -r $(RDB_FILE) -c $(DLL_FILE) echo flagged > $@ $(FLAG5) : $(FLAG4) $(DLL_DIR) move $(DLL_NAME).* $(DLL_DIR) echo flagged > $@ $(FLAG6) : $(FLAG5) copy $(DLL_DIR)\$(RDB_FILE) "$(OFFICE_PROGRAM_PATH)" copy $(DLL_DIR)\$(DLL_FILE) "$(OFFICE_PROGRAM_PATH)" echo flagged > $@ CLEAN : -@ if EXIST "$(INT_DIR)\*" del /f /q "$(INT_DIR)\*" -@ if EXIST "$(DLL_DIR)\*" del /f /q "$(DLL_DIR)\*" -@ if EXIST "$(URD_FILE)" del /f /q "$(URD_FILE)" -@ if EXIST com rmdir /q /s com --- Makefile.vc.debug.crtdll DELETED --- Index: AddinCalc.vcproj =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/AddinCalc.vcproj,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** AddinCalc.vcproj 29 Jul 2006 15:32:31 -0000 1.3 --- AddinCalc.vcproj 2 Aug 2006 13:03:46 -0000 1.3.2.1 *************** *** 14,33 **** <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ! ConfigurationType="0" ! UseOfMFC="0" ! ATLMinimizesCRunTimeLibraryUsage="FALSE"> ! <Tool ! Name="VCNMakeTool" ! BuildCommandLine="nmake /f "Makefile.vc.debug.crtdll"" ! ReBuildCommandLine="nmake /f "Makefile.vc.debug.crtdll" /a" ! CleanCommandLine="nmake /f "Makefile.vc.debug.crtdll" clean" ! Output="AddinCalc.exe"/> ! </Configuration> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ConfigurationType="0" UseOfMFC="0" --- 14,19 ---- <Configuration Name="Debug CRTDLL|Win32" ! OutputDirectory="build\vc71\DebugCRTDLL" ! IntermediateDirectory="build\vc71\DebugCRTDLL" ConfigurationType="0" UseOfMFC="0" *************** *** 35,41 **** <Tool Name="VCNMakeTool" ! BuildCommandLine="nmake /f "Makefile.vc.debug.crtdll"" ! ReBuildCommandLine="nmake /f "Makefile.vc.debug.crtdll" /a" ! CleanCommandLine="nmake /f "Makefile.vc.debug.crtdll" clean" Output="AddinCalc.exe"/> </Configuration> --- 21,27 ---- <Tool Name="VCNMakeTool" ! BuildCommandLine="nmake /f "Makefile.vc"" ! ReBuildCommandLine="nmake /f "Makefile.vc" /a" ! CleanCommandLine="nmake /f "Makefile.vc" clean" Output="AddinCalc.exe"/> </Configuration> *************** *** 78,81 **** --- 64,70 ---- </File> <File + RelativePath=".\utilities.cpp"> + </File> + <File RelativePath=".\volatilities.cpp"> </File> *************** *** 115,118 **** --- 104,110 ---- </File> <File + RelativePath=".\utilities.hpp"> + </File> + <File RelativePath=".\volatilities.hpp"> </File> *************** *** 123,127 **** </Filter> <File ! RelativePath="Makefile.vc.debug.crtdll"> </File> <File --- 115,119 ---- </Filter> <File ! RelativePath="Makefile.vc"> </File> <File Index: AddinCalc_vc8.vcproj =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/AddinCalc_vc8.vcproj,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** AddinCalc_vc8.vcproj 29 Jul 2006 15:32:31 -0000 1.3 --- AddinCalc_vc8.vcproj 2 Aug 2006 13:03:46 -0000 1.3.2.1 *************** *** 26,31 **** <Tool Name="VCNMakeTool" ! BuildCommandLine="nmake /f "Makefile.vc.debug.crtdll"" ! ReBuildCommandLine="nmake /f "Makefile.vc.debug.crtdll" /a" CleanCommandLine="" Output="AddinCalc.exe" --- 26,31 ---- <Tool Name="VCNMakeTool" ! BuildCommandLine="nmake /f "Makefile.vc"" ! ReBuildCommandLine="nmake /f "Makefile.vc" /a" CleanCommandLine="" Output="AddinCalc.exe" *************** *** 51,54 **** --- 51,58 ---- </File> <File + RelativePath=".\conversions.cpp" + > + </File> + <File RelativePath=".\exercise.cpp" > *************** *** 96,99 **** --- 100,107 ---- </File> <File + RelativePath=".\conversions.hpp" + > + </File> + <File RelativePath=".\exercise.hpp" > *************** *** 133,137 **** </Filter> <File ! RelativePath="Makefile.vc.debug.crtdll" > </File> --- 141,145 ---- </Filter> <File ! RelativePath="Makefile.vc" > </File> Index: qladdin.cpp =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/Addins/Calc/qladdin.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** qladdin.cpp 29 Jul 2006 15:32:31 -0000 1.2 --- qladdin.cpp 2 Aug 2006 13:03:46 -0000 1.2.2.1 *************** *** 49,52 **** --- 49,55 ---- using namespace ::com::sun::star; + // instantiate the objecthandler singleton + ObjHandler::ObjectHandler oh; + REF( uno::XInterface ) SAL_CALL QL_CreateInstance( REF( uno::XComponentContext ) const & xContext ) SAL_THROW( () ) { |
