diff options
| -rw-r--r-- | README.rst | 9 | ||||
| -rw-r--r-- | distribute_setup.py | 12 |
2 files changed, 20 insertions, 1 deletions
diff --git a/README.rst b/README.rst index 5aad3efd1..7353ff546 100644 --- a/README.rst +++ b/README.rst @@ -299,6 +299,15 @@ Options Specify the cmake makefile generator type. Available values are ``msvc`` on Windows System and ``make`` on UNIX System. +``--no-examples`` + Don't include PySide examples in PySide distribution + +``--jobs`` + Specify the number of parallel build jobs + +``--jom`` + Use jom instead of nmake with msvc + Feedback and getting involved ============================= diff --git a/distribute_setup.py b/distribute_setup.py index cb9335605..c67b75247 100644 --- a/distribute_setup.py +++ b/distribute_setup.py @@ -49,7 +49,7 @@ except ImportError: args = [quote(arg) for arg in args] return os.spawnl(os.P_WAIT, sys.executable, *args) == 0 -DEFAULT_VERSION = "0.6.43" +DEFAULT_VERSION = "0.6.45" DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/" SETUPTOOLS_FAKED_VERSION = "0.6c11" @@ -144,6 +144,16 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, try: try: import pkg_resources + + # Setuptools 0.7b and later is a suitable (and preferable) + # substitute for any Distribute version. + try: + pkg_resources.require("setuptools>=0.7b") + return + except (pkg_resources.DistributionNotFound, + pkg_resources.VersionConflict): + pass + if not hasattr(pkg_resources, '_distribute'): if not no_fake: _fake_setuptools() |