[pywin32-checkins] pywin32 setup_win32all.py,1.13,1.14

[<mha...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17030

Modified Files:
	setup_win32all.py 
Log Message:
Correct the case of directory names, and other minor tweaks so sdist works


Index: setup_win32all.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup_win32all.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** setup_win32all.py	7 Feb 2004 01:07:59 -0000	1.13
--- setup_win32all.py	7 Feb 2004 09:55:11 -0000	1.14
***************
*** 261,264 ****
--- 261,265 ----
          if extra not in self.library_dirs and os.path.isdir(extra):
              self.library_dirs.append(os.path.join(extra))
+         self.excluded_extensions = [] # list of (ext, why)
  
      def _why_cant_build_extension(self, ext):
***************
*** 321,325 ****
  
          self.found_libraries = {}        
-         self.excluded_extensions = [] # list of (ext, why)
  
          # Here we hack a "pywin32" directory (one of 'win32', 'win32com',
--- 322,325 ----
***************
*** 372,376 ****
          file_util.copy_file(
                      os.path.join(self.build_temp, "scintilla", base_name),
!                     os.path.join(self.build_lib, "Pythonwin"),
                      verbose = self.verbose, dry_run = self.dry_run)
  
--- 372,376 ----
          file_util.copy_file(
                      os.path.join(self.build_temp, "scintilla", base_name),
!                     os.path.join(self.build_lib, "pythonwin"),
                      verbose = self.verbose, dry_run = self.dry_run)
  
***************
*** 828,834 ****
  
  # NOTE: somewhat counter-intuitively, a result list a-la:
! #  [('Lib/site-packages\\Pythonwin', ('Pythonwin/license.txt',)),]
  # will 'do the right thing' in terms of installing licence.txt into
! # 'Lib/site-packages/Pythonwin/licence.txt'.  We exploit this to
  # get 'com/win32com/whatever' installed to 'win32com/whatever'
  def convert_data_files(files):
--- 828,834 ----
  
  # NOTE: somewhat counter-intuitively, a result list a-la:
! #  [('Lib/site-packages\\pythonwin', ('pythonwin/license.txt',)),]
  # will 'do the right thing' in terms of installing licence.txt into
! # 'Lib/site-packages/pythonwin/licence.txt'.  We exploit this to
  # get 'com/win32com/whatever' installed to 'win32com/whatever'
  def convert_data_files(files):
***************
*** 842,845 ****
--- 842,847 ----
              # We never want CVS
              flist.exclude_pattern(re.compile(".*\\\\CVS\\\\"), is_regex=1)
+             flist.exclude_pattern("*.pyc")
+             flist.exclude_pattern("*.pyo")
              if not flist.files:
                  raise RuntimeError, "No files match '%s'" % file
***************
*** 849,856 ****
                  raise RuntimeError, "No file '%s'" % file
              files_use = (file,)
!         path_use = os.path.dirname(file)
!         if path_use.startswith("com/") or path_use.startswith("com\\"):
!             path_use = path_use[4:]
!         ret.append( (path_use, files_use))
      return ret
  
--- 851,859 ----
                  raise RuntimeError, "No file '%s'" % file
              files_use = (file,)
!         for fname in files_use:
!             path_use = os.path.dirname(fname)
!             if path_use.startswith("com/") or path_use.startswith("com\\"):
!                 path_use = path_use[4:]
!             ret.append( (path_use, (fname,)))
      return ret
  
***************
*** 893,907 ****
            'win32comext.axcontrol',
  
!           'Pythonwin.pywin',
!           'Pythonwin.pywin.debugger',
!           'Pythonwin.pywin.dialogs',
!           'Pythonwin.pywin.docking',
!           'Pythonwin.pywin.framework',
!           'Pythonwin.pywin.framework.editor',
!           'Pythonwin.pywin.framework.editor.color',
!           'Pythonwin.pywin.idle',
!           'Pythonwin.pywin.mfc',
!           'Pythonwin.pywin.scintilla',
!           'Pythonwin.pywin.tools',
            ]
  
--- 896,910 ----
            'win32comext.axcontrol',
  
!           'pythonwin.pywin',
!           'pythonwin.pywin.debugger',
!           'pythonwin.pywin.dialogs',
!           'pythonwin.pywin.docking',
!           'pythonwin.pywin.framework',
!           'pythonwin.pywin.framework.editor',
!           'pythonwin.pywin.framework.editor.color',
!           'pythonwin.pywin.idle',
!           'pythonwin.pywin.mfc',
!           'pythonwin.pywin.scintilla',
!           'pythonwin.pywin.tools',
            ]
  
***************
*** 942,946 ****
        package_dir = {"win32com": "com/win32com",
                       "win32comext": "com/win32comext",
!                      "Pythonwin": "Pythonwin"},
        packages = packages,
        py_modules = py_modules,
--- 945,949 ----
        package_dir = {"win32com": "com/win32com",
                       "win32comext": "com/win32comext",
!                      "pythonwin": "pythonwin"},
        packages = packages,
        py_modules = py_modules,
***************
*** 953,976 ****
                  'pythonwin/license.txt',
                  'win32/license.txt',
!                 'win32/scripts/*.py',
!                 'win32/scripts/VersionStamp/*.py',
!                 'win32/test/*.py',
                  'com/win32com/readme.htm',
                  # win32com test utility files.
!                 'com/win32com/test/*.txt',
!                 'com/win32com/test/*.vbs',
!                 'com/win32com/test/*.js',
!                 'com/win32com/test/*.sct',
!                 'com/win32com/test/*.xsl',
                  # win32com docs
                  'com/win32com/HTML/*',
-                 'com/win32com/HTML/image/*',
                  # Active Scripting test and demos.
!                 'com/win32comext/axscript/test/*.py',
!                 'com/win32comext/axscript/test/*.vbs',
!                 'com/win32comext/axscript/test/*.pys',
!                 'com/win32comext/axscript/demos/client/ie/*',
!                 'com/win32comext/axscript/demos/client/wsh/*',
!                 'com/win32comext/axscript/demos/client/asp/*',
                   ]) +
                  # And data files convert_data_files can't handle.
--- 956,970 ----
                  'pythonwin/license.txt',
                  'win32/license.txt',
!                 'win32/scripts/*',
!                 'win32/test/*',
!                 'win32/Demos/*',
                  'com/win32com/readme.htm',
                  # win32com test utility files.
!                 'com/win32com/test/*',
                  # win32com docs
                  'com/win32com/HTML/*',
                  # Active Scripting test and demos.
!                 'com/win32comext/axscript/test/*',
!                 'com/win32comext/axscript/Demos/*',
                   ]) +
                  # And data files convert_data_files can't handle.
***************
*** 989,999 ****
          what_string += "/installed"
      # Print the list of extension modules we skipped building.
!     excluded_extensions = dist.command_obj['build_ext'].excluded_extensions
!     if excluded_extensions:
!         print "*** NOTE: The following extensions were NOT %s:" % what_string
!         for ext, why in excluded_extensions:
!             print " %s: %s" % (ext.name, why)
!     else:
!         print "All extension modules %s OK" % (what_string,)
  
  # Custom script we run at the end of installing - this is the same script
--- 983,994 ----
          what_string += "/installed"
      # Print the list of extension modules we skipped building.
!     if dist.command_obj.has_key('build_ext'):
!         excluded_extensions = dist.command_obj['build_ext'].excluded_extensions
!         if excluded_extensions:
!             print "*** NOTE: The following extensions were NOT %s:" % what_string
!             for ext, why in excluded_extensions:
!                 print " %s: %s" % (ext.name, why)
!         else:
!             print "All extension modules %s OK" % (what_string,)
  
  # Custom script we run at the end of installing - this is the same script