[ctypes-commit] ctypes/sandbox/tools/codegen xml2py.py,1.1,1.2

[Thomas H. <th...@us...>]

Update of /cvsroot/ctypes/ctypes/sandbox/tools/codegen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10876

Modified Files:
	xml2py.py 
Log Message:
Added --dll and --windows-dlls options.


Index: xml2py.py
===================================================================
RCS file: /cvsroot/ctypes/ctypes/sandbox/tools/codegen/xml2py.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xml2py.py	23 Nov 2004 20:05:57 -0000	1.1
--- xml2py.py	2 Dec 2004 12:56:16 -0000	1.2
***************
*** 6,13 ****
  ################################################################
  
! def main():
      from optparse import OptionParser
  
      parser = OptionParser("usage: %prog [options] xmlfile")
      parser.add_option("-s",
                        dest="symbols",
--- 6,26 ----
  ################################################################
  
! def main(args=None):
!     if args is None:
!         args = sys.argv
      from optparse import OptionParser
  
+     def windows_dlls(option, opt, value, parser):
+         parser.values.dlls.extend("kernel32 gdi32 user32".split())
+ 
      parser = OptionParser("usage: %prog [options] xmlfile")
+     parser.add_option("--windows-dlls",
+                       action="callback",
+                       callback=windows_dlls,
+                       help="add all standard windows dlls")
+     parser.add_option("--dll",
+                       dest="dlls",
+                       action="append",
+                       default=[])
      parser.add_option("-s",
                        dest="symbols",
***************
*** 16,31 ****
                        default=None)
      parser.add_option("-o",
!                       dest="python_file",
                        help="output filename (if not specified, standard output will be used)",
                        default="-")
!     options, files = parser.parse_args()
  
      if len(files) != 1:
!         parser.error("Only one input file can be specified")
  
!     if options.python_file == "-":
          stream = sys.stdout
      else:
!         stream = open(options.python_file, "w")
  
      generate_code(files[0], stream, symbols=options.symbols)
--- 29,44 ----
                        default=None)
      parser.add_option("-o",
!                       dest="output",
                        help="output filename (if not specified, standard output will be used)",
                        default="-")
!     options, files = parser.parse_args(args[1:])
  
      if len(files) != 1:
!         parser.error("Exactly one input file must be specified")
  
!     if options.output == "-":
          stream = sys.stdout
      else:
!         stream = open(options.output, "w")
  
      generate_code(files[0], stream, symbols=options.symbols)
***************
*** 33,42 ****
  
  if __name__ == "__main__":
!     import sys
!     if len(sys.argv) == 1:
! ##        sys.argv.append("win32.xml")
! ##        sys.argv.append("-sCoCreateInstance")
!         sys.argv.append("win32.xml")
!         sys.argv.append("-sCLSIDFromString,StringFromGUID2,IsEqualGUID")
! ##        sys.argv.append("-owin32.py")
!     main()
--- 46,48 ----
  
  if __name__ == "__main__":
!     sys.exit(main())