diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-23 21:22:16 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-23 21:22:16 -0500 |
| commit | 619367262942fcc478d4a8c7c9449da346605ac0 (patch) | |
| tree | d729f4ffaf887247ed53798ddd2e79a672762a76 /setup.py | |
| parent | 589a2c0c319ba39ebcce7a64c36dc11aefd0ebc0 (diff) | |
| parent | 2b3cf9b12b23ac6beca6808c4c7620aa77f168e3 (diff) | |
| download | external_python_setuptools-619367262942fcc478d4a8c7c9449da346605ac0.tar.gz external_python_setuptools-619367262942fcc478d4a8c7c9449da346605ac0.tar.bz2 external_python_setuptools-619367262942fcc478d4a8c7c9449da346605ac0.zip | |
Merged in darjus/setuptools (pull request #169)
Remove JythonCommandSpec as it's not required on Jython 2.7 and setuptools no longer supports anything 2.5, but had to test for 'Jython on Windows' in two other places
Diffstat (limited to 'setup.py')
| -rwxr-xr-x | setup.py | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -59,7 +59,8 @@ force_windows_specific_files = ( os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES") not in (None, "", "0") ) -if sys.platform == 'win32' or force_windows_specific_files: +if (sys.platform == 'win32' or (os.name == 'java' and os._name == 'nt')) \ + or force_windows_specific_files: package_data.setdefault('setuptools', []).extend(['*.exe']) package_data.setdefault('setuptools.command', []).extend(['*.xml']) |