[QuantLibAddin-cvs] QuantLibAddin/gensrc/scripts gensrc.py, 1.3, 1.4 Makefile.am, 1.1, NONE

[Eric E. <eri...@us...>]

Update of /cvsroot/quantlibaddin/QuantLibAddin/gensrc/scripts
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17144/gensrc/scripts

Modified Files:
	gensrc.py 
Removed Files:
	Makefile.am 
Log Message:
merge R000313f0-branch

--- Makefile.am DELETED ---

Index: gensrc.py
===================================================================
RCS file: /cvsroot/quantlibaddin/QuantLibAddin/gensrc/scripts/gensrc.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gensrc.py	29 Jul 2006 15:32:32 -0000	1.3
--- gensrc.py	28 Aug 2006 10:05:24 -0000	1.4
***************
*** 67,87 ****
      elif o == '-o':
          addins.append(utilities.serializeObject(addincalc.AddinCalc))
!     #elif o == '-c':
!     #    addins.append(utilities.serializeObject(addinc.AddinC))
!     #elif o == '-g':
!     #    addins.append(utilities.serializeObject(addinguile.AddinGuile))
      elif o == '-d':
          addins.append(utilities.serializeObject(addindoxygen.AddinDoxygen))
      elif o == '-v':
          addins.append(utilities.serializeObject(valueobjects.ValueObjects))
!     #elif o == '-a':
!     #    if len(opts) != 1: sys.exit('flag -a cannot be combined with other flags')
!     #    addins.append(utilities.serializeObject(addinqla.AddinQla))
!     #    addins.append(utilities.serializeObject(addinexcel.AddinExcel))
!     #    addins.append(utilities.serializeObject(addincalc.AddinCalc))
!     #    addins.append(utilities.serializeObject(addinc.AddinC))
!     #    addins.append(utilities.serializeObject(addinguile.AddinGuile))
!     #    addins.append(utilities.serializeObject(addindoxygen.AddinDoxygen))
!     #    addins.append(utilities.serializeObject(valueobjects.ValueObjects))
      else:
          usage()
--- 67,87 ----
      elif o == '-o':
          addins.append(utilities.serializeObject(addincalc.AddinCalc))
!     elif o == '-c':
!         addins.append(utilities.serializeObject(addinc.AddinC))
!     elif o == '-g':
!         addins.append(utilities.serializeObject(addinguile.AddinGuile))
      elif o == '-d':
          addins.append(utilities.serializeObject(addindoxygen.AddinDoxygen))
      elif o == '-v':
          addins.append(utilities.serializeObject(valueobjects.ValueObjects))
!     elif o == '-a':
!         if len(opts) != 1: sys.exit('flag -a cannot be combined with other flags')
!         addins.append(utilities.serializeObject(addinqla.AddinQla))
!         addins.append(utilities.serializeObject(addinexcel.AddinExcel))
!         addins.append(utilities.serializeObject(addincalc.AddinCalc))
!         addins.append(utilities.serializeObject(addinc.AddinC))
!         addins.append(utilities.serializeObject(addinguile.AddinGuile))
!         addins.append(utilities.serializeObject(addindoxygen.AddinDoxygen))
!         addins.append(utilities.serializeObject(valueobjects.ValueObjects))
      else:
          usage()