[Python-checkins] CVS: python/dist/src/Lib/distutils/command config.py,1.9,1.10 bdist.py,1.20,1.21 bdist_rpm.py,1.26,1.27 bdist_wininst.py,1.24,1.25 sdist.py,1.52,1.53 install_headers.py,1.7,1.8 install_lib.py,1.37,1.38 install.py,1.59,1.60
Fred L. Drake
fdrake@users.sourceforge.net
Thu, 06 Dec 2001 12:57:15 -0800
- Previous message: [Python-checkins] CVS: python/dist/src/Lib/distutils archive_util.py,1.10,1.11 bcppcompiler.py,1.10,1.11 ccompiler.py,1.40,1.41 cmd.py,1.28,1.29 core.py,1.46,1.47 cygwinccompiler.py,1.13,1.14 dep_util.py,1.2,1.3 dir_util.py,1.7,1.8 dist.py,1.52,1.53 extension.py,1.8,1.9 fancy_getopt.py,1.19,1.20 file_util.py,1.10,1.11 filelist.py,1.8,1.9 msvccompiler.py,1.42,1.43 mwerkscompiler.py,1.5,1.6 spawn.py,1.10,1.11 sysconfig.py,1.43,1.44 text_file.py,1.13,1.14 unixccompiler.py,1.36,1.37 util.py,1.64,1.65 version.py,1.5,1.6
- Next message: [Python-checkins] CVS: python/dist/src/Lib/distutils/command build_clib.py,1.23,1.24 build_py.py,1.33,1.34
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/python/python/dist/src/Lib/distutils/command
In directory usw-pr-cvs1:/tmp/cvs-serv26867
Modified Files:
config.py bdist.py bdist_rpm.py bdist_wininst.py sdist.py
install_headers.py install_lib.py install.py
Log Message:
Whitespace normalization.
Index: config.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/config.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** config.py 2001/08/16 14:08:02 1.9
--- config.py 2001/12/06 20:57:12 1.10
***************
*** 148,152 ****
libraries, library_dirs, lang):
(src, obj) = self._compile(body, headers, include_dirs, lang)
! prog = os.path.splitext(os.path.basename(src))[0]
self.compiler.link_executable([obj], prog,
libraries=libraries,
--- 148,152 ----
libraries, library_dirs, lang):
(src, obj) = self._compile(body, headers, include_dirs, lang)
! prog = os.path.splitext(os.path.basename(src))[0]
self.compiler.link_executable([obj], prog,
libraries=libraries,
***************
*** 264,268 ****
self._clean()
return ok
!
def try_run (self, body,
headers=None, include_dirs=None,
--- 264,268 ----
self._clean()
return ok
!
def try_run (self, body,
headers=None, include_dirs=None,
Index: bdist.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** bdist.py 2000/10/14 04:06:40 1.20
--- bdist.py 2001/12/06 20:57:12 1.21
***************
*** 18,22 ****
"""Print list of available formats (arguments to "--format" option).
"""
! from distutils.fancy_getopt import FancyGetopt
formats=[]
for format in bdist.format_commands:
--- 18,22 ----
"""Print list of available formats (arguments to "--format" option).
"""
! from distutils.fancy_getopt import FancyGetopt
formats=[]
for format in bdist.format_commands:
***************
*** 105,109 ****
if self.dist_dir is None:
self.dist_dir = "dist"
!
# finalize_options()
--- 105,109 ----
if self.dist_dir is None:
self.dist_dir = "dist"
!
# finalize_options()
Index: bdist_rpm.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_rpm.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** bdist_rpm.py 2001/08/10 19:00:15 1.26
--- bdist_rpm.py 2001/12/06 20:57:12 1.27
***************
*** 102,106 ****
'rpm2-mode': 'rpm3-mode'}
!
def initialize_options (self):
self.bdist_base = None
--- 102,106 ----
'rpm2-mode': 'rpm3-mode'}
!
def initialize_options (self):
self.bdist_base = None
***************
*** 185,189 ****
"%s <%s>" % (self.distribution.get_contact(),
self.distribution.get_contact_email()))
! self.ensure_string('packager')
self.ensure_string_list('doc_files')
if type(self.doc_files) is ListType:
--- 185,189 ----
"%s <%s>" % (self.distribution.get_contact(),
self.distribution.get_contact_email()))
! self.ensure_string('packager')
self.ensure_string_list('doc_files')
if type(self.doc_files) is ListType:
***************
*** 202,206 ****
self.ensure_filename('icon')
!
self.ensure_filename('prep_script')
self.ensure_filename('build_script')
--- 202,206 ----
self.ensure_filename('icon')
!
self.ensure_filename('prep_script')
self.ensure_filename('build_script')
***************
*** 276,280 ****
raise DistutilsFileError, \
"icon file '%s' does not exist" % self.icon
!
# build package
--- 276,280 ----
raise DistutilsFileError, \
"icon file '%s' does not exist" % self.icon
!
# build package
***************
*** 369,383 ****
elif val is not None:
spec_file.append('%s: %s' % (field, val))
!
!
if self.distribution.get_url() != 'UNKNOWN':
spec_file.append('Url: ' + self.distribution.get_url())
if self.distribution_name:
! spec_file.append('Distribution: ' + self.distribution_name)
if self.build_requires:
! spec_file.append('BuildRequires: ' +
! string.join(self.build_requires))
if self.icon:
--- 369,383 ----
elif val is not None:
spec_file.append('%s: %s' % (field, val))
!
!
if self.distribution.get_url() != 'UNKNOWN':
spec_file.append('Url: ' + self.distribution.get_url())
if self.distribution_name:
! spec_file.append('Distribution: ' + self.distribution_name)
if self.build_requires:
! spec_file.append('BuildRequires: ' +
! string.join(self.build_requires))
if self.icon:
***************
*** 474,482 ****
else:
new_changelog.append(' ' + line)
!
# strip trailing newline inserted by first changelog entry
if not new_changelog[0]:
del new_changelog[0]
!
return new_changelog
--- 474,482 ----
else:
new_changelog.append(' ' + line)
!
# strip trailing newline inserted by first changelog entry
if not new_changelog[0]:
del new_changelog[0]
!
return new_changelog
Index: bdist_wininst.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_wininst.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** bdist_wininst.py 2001/10/05 20:40:48 1.24
--- bdist_wininst.py 2001/12/06 20:57:12 1.25
***************
*** 197,201 ****
if bitmap:
file.write(bitmapdata)
!
file.write(cfgdata)
header = struct.pack("<iii",
--- 197,201 ----
if bitmap:
file.write(bitmapdata)
!
file.write(cfgdata)
header = struct.pack("<iii",
Index: sdist.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/sdist.py,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** sdist.py 2001/03/22 03:10:05 1.52
--- sdist.py 2001/12/06 20:57:12 1.53
***************
*** 132,136 ****
# manifest
self.filelist = FileList()
!
# Ensure that all required meta-data is given; warn if not (but
# don't die, it's not *that* serious!)
--- 132,136 ----
# manifest
self.filelist = FileList()
!
# Ensure that all required meta-data is given; warn if not (but
# don't die, it's not *that* serious!)
***************
*** 319,324 ****
# add_defaults ()
-
def read_template (self):
--- 319,324 ----
# add_defaults ()
+
def read_template (self):
***************
*** 396,401 ****
# read_manifest ()
-
def make_release_tree (self, base_dir, files):
"""Create the directory tree that will become the source
--- 396,401 ----
# read_manifest ()
+
def make_release_tree (self, base_dir, files):
"""Create the directory tree that will become the source
***************
*** 420,424 ****
# out-of-date, because by default we blow away 'base_dir' when
# we're done making the distribution archives.)
!
if hasattr(os, 'link'): # can make hard links on this system
link = 'hard'
--- 420,424 ----
# out-of-date, because by default we blow away 'base_dir' when
# we're done making the distribution archives.)
!
if hasattr(os, 'link'): # can make hard links on this system
link = 'hard'
***************
*** 440,444 ****
self.distribution.metadata.write_pkg_info(base_dir)
!
# make_release_tree ()
--- 440,444 ----
self.distribution.metadata.write_pkg_info(base_dir)
!
# make_release_tree ()
Index: install_headers.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/install_headers.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** install_headers.py 2000/09/30 17:34:50 1.7
--- install_headers.py 2001/12/06 20:57:12 1.8
***************
*** 33,37 ****
('install_headers', 'install_dir'),
('force', 'force'))
!
def run (self):
--- 33,37 ----
('install_headers', 'install_dir'),
('force', 'force'))
!
def run (self):
Index: install_lib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/install_lib.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** install_lib.py 2000/10/03 03:32:37 1.37
--- install_lib.py 2001/12/06 20:57:12 1.38
***************
*** 21,25 ****
# 5) compile .pyc and "level 2" .pyo (--compile --optimize-more)
# 6) compile "level 2" .pyo only (--no-compile --optimize-more)
! #
# The UI for this is two option, 'compile' and 'optimize'.
# 'compile' is strictly boolean, and only decides whether to
--- 21,25 ----
# 5) compile .pyc and "level 2" .pyo (--compile --optimize-more)
# 6) compile "level 2" .pyo only (--no-compile --optimize-more)
! #
# The UI for this is two option, 'compile' and 'optimize'.
# 'compile' is strictly boolean, and only decides whether to
***************
*** 39,43 ****
('skip-build', None, "skip the build steps"),
]
!
boolean_options = ['force', 'compile', 'skip-build']
negative_opt = {'no-compile' : 'compile'}
--- 39,43 ----
('skip-build', None, "skip the build steps"),
]
!
boolean_options = ['force', 'compile', 'skip-build']
negative_opt = {'no-compile' : 'compile'}
***************
*** 83,87 ****
# Make sure we have built everything we need first
self.build()
!
# Install everything: simply dump the entire contents of the build
# directory to the installation directory (that's the beauty of
--- 83,87 ----
# Make sure we have built everything we need first
self.build()
!
# Install everything: simply dump the entire contents of the build
# directory to the installation directory (that's the beauty of
***************
*** 105,109 ****
if self.distribution.has_ext_modules():
self.run_command('build_ext')
!
def install (self):
if os.path.isdir(self.build_dir):
--- 105,109 ----
if self.distribution.has_ext_modules():
self.run_command('build_ext')
!
def install (self):
if os.path.isdir(self.build_dir):
***************
*** 165,170 ****
return bytecode_files
-
# -- External interface --------------------------------------------
# (called by outsiders)
--- 165,170 ----
return bytecode_files
+
# -- External interface --------------------------------------------
# (called by outsiders)
***************
*** 200,204 ****
"""
inputs = []
!
if self.distribution.has_pure_modules():
build_py = self.get_finalized_command('build_py')
--- 200,204 ----
"""
inputs = []
!
if self.distribution.has_pure_modules():
build_py = self.get_finalized_command('build_py')
Index: install.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/install.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** install.py 2001/09/04 20:06:43 1.59
--- install.py 2001/12/06 20:57:12 1.60
***************
*** 111,115 ****
"also compile with optimization: -O1 for \"python -O\", "
"-O2 for \"python -OO\", and -O0 to disable [default: -O0]"),
!
# Miscellaneous control options
('force', 'f',
--- 111,115 ----
"also compile with optimization: -O1 for \"python -O\", "
"-O2 for \"python -OO\", and -O0 to disable [default: -O0]"),
!
# Miscellaneous control options
('force', 'f',
***************
*** 306,311 ****
else:
self.install_lib = self.install_purelib
-
# Convert directories from Unix /-separated syntax to the local
# convention.
--- 306,311 ----
else:
self.install_lib = self.install_purelib
+
# Convert directories from Unix /-separated syntax to the local
# convention.
***************
*** 354,358 ****
def finalize_unix (self):
!
if self.install_base is not None or self.install_platbase is not None:
if ((self.install_lib is None and
--- 354,358 ----
def finalize_unix (self):
!
if self.install_base is not None or self.install_platbase is not None:
if ((self.install_lib is None and
***************
*** 427,431 ****
self._expand_attrs(['install_base',
'install_platbase',
! 'root'])
def expand_dirs (self):
--- 427,431 ----
self._expand_attrs(['install_base',
'install_platbase',
! 'root'])
def expand_dirs (self):
***************
*** 551,555 ****
outputs.append(os.path.join(self.install_libbase,
self.path_file + ".pth"))
!
return outputs
--- 551,555 ----
outputs.append(os.path.join(self.install_libbase,
self.path_file + ".pth"))
!
return outputs
- Previous message: [Python-checkins] CVS: python/dist/src/Lib/distutils archive_util.py,1.10,1.11 bcppcompiler.py,1.10,1.11 ccompiler.py,1.40,1.41 cmd.py,1.28,1.29 core.py,1.46,1.47 cygwinccompiler.py,1.13,1.14 dep_util.py,1.2,1.3 dir_util.py,1.7,1.8 dist.py,1.52,1.53 extension.py,1.8,1.9 fancy_getopt.py,1.19,1.20 file_util.py,1.10,1.11 filelist.py,1.8,1.9 msvccompiler.py,1.42,1.43 mwerkscompiler.py,1.5,1.6 spawn.py,1.10,1.11 sysconfig.py,1.43,1.44 text_file.py,1.13,1.14 unixccompiler.py,1.36,1.37 util.py,1.64,1.65 version.py,1.5,1.6
- Next message: [Python-checkins] CVS: python/dist/src/Lib/distutils/command build_clib.py,1.23,1.24 build_py.py,1.33,1.34
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]