diff --git a/Lib/distutils/command/build.py b/Lib/distutils/command/build.py index bcbb9332e4e..d46132f3082 100644 --- a/Lib/distutils/command/build.py +++ b/Lib/distutils/command/build.py @@ -14,15 +14,16 @@ class build (Command): description = "build everything needed to install" - options = [('build-base=', 'b', - "base directory for build library"), - ('build-lib=', 'l', - "directory for platform-shared files"), - ('build-platlib=', 'p', - "directory for platform-specific files"), - ('debug', 'g', - "compile extensions and libraries with debugging information"), - ] + user_options = [ + ('build-base=', 'b', + "base directory for build library"), + ('build-lib=', 'l', + "directory for platform-shared files"), + ('build-platlib=', 'p', + "directory for platform-specific files"), + ('debug', 'g', + "compile extensions and libraries with debugging information"), + ] def set_default_options (self): self.build_base = 'build' diff --git a/Lib/distutils/command/build_clib.py b/Lib/distutils/command/build_clib.py index 749b0c2ba2d..26b89b3aba0 100644 --- a/Lib/distutils/command/build_clib.py +++ b/Lib/distutils/command/build_clib.py @@ -28,9 +28,10 @@ from distutils.ccompiler import new_compiler class build_lib (Command): - options = [('debug', 'g', - "compile with debugging information"), - ] + user_options = [ + ('debug', 'g', + "compile with debugging information"), + ] def set_default_options (self): # List of libraries to build diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index ea0e294a701..963abc29778 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -42,25 +42,26 @@ class build_ext (Command): # takes care of both command-line and client options # in between set_default_options() and set_final_options()) - options = [('build-dir=', 'd', - "directory for compiled extension modules"), - ('include-dirs=', 'I', - "list of directories to search for header files"), - ('define=', 'D', - "C preprocessor macros to define"), - ('undef=', 'U', - "C preprocessor macros to undefine"), - ('libs=', 'l', - "external C libraries to link with"), - ('library-dirs=', 'L', - "directories to search for external C libraries"), - ('rpath=', 'R', - "directories to search for shared C libraries at runtime"), - ('link-objects=', 'O', - "extra explicit link objects to include in the link"), - ('debug', 'g', - "compile/link with debugging information"), - ] + user_options = [ + ('build-dir=', 'd', + "directory for compiled extension modules"), + ('include-dirs=', 'I', + "list of directories to search for header files"), + ('define=', 'D', + "C preprocessor macros to define"), + ('undef=', 'U', + "C preprocessor macros to undefine"), + ('libs=', 'l', + "external C libraries to link with"), + ('library-dirs=', 'L', + "directories to search for external C libraries"), + ('rpath=', 'R', + "directories to search for shared C libraries at runtime"), + ('link-objects=', 'O', + "extra explicit link objects to include in the link"), + ('debug', 'g', + "compile/link with debugging information"), + ] def set_default_options (self): diff --git a/Lib/distutils/command/build_lib.py b/Lib/distutils/command/build_lib.py index 749b0c2ba2d..26b89b3aba0 100644 --- a/Lib/distutils/command/build_lib.py +++ b/Lib/distutils/command/build_lib.py @@ -28,9 +28,10 @@ from distutils.ccompiler import new_compiler class build_lib (Command): - options = [('debug', 'g', - "compile with debugging information"), - ] + user_options = [ + ('debug', 'g', + "compile with debugging information"), + ] def set_default_options (self): # List of libraries to build diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py index f492ee374f8..eecf88b9d3f 100644 --- a/Lib/distutils/command/build_py.py +++ b/Lib/distutils/command/build_py.py @@ -18,8 +18,9 @@ class build_py (Command): description = "\"build\" pure Python modules (copy to build directory)" - options = [('build-dir=', 'd', "directory for platform-shared files"), - ] + user_options = [ + ('build-dir=', 'd', "directory for platform-shared files"), + ] def set_default_options (self): diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py index b57ec6f2f1f..798460b27a5 100644 --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -16,42 +16,43 @@ class install (Command): description = "install everything from build directory" - options = [('prefix=', None, "installation prefix"), - ('exec-prefix=', None, - "prefix for platform-specific files"), + user_options = [ + ('prefix=', None, "installation prefix"), + ('exec-prefix=', None, + "prefix for platform-specific files"), - # Build directories: where to install from - ('build-base=', None, - "base build directory"), - ('build-lib=', None, - "build directory for pure Python modules"), - ('build-platlib=', None, - "build directory for extension modules"), + # Build directories: where to install from + ('build-base=', None, + "base build directory"), + ('build-lib=', None, + "build directory for pure Python modules"), + ('build-platlib=', None, + "build directory for extension modules"), - # Installation directories: where to put modules and packages - ('install-lib=', None, - "base Python library directory"), - ('install-platlib=', None, - "platform-specific Python library directory"), - ('install-site-lib=', None, - "directory for site-specific packages and modules"), - ('install-site-platlib=', None, - "platform-specific site directory"), - ('install-scheme=', None, - "install to 'system' or 'site' library directory?"), - ('install-path=', None, - "extra intervening directories to put below install-lib"), + # Installation directories: where to put modules and packages + ('install-lib=', None, + "base Python library directory"), + ('install-platlib=', None, + "platform-specific Python library directory"), + ('install-site-lib=', None, + "directory for site-specific packages and modules"), + ('install-site-platlib=', None, + "platform-specific site directory"), + ('install-scheme=', None, + "install to 'system' or 'site' library directory?"), + ('install-path=', None, + "extra intervening directories to put below install-lib"), - # Where to install documentation (eventually!) - ('doc-format=', None, "format of documentation to generate"), - ('install-man=', None, "directory for Unix man pages"), - ('install-html=', None, "directory for HTML documentation"), - ('install-info=', None, "directory for GNU info files"), - - # Flags for 'build_py' - ('compile-py', None, "compile .py to .pyc"), - ('optimize-py', None, "compile .py to .pyo (optimized)"), - ] + # Where to install documentation (eventually!) + ('doc-format=', None, "format of documentation to generate"), + ('install-man=', None, "directory for Unix man pages"), + ('install-html=', None, "directory for HTML documentation"), + ('install-info=', None, "directory for GNU info files"), + + # Flags for 'build_py' + ('compile-py', None, "compile .py to .pyc"), + ('optimize-py', None, "compile .py to .pyo (optimized)"), + ] def set_default_options (self): diff --git a/Lib/distutils/command/install_ext.py b/Lib/distutils/command/install_ext.py index ba343d2e42f..016a514e1ec 100644 --- a/Lib/distutils/command/install_ext.py +++ b/Lib/distutils/command/install_ext.py @@ -13,9 +13,10 @@ class install_ext (Command): description = "install C/C++ extension modules" - options = [('install-dir=', 'd', "directory to install to"), - ('build-dir=','b', "build directory (where to install from)"), - ] + user_options = [ + ('install-dir=', 'd', "directory to install to"), + ('build-dir=','b', "build directory (where to install from)"), + ] def set_default_options (self): # let the 'install' command dictate our installation directory diff --git a/Lib/distutils/command/install_lib.py b/Lib/distutils/command/install_lib.py index e898ce0c187..6dfebfbe0de 100644 --- a/Lib/distutils/command/install_lib.py +++ b/Lib/distutils/command/install_lib.py @@ -10,11 +10,12 @@ class install_py (Command): description = "install pure Python modules" - options = [('install-dir=', 'd', "directory to install to"), - ('build-dir=','b', "build directory (where to install from)"), - ('compile', 'c', "compile .py to .pyc"), - ('optimize', 'o', "compile .py to .pyo (optimized)"), - ] + user_options = [ + ('install-dir=', 'd', "directory to install to"), + ('build-dir=','b', "build directory (where to install from)"), + ('compile', 'c', "compile .py to .pyc"), + ('optimize', 'o', "compile .py to .pyo (optimized)"), + ] def set_default_options (self): diff --git a/Lib/distutils/command/install_py.py b/Lib/distutils/command/install_py.py index e898ce0c187..6dfebfbe0de 100644 --- a/Lib/distutils/command/install_py.py +++ b/Lib/distutils/command/install_py.py @@ -10,11 +10,12 @@ class install_py (Command): description = "install pure Python modules" - options = [('install-dir=', 'd', "directory to install to"), - ('build-dir=','b', "build directory (where to install from)"), - ('compile', 'c', "compile .py to .pyc"), - ('optimize', 'o', "compile .py to .pyo (optimized)"), - ] + user_options = [ + ('install-dir=', 'd', "directory to install to"), + ('build-dir=','b', "build directory (where to install from)"), + ('compile', 'c', "compile .py to .pyc"), + ('optimize', 'o', "compile .py to .pyo (optimized)"), + ] def set_default_options (self): diff --git a/Lib/distutils/command/sdist.py b/Lib/distutils/command/sdist.py index d8908328628..aaedb304217 100644 --- a/Lib/distutils/command/sdist.py +++ b/Lib/distutils/command/sdist.py @@ -21,26 +21,27 @@ class sdist (Command): description = "create a source distribution (tarball, zip file, etc.)" - options = [('template=', 't', - "name of manifest template file [default: MANIFEST.in]"), - ('manifest=', 'm', - "name of manifest file [default: MANIFEST]"), - ('use-defaults', None, - "include the default file set in the manifest " - "[default; disable with --no-defaults]"), - ('manifest-only', None, - "just regenerate the manifest and then stop"), - ('force-manifest', None, - "forcibly regenerate the manifest and carry on as usual"), - - ('formats=', None, - "formats for source distribution (tar, ztar, gztar, or zip)"), - ('list-only', 'l', - "just list files that would be distributed"), - ('keep-tree', 'k', - "keep the distribution tree around after creating " + - "archive file(s)"), - ] + user_options = [ + ('template=', 't', + "name of manifest template file [default: MANIFEST.in]"), + ('manifest=', 'm', + "name of manifest file [default: MANIFEST]"), + ('use-defaults', None, + "include the default file set in the manifest " + "[default; disable with --no-defaults]"), + ('manifest-only', None, + "just regenerate the manifest and then stop"), + ('force-manifest', None, + "forcibly regenerate the manifest and carry on as usual"), + + ('formats=', None, + "formats for source distribution (tar, ztar, gztar, or zip)"), + ('list-only', 'l', + "just list files that would be distributed"), + ('keep-tree', 'k', + "keep the distribution tree around after creating " + + "archive file(s)"), + ] negative_opts = {'use-defaults': 'no-defaults'} default_format = { 'posix': 'gztar',