[Python-checkins] python/dist/src/Lib/distutils/command bdist_dumb.py,1.19,1.20 bdist_packager.py,1.2,1.3 bdist_pkgtool.py,1.2,1.3 bdist_rpm.py,1.28,1.29 bdist_sdux.py,1.1,1.2 bdist_wininst.py,1.31,1.32 build_clib.py,1.24,1.25 build_ext.py,1.80,1.81 build_py.py,1.37,1.38 build_scripts.py,1.15,1.16 clean.py,1.12,1.13 config.py,1.10,1.11 install_lib.py,1.39,1.40 install_scripts.py,1.11,1.12 sdist.py,1.53,1.54
jhylton@users.sourceforge.net
jhylton@users.sourceforge.net
Tue, 04 Jun 2002 13:14:45 -0700
- Previous message: [Python-checkins] python/dist/src/Lib/distutils archive_util.py,1.11,1.12 bcppcompiler.py,1.11,1.12 ccompiler.py,1.43,1.44 cmd.py,1.29,1.30 core.py,1.47,1.48 cygwinccompiler.py,1.14,1.15 dir_util.py,1.8,1.9 dist.py,1.53,1.54 emxccompiler.py,1.1,1.2 fancy_getopt.py,1.20,1.21 file_util.py,1.12,1.13 filelist.py,1.9,1.10 msvccompiler.py,1.46,1.47 mwerkscompiler.py,1.6,1.7 spawn.py,1.12,1.13 unixccompiler.py,1.39,1.40 util.py,1.67,1.68
- Next message: [Python-checkins] python/dist/src/Lib/distutils filelist.py,1.10,1.11 unixccompiler.py,1.40,1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/python/python/dist/src/Lib/distutils/command
In directory usw-pr-cvs1:/tmp/cvs-serv6520/command
Modified Files:
bdist_dumb.py bdist_packager.py bdist_pkgtool.py bdist_rpm.py
bdist_sdux.py bdist_wininst.py build_clib.py build_ext.py
build_py.py build_scripts.py clean.py config.py install_lib.py
install_scripts.py sdist.py
Log Message:
Make setup.py less chatty by default.
This is a conservative version of SF patch 504889. It uses the log
module instead of calling print in various places, and it ignores the
verbose argument passed to many functions and set as an attribute on
some objects. Instead, it uses the verbosity set on the logger via
the command line.
The log module is now preferred over announce() and warn() methods
that exist only for backwards compatibility.
XXX This checkin changes a lot of modules that have no test suite and
aren't exercised by the Python build process. It will need
substantial testing.
Index: bdist_dumb.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_dumb.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** bdist_dumb.py 9 Apr 2002 14:14:38 -0000 1.19
--- bdist_dumb.py 4 Jun 2002 20:14:42 -0000 1.20
***************
*** 14,17 ****
--- 14,18 ----
from distutils.dir_util import create_tree, remove_tree
from distutils.errors import *
+ from distutils import log
class bdist_dumb (Command):
***************
*** 84,88 ****
install.warn_dir = 0
! self.announce("installing to %s" % self.bdist_dir)
self.run_command('install')
--- 85,89 ----
install.warn_dir = 0
! log.info("installing to %s" % self.bdist_dir)
self.run_command('install')
***************
*** 102,106 ****
if not self.keep_temp:
! remove_tree(self.bdist_dir, self.verbose, self.dry_run)
# run()
--- 103,107 ----
if not self.keep_temp:
! remove_tree(self.bdist_dir, dry_run=self.dry_run)
# run()
Index: bdist_packager.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_packager.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** bdist_packager.py 23 Apr 2002 18:18:43 -0000 1.2
--- bdist_packager.py 4 Jun 2002 20:14:42 -0000 1.3
***************
*** 15,18 ****
--- 15,19 ----
from distutils.file_util import write_file
from distutils.errors import *
+ from distutils import log
import string, sys
***************
*** 103,108 ****
setattr(self,attr,default)
val = default
! if val!="":
! self.announce('Creating %s script', attr)
self.execute(write_file,
(path, self.get_script(attr)),
--- 104,109 ----
setattr(self,attr,default)
val = default
! if val != "":
! log.info('Creating %s script', attr)
self.execute(write_file,
(path, self.get_script(attr)),
***************
*** 235,239 ****
install.root = self.pkg_dir
! self.announce("installing to %s" % self.pkg_dir)
self.run_command('install')
--- 236,240 ----
install.root = self.pkg_dir
! log.info("installing to %s", self.pkg_dir)
self.run_command('install')
***************
*** 244,248 ****
if not self.keep_temp:
! remove_tree(self.pkg_dir, self.verbose, self.dry_run)
# run()
--- 245,249 ----
if not self.keep_temp:
! remove_tree(self.pkg_dir, dry_run=self.dry_run)
# run()
Index: bdist_pkgtool.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_pkgtool.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** bdist_pkgtool.py 23 Apr 2002 18:18:43 -0000 1.2
--- bdist_pkgtool.py 4 Jun 2002 20:14:43 -0000 1.3
***************
*** 16,19 ****
--- 16,20 ----
from distutils.command import bdist_packager
from distutils import sysconfig
+ from distutils import log
import compileall
from commands import getoutput
***************
*** 212,218 ****
install = self.reinitialize_command('install', reinit_subcommands=1)
# build package
! self.announce('Building package')
self.run_command('build')
! self.announce('Creating pkginfo file')
path = os.path.join(pkg_dir, "pkginfo")
self.execute(write_file,
--- 213,219 ----
install = self.reinitialize_command('install', reinit_subcommands=1)
# build package
! log.info('Building package')
self.run_command('build')
! log.info('Creating pkginfo file')
path = os.path.join(pkg_dir, "pkginfo")
self.execute(write_file,
***************
*** 245,249 ****
'depend',None)
! self.announce('Creating prototype file')
path = os.path.join(pkg_dir, "prototype")
self.execute(write_file,
--- 246,250 ----
'depend',None)
! log.info('Creating prototype file')
path = os.path.join(pkg_dir, "prototype")
self.execute(write_file,
***************
*** 257,261 ****
! self.announce('Creating package')
pkg_cmd = ['pkgmk', '-o', '-f']
pkg_cmd.append(path)
--- 258,262 ----
! log.info('Creating package')
pkg_cmd = ['pkgmk', '-o', '-f']
pkg_cmd.append(path)
***************
*** 266,270 ****
path = os.path.join(os.environ['PWD'],pkg_dir,
self.get_binary_name() + ".pkg")
! self.announce('Transferring package to ' + pkg_dir)
pkg_cmd.append(path)
pkg_cmd.append(self.pkg_abrev)
--- 267,271 ----
path = os.path.join(os.environ['PWD'],pkg_dir,
self.get_binary_name() + ".pkg")
! log.info('Transferring package to ' + pkg_dir)
pkg_cmd.append(path)
pkg_cmd.append(self.pkg_abrev)
***************
*** 327,331 ****
request=string.split(DEFAULT_REQUEST,"\012")
else:
! self.announce('Creating relocation request script')
if self.request:
users_request=self.get_script('request')
--- 328,332 ----
request=string.split(DEFAULT_REQUEST,"\012")
else:
! log.info('Creating relocation request script')
if self.request:
users_request=self.get_script('request')
Index: bdist_rpm.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_rpm.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** bdist_rpm.py 21 Mar 2002 23:27:54 -0000 1.28
--- bdist_rpm.py 4 Jun 2002 20:14:43 -0000 1.29
***************
*** 15,18 ****
--- 15,19 ----
from distutils.file_util import write_file
from distutils.errors import *
+ from distutils import log
class bdist_rpm (Command):
***************
*** 279,283 ****
# build package
! self.announce('building RPMs')
rpm_cmd = ['rpm']
if self.source_only: # what kind of RPMs?
--- 280,284 ----
# build package
! log.info("building RPMs")
rpm_cmd = ['rpm']
if self.source_only: # what kind of RPMs?
Index: bdist_sdux.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_sdux.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bdist_sdux.py 17 Apr 2002 20:30:10 -0000 1.1
--- bdist_sdux.py 4 Jun 2002 20:14:43 -0000 1.2
***************
*** 15,18 ****
--- 15,19 ----
from distutils.errors import *
from distutils.command import bdist_packager
+ from distutils import log
import sys
from commands import getoutput
***************
*** 186,192 ****
"%s.psf" % self.get_binary_name())
# build package
! self.announce('Building package')
self.run_command('build')
! self.announce('Creating psf file')
self.execute(write_file,
(psf_path,
--- 187,193 ----
"%s.psf" % self.get_binary_name())
# build package
! log.info('Building package')
self.run_command('build')
! log.info('Creating psf file')
self.execute(write_file,
(psf_path,
***************
*** 196,200 ****
return
! self.announce('Creating package')
spawn_cmd = ['swpackage', '-s']
spawn_cmd.append(psf_path)
--- 197,201 ----
return
! log.info('Creating package')
spawn_cmd = ['swpackage', '-s']
spawn_cmd.append(psf_path)
Index: bdist_wininst.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_wininst.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** bdist_wininst.py 9 Apr 2002 14:14:38 -0000 1.31
--- bdist_wininst.py 4 Jun 2002 20:14:43 -0000 1.32
***************
*** 13,16 ****
--- 13,17 ----
from distutils.dir_util import create_tree, remove_tree
from distutils.errors import *
+ from distutils import log
class bdist_wininst (Command):
***************
*** 116,120 ****
value)
! self.announce("installing to %s" % self.bdist_dir)
install.ensure_finalized()
--- 117,121 ----
value)
! log.info("installing to %s", self.bdist_dir)
install.ensure_finalized()
***************
*** 137,145 ****
self.create_exe(arcname, fullname, self.bitmap)
# remove the zip-file again
! self.announce("removing temporary file '%s'" % arcname)
os.remove(arcname)
if not self.keep_temp:
! remove_tree(self.bdist_dir, self.verbose, self.dry_run)
# run()
--- 138,146 ----
self.create_exe(arcname, fullname, self.bitmap)
# remove the zip-file again
! log.debug("removing temporary file '%s'", arcname)
os.remove(arcname)
if not self.keep_temp:
! remove_tree(self.bdist_dir, dry_run=self.dry_run)
# run()
Index: build_clib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/build_clib.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** build_clib.py 6 Dec 2001 20:59:17 -0000 1.24
--- build_clib.py 4 Jun 2002 20:14:43 -0000 1.25
***************
*** 25,29 ****
from distutils.errors import *
from distutils.sysconfig import customize_compiler
!
def show_compilers ():
--- 25,29 ----
from distutils.errors import *
from distutils.sysconfig import customize_compiler
! from distutils import log
def show_compilers ():
***************
*** 112,116 ****
from distutils.ccompiler import new_compiler
self.compiler = new_compiler(compiler=self.compiler,
- verbose=self.verbose,
dry_run=self.dry_run,
force=self.force)
--- 112,115 ----
***************
*** 214,218 ****
sources = list(sources)
! self.announce("building '%s' library" % lib_name)
# First, compile the source code to object files in the library
--- 213,217 ----
sources = list(sources)
! log.info("building '%s' library", lib_name)
# First, compile the source code to object files in the library
Index: build_ext.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/build_ext.py,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** build_ext.py 25 Apr 2002 17:26:37 -0000 1.80
--- build_ext.py 4 Jun 2002 20:14:43 -0000 1.81
***************
*** 16,19 ****
--- 16,20 ----
from distutils.dep_util import newer_group
from distutils.extension import Extension
+ from distutils import log
# An extension name is just a dot-separated list of Python NAMEs (ie.
***************
*** 292,298 ****
(ext_name, build_info) = ext
! self.warn(("old-style (ext_name, build_info) tuple found in "
! "ext_modules for extension '%s'"
! "-- please convert to Extension instance" % ext_name))
if type(ext) is not TupleType and len(ext) != 2:
raise DistutilsSetupError, \
--- 293,299 ----
(ext_name, build_info) = ext
! log.warn(("old-style (ext_name, build_info) tuple found in "
! "ext_modules for extension '%s'"
! "-- please convert to Extension instance" % ext_name))
if type(ext) is not TupleType and len(ext) != 2:
raise DistutilsSetupError, \
***************
*** 330,335 ****
ext.runtime_library_dirs = build_info.get('rpath')
if build_info.has_key('def_file'):
! self.warn("'def_file' element of build info dict "
! "no longer supported")
# Non-trivial stuff: 'macros' split into 'define_macros'
--- 331,336 ----
ext.runtime_library_dirs = build_info.get('rpath')
if build_info.has_key('def_file'):
! log.warn("'def_file' element of build info dict "
! "no longer supported")
# Non-trivial stuff: 'macros' split into 'define_macros'
***************
*** 423,431 ****
if not (self.force or newer_group(sources, ext_filename, 'newer')):
! self.announce("skipping '%s' extension (up-to-date)" %
! ext.name)
return
else:
! self.announce("building '%s' extension" % ext.name)
# First, scan the sources for SWIG definition files (.i), run
--- 424,431 ----
if not (self.force or newer_group(sources, ext_filename, 'newer')):
! log.debug("skipping '%s' extension (up-to-date)", ext.name)
return
else:
! log.info("building '%s' extension", ext.name)
# First, scan the sources for SWIG definition files (.i), run
***************
*** 540,544 ****
for source in swig_sources:
target = swig_targets[source]
! self.announce("swigging %s to %s" % (source, target))
self.spawn(swig_cmd + ["-o", target, source])
--- 540,544 ----
for source in swig_sources:
target = swig_targets[source]
! log.info("swigging %s to %s", source, target)
self.spawn(swig_cmd + ["-o", target, source])
Index: build_py.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/build_py.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** build_py.py 4 Apr 2002 23:17:31 -0000 1.37
--- build_py.py 4 Jun 2002 20:14:43 -0000 1.38
***************
*** 14,18 ****
from distutils.errors import *
from distutils.util import convert_path
!
class build_py (Command):
--- 14,18 ----
from distutils.errors import *
from distutils.util import convert_path
! from distutils import log
class build_py (Command):
***************
*** 177,182 ****
return init_py
else:
! self.warn(("package init file '%s' not found " +
! "(or not a regular file)") % init_py)
# Either not in a package at all (__init__.py not expected), or
--- 177,182 ----
return init_py
else:
! log.warn(("package init file '%s' not found " +
! "(or not a regular file)"), init_py)
# Either not in a package at all (__init__.py not expected), or
***************
*** 189,194 ****
def check_module (self, module, module_file):
if not os.path.isfile(module_file):
! self.warn("file %s (for module %s) not found" %
! (module_file, module))
return 0
else:
--- 189,193 ----
def check_module (self, module, module_file):
if not os.path.isfile(module_file):
! log.warn("file %s (for module %s) not found", module_file, module)
return 0
else:
***************
*** 390,401 ****
if self.compile:
byte_compile(files, optimize=0,
! force=self.force,
! prefix=prefix,
! verbose=self.verbose, dry_run=self.dry_run)
if self.optimize > 0:
byte_compile(files, optimize=self.optimize,
! force=self.force,
! prefix=prefix,
! verbose=self.verbose, dry_run=self.dry_run)
# class build_py
--- 389,396 ----
if self.compile:
byte_compile(files, optimize=0,
! force=self.force, prefix=prefix, dry_run=self.dry_run)
if self.optimize > 0:
byte_compile(files, optimize=self.optimize,
! force=self.force, prefix=prefix, dry_run=self.dry_run)
# class build_py
Index: build_scripts.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/build_scripts.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** build_scripts.py 28 Feb 2002 09:16:21 -0000 1.15
--- build_scripts.py 4 Jun 2002 20:14:43 -0000 1.16
***************
*** 12,15 ****
--- 12,16 ----
from distutils.dep_util import newer
from distutils.util import convert_path
+ from distutils import log
# check if Python is called on the first line with this expression
***************
*** 60,64 ****
if not self.force and not newer(script, outfile):
! self.announce("not copying %s (up-to-date)" % script)
continue
--- 61,65 ----
if not self.force and not newer(script, outfile):
! log.debug("not copying %s (up-to-date)", script)
continue
***************
*** 84,89 ****
if adjust:
! self.announce("copying and adjusting %s -> %s" %
! (script, self.build_dir))
if not self.dry_run:
outf = open(outfile, "w")
--- 85,90 ----
if adjust:
! log.info("copying and adjusting %s -> %s", script,
! self.build_dir)
if not self.dry_run:
outf = open(outfile, "w")
Index: clean.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/clean.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** clean.py 14 Oct 2000 04:06:40 -0000 1.12
--- clean.py 4 Jun 2002 20:14:43 -0000 1.13
***************
*** 10,13 ****
--- 10,14 ----
from distutils.core import Command
from distutils.dir_util import remove_tree
+ from distutils import log
class clean (Command):
***************
*** 52,59 ****
# gone)
if os.path.exists(self.build_temp):
! remove_tree(self.build_temp, self.verbose, self.dry_run)
else:
! self.warn("'%s' does not exist -- can't clean it" %
! self.build_temp)
if self.all:
--- 53,60 ----
# gone)
if os.path.exists(self.build_temp):
! remove_tree(self.build_temp, dry_run=self.dry_run)
else:
! log.warn("'%s' does not exist -- can't clean it",
! self.build_temp)
if self.all:
***************
*** 63,70 ****
self.build_scripts):
if os.path.exists(directory):
! remove_tree(directory, self.verbose, self.dry_run)
else:
! self.warn("'%s' does not exist -- can't clean it" %
! directory)
# just for the heck of it, try to remove the base build directory:
--- 64,71 ----
self.build_scripts):
if os.path.exists(directory):
! remove_tree(directory, dry_run=self.dry_run)
else:
! log.warn("'%s' does not exist -- can't clean it",
! directory)
# just for the heck of it, try to remove the base build directory:
***************
*** 73,77 ****
try:
os.rmdir(self.build_base)
! self.announce("removing '%s'" % self.build_base)
except OSError:
pass
--- 74,78 ----
try:
os.rmdir(self.build_base)
! log.info("removing '%s'", self.build_base)
except OSError:
pass
Index: config.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/config.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** config.py 6 Dec 2001 20:57:12 -0000 1.10
--- config.py 4 Jun 2002 20:14:43 -0000 1.11
***************
*** 18,22 ****
from distutils.core import Command
from distutils.errors import DistutilsExecError
!
LANG_EXT = {'c': '.c',
--- 18,22 ----
from distutils.core import Command
from distutils.errors import DistutilsExecError
! from distutils import log
LANG_EXT = {'c': '.c',
***************
*** 104,110 ****
if not isinstance(self.compiler, CCompiler):
self.compiler = new_compiler(compiler=self.compiler,
! verbose=self.noisy,
! dry_run=self.dry_run,
! force=1)
if self.include_dirs:
self.compiler.set_include_dirs(self.include_dirs)
--- 104,108 ----
if not isinstance(self.compiler, CCompiler):
self.compiler = new_compiler(compiler=self.compiler,
! dry_run=self.dry_run, force=1)
if self.include_dirs:
self.compiler.set_include_dirs(self.include_dirs)
***************
*** 162,166 ****
filenames = self.temp_files
self.temp_files = []
! self.announce("removing: " + string.join(filenames))
for filename in filenames:
try:
--- 160,164 ----
filenames = self.temp_files
self.temp_files = []
! log.info("removing: %s", string.join(filenames))
for filename in filenames:
try:
***************
*** 240,244 ****
ok = 0
! self.announce(ok and "success!" or "failure.")
self._clean()
return ok
--- 238,242 ----
ok = 0
! log.info(ok and "success!" or "failure.")
self._clean()
return ok
***************
*** 261,265 ****
ok = 0
! self.announce(ok and "success!" or "failure.")
self._clean()
return ok
--- 259,263 ----
ok = 0
! log.info(ok and "success!" or "failure.")
self._clean()
return ok
***************
*** 283,287 ****
ok = 0
! self.announce(ok and "success!" or "failure.")
self._clean()
return ok
--- 281,285 ----
ok = 0
! log.info(ok and "success!" or "failure.")
self._clean()
return ok
Index: install_lib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/install_lib.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** install_lib.py 30 May 2002 19:15:16 -0000 1.39
--- install_lib.py 4 Jun 2002 20:14:43 -0000 1.40
***************
*** 125,135 ****
if self.compile:
byte_compile(files, optimize=0,
! force=self.force,
! prefix=install_root,
! verbose=self.verbose, dry_run=self.dry_run)
if self.optimize > 0:
byte_compile(files, optimize=self.optimize,
! force=self.force,
! prefix=install_root,
verbose=self.verbose, dry_run=self.dry_run)
--- 125,133 ----
if self.compile:
byte_compile(files, optimize=0,
! force=self.force, prefix=install_root,
! dry_run=self.dry_run)
if self.optimize > 0:
byte_compile(files, optimize=self.optimize,
! force=self.force, prefix=install_root,
verbose=self.verbose, dry_run=self.dry_run)
Index: install_scripts.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/install_scripts.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** install_scripts.py 31 Jan 2002 22:08:38 -0000 1.11
--- install_scripts.py 4 Jun 2002 20:14:43 -0000 1.12
***************
*** 10,13 ****
--- 10,14 ----
import os
from distutils.core import Command
+ from distutils import log
from stat import ST_MODE
***************
*** 49,56 ****
for file in self.get_outputs():
if self.dry_run:
! self.announce("changing mode of %s" % file)
else:
mode = ((os.stat(file)[ST_MODE]) | 0111) & 07777
! self.announce("changing mode of %s to %o" % (file, mode))
os.chmod(file, mode)
--- 50,57 ----
for file in self.get_outputs():
if self.dry_run:
! log.info("changing mode of %s to %o", file, mode)
else:
mode = ((os.stat(file)[ST_MODE]) | 0111) & 07777
! log.info("changing mode of %s to %o", file, mode)
os.chmod(file, mode)
Index: sdist.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/sdist.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** sdist.py 6 Dec 2001 20:57:12 -0000 1.53
--- sdist.py 4 Jun 2002 20:14:43 -0000 1.54
***************
*** 15,18 ****
--- 15,19 ----
from distutils.errors import *
from distutils.filelist import FileList
+ from distutils import log
***************
*** 234,262 ****
"(using default file list)") %
self.template)
-
self.filelist.findall()
- # Add default file set to 'files'
if self.use_defaults:
self.add_defaults()
-
- # Read manifest template if it exists
if template_exists:
self.read_template()
-
- # Prune away any directories that don't belong in the source
- # distribution
if self.prune:
self.prune_file_list()
- # File list now complete -- sort it so that higher-level files
- # come first
self.filelist.sort()
-
- # Remove duplicates from the file list
self.filelist.remove_duplicates()
-
- # And write complete file list (including default file set) to
- # the manifest.
self.write_manifest()
--- 235,249 ----
***************
*** 322,332 ****
def read_template (self):
! """Read and parse the manifest template file named by
! 'self.template' (usually "MANIFEST.in"). The parsing and
! processing is done by 'self.filelist', which updates itself
! accordingly.
"""
! self.announce("reading manifest template '%s'" % self.template)
template = TextFile(self.template,
strip_comments=1,
--- 309,318 ----
def read_template (self):
+ """Read and parse manifest template file named by self.template.
! (usually "MANIFEST.in") The parsing and processing is done by
! 'self.filelist', which updates itself accordingly.
"""
! log.info("reading manifest template '%s'", self.template)
template = TextFile(self.template,
strip_comments=1,
***************
*** 385,389 ****
distribution.
"""
! self.announce("reading manifest file '%s'" % self.manifest)
manifest = open(self.manifest)
while 1:
--- 371,375 ----
distribution.
"""
! log.info("reading manifest file '%s'", self.manifest)
manifest = open(self.manifest)
while 1:
***************
*** 411,416 ****
# if the manifest happens to be empty.
self.mkpath(base_dir)
! dir_util.create_tree(base_dir, files,
! verbose=self.verbose, dry_run=self.dry_run)
# And walk over the list of files, either making a hard link (if
--- 397,401 ----
# if the manifest happens to be empty.
self.mkpath(base_dir)
! dir_util.create_tree(base_dir, files, dry_run=self.dry_run)
# And walk over the list of files, either making a hard link (if
***************
*** 429,438 ****
if not files:
! self.warn("no files to distribute -- empty manifest?")
else:
! self.announce(msg)
for file in files:
if not os.path.isfile(file):
! self.warn("'%s' not a regular file -- skipping" % file)
else:
dest = os.path.join(base_dir, file)
--- 414,423 ----
if not files:
! log.warn("no files to distribute -- empty manifest?")
else:
! log.info(msg)
for file in files:
if not os.path.isfile(file):
! log.warn("'%s' not a regular file -- skipping" % file)
else:
dest = os.path.join(base_dir, file)
***************
*** 465,469 ****
if not self.keep_temp:
! dir_util.remove_tree(base_dir, self.verbose, self.dry_run)
def get_archive_files (self):
--- 450,454 ----
if not self.keep_temp:
! dir_util.remove_tree(base_dir, dry_run=self.dry_run)
def get_archive_files (self):
- Previous message: [Python-checkins] python/dist/src/Lib/distutils archive_util.py,1.11,1.12 bcppcompiler.py,1.11,1.12 ccompiler.py,1.43,1.44 cmd.py,1.29,1.30 core.py,1.47,1.48 cygwinccompiler.py,1.14,1.15 dir_util.py,1.8,1.9 dist.py,1.53,1.54 emxccompiler.py,1.1,1.2 fancy_getopt.py,1.20,1.21 file_util.py,1.12,1.13 filelist.py,1.9,1.10 msvccompiler.py,1.46,1.47 mwerkscompiler.py,1.6,1.7 spawn.py,1.12,1.13 unixccompiler.py,1.39,1.40 util.py,1.67,1.68
- Next message: [Python-checkins] python/dist/src/Lib/distutils filelist.py,1.10,1.11 unixccompiler.py,1.40,1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]