|
From: Eric E. <eri...@us...> - 2006-08-28 10:05:28
|
Update of /cvsroot/quantlibaddin/QuantLibAddin/gensrc In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17144/gensrc Modified Files: Makefile.am Makefile.vc gensrc.vcproj gensrc_vc8.vcproj Log Message: merge R000313f0-branch Index: Makefile.vc =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/gensrc/Makefile.vc,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Makefile.vc 24 Aug 2006 15:47:23 -0000 1.23 --- Makefile.vc 28 Aug 2006 10:05:24 -0000 1.24 *************** *** 6,9 **** --- 6,10 ---- BUILDFLAG=$(BUILD_DIR)\buildflag SCRIPT=scripts\gensrc.py + MAKEFILE=Makefile.vc METADATA= \ *************** *** 25,29 **** metadata\interpolation.xml \ metadata\mathf.xml \ ! metadata\marketmodels.xml \ metadata\optimization.xml \ metadata\options.xml \ --- 26,31 ---- metadata\interpolation.xml \ metadata\mathf.xml \ ! # metadata\marketmodels.xml \ ! metadata\ohfunctions.xml \ metadata\optimization.xml \ metadata\options.xml \ *************** *** 60,66 **** if not exist $(BUILD_DIR) mkdir $(BUILD_DIR) ! $(BUILDFLAG) : $(SCRIPT) $(INPUTS) $(BUILD_DIR) set PYTHONPATH=$(PYTHONPATH);$(GENSRC_DIR)\import ! $(SCRIPT) -eqvd echo flagged > $@ --- 62,68 ---- if not exist $(BUILD_DIR) mkdir $(BUILD_DIR) ! $(BUILDFLAG) : $(SCRIPT) $(INPUTS) $(BUILD_DIR) $(MAKEFILE) set PYTHONPATH=$(PYTHONPATH);$(GENSRC_DIR)\import ! $(SCRIPT) -a echo flagged > $@ Index: Makefile.am =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/gensrc/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 27 Jul 2006 14:06:30 -0000 1.1 --- Makefile.am 28 Aug 2006 10:05:24 -0000 1.2 *************** *** 2,88 **** # gensrc.py probably needs to be re-executed if any of these change ! #GENSRC_INPUT := addincalc.xml \ ! # addinc.xml \ ! # addindoxygen.xml \ ! # addinexcel.xml \ ! # addinguile.xml \ ! # addinqla.xml \ ! # basic.xml \ ! # capfloor.xml \ ! # config.xml \ ! # couponvectors.xml \ ! # enumerations.xml \ ! # instruments.xml \ ! # interpolation.xml \ ! # ohfunctions.xml \ ! # options.xml \ ! # processes.xml \ ! # schedule.xml \ ! # shortratemodels.xml \ ! # simpleswap.xml \ ! # swap.xml \ ! # termstructures.xml \ ! # utilities.xml \ ! # volatilities.xml \ ! # xibor.xml ! #gensrc_pys := addincalc.py \ ! # addinc.py \ ! # addindoxygen.py \ ! # addinexcel.py \ ! # addinguile.py \ ! # addin.py \ ! # addinqla.py \ ! # buffer.py \ ! # category.py \ ! # common.py \ ! # config.py \ ! # enumeration.py \ ! # factory.py \ ! # function.py \ ! # log.py \ ! # outputfile.py \ ! # parameter.py \ ! # rule.py \ ! # serializable.py \ ! # serializer.py \ ! # singleton.py \ ! # gensrc.py \ ! # xmlreader.py ! #GENSRC_STUBS := stub.calc.function \ ! # stub.calc.idlfoot \ ! # stub.calc.idlfunc \ ! # stub.calc.idlhead \ ! # stub.calc.includes \ ! # stub.calc.map \ ! # stub.c.function \ ! # stub.c.includes \ ! # stub.copyright \ ! # stub.doxygen.categories \ ! # stub.doxygen.enums \ ! # stub.doxygen.header \ ! # stub.excel.function \ ! # stub.excel.includes \ ! # stub.excel.register \ ! # stub.guile.function \ ! # stub.guile.includes \ ! # stub.guile.initfunc \ ! # stub.qla.includes # this should prevent running from a distributed tarball - #EXTRA_DIST = .time-stamp \ - # Makefile.vc \ - # gensrc.dsp \ - # gensrc.vcproj \ - # gensrc_vc8.vcproj \ - # $(GENSRC_INPUT) \ - # $(GENSRC_PYS) \ - # $(GENSRC_STUBS) - EXTRA_DIST = .time-stamp \ gensrc_vc8.vcproj \ gensrc.vcproj \ ! Makefile.vc # command line arguments --- 2,56 ---- # gensrc.py probably needs to be re-executed if any of these change ! GENSRC_INPUT := metadata/bonds.xml \ ! metadata/calendar.xml \ ! metadata/capfloor.xml \ ! metadata/capletvolstructure.xml \ ! metadata/couponvectors.xml \ ! metadata/date.xml \ ! metadata/daycounter.xml \ ! metadata/enumclasses.xml \ ! metadata/enumcurves.xml \ ! metadata/enumtypes.xml \ ! metadata/exercise.xml \ ! metadata/forwardrateagreement.xml \ ! metadata/generalstatistics.xml \ ! metadata/incrementalstatistics.xml \ ! metadata/index.xml \ ! metadata/instruments.xml \ ! metadata/interpolation.xml \ ! metadata/marketmodels.xml \ ! metadata/mathf.xml \ ! metadata/optimization.xml \ ! metadata/options.xml \ ! metadata/payoffs.xml \ ! metadata/prices.xml \ ! metadata/pricingengines.xml \ ! metadata/processes.xml \ ! metadata/randomsequencegenerator.xml \ ! metadata/ratehelpers.xml \ ! metadata/schedule.xml \ ! metadata/shortratemodels.xml \ ! metadata/swaptionvolstructure.xml \ ! metadata/swaption.xml \ ! metadata/swap.xml \ ! metadata/termstructures.xml \ ! metadata/utilities.xml \ ! metadata/vanillaswap.xml \ ! metadata/volatilities.xml ! gensrc_pys := scripts/gensrc.py ! GENSRC_STUBS := stubs/stub.copyright \ ! stubs/stub.excel.includes \ ! stubs/stub.excel.register # this should prevent running from a distributed tarball EXTRA_DIST = .time-stamp \ gensrc_vc8.vcproj \ gensrc.vcproj \ ! Makefile.vc \ ! $(GENSRC_INPUT) \ ! $(GENSRC_PYS) \ ! $(GENSRC_STUBS) # command line arguments *************** *** 106,108 **** --- 74,84 ---- python scripts/gensrc.py $(GENSRC_ARGS) touch .time-stamp + + dist-hook: + mkdir -p $(distdir)/config $(distdir)/metadata $(distdir)/scripts $(distdir)/stubs + cp -p $(srcdir)/config/*.xml $(distdir)/config + cp -p $(srcdir)/metadata/*.xml $(distdir)/metadata + cp -p $(srcdir)/scripts/*.py $(distdir)/scripts + cp -p $(srcdir)/stubs/stub.* $(distdir)/stubs + touch .time-stamp Index: gensrc_vc8.vcproj =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/gensrc/gensrc_vc8.vcproj,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** gensrc_vc8.vcproj 17 Aug 2006 15:20:10 -0000 1.21 --- gensrc_vc8.vcproj 28 Aug 2006 10:05:24 -0000 1.22 *************** *** 116,124 **** </File> <File ! RelativePath="metadata\marketmodels.xml" > </File> <File ! RelativePath="metadata\mathf.xml" > </File> --- 116,124 ---- </File> <File ! RelativePath="metadata\mathf.xml" > </File> <File ! RelativePath=".\metadata\ohfunctions.xml" > </File> Index: gensrc.vcproj =================================================================== RCS file: /cvsroot/quantlibaddin/QuantLibAddin/gensrc/gensrc.vcproj,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** gensrc.vcproj 24 Aug 2006 15:48:42 -0000 1.17 --- gensrc.vcproj 28 Aug 2006 10:05:24 -0000 1.18 *************** *** 85,89 **** </File> <File ! RelativePath=".\metadata\marketmodels.xml"> </File> <File --- 85,89 ---- </File> <File ! RelativePath="metadata\marketmodels.xml"> </File> <File *************** *** 91,95 **** </File> <File ! RelativePath=".\metadata\optimization.xml"> </File> <File --- 91,98 ---- </File> <File ! RelativePath="metadata\ohfunctions.xml"> ! </File> ! <File ! RelativePath="metadata\optimization.xml"> </File> <File |
