Show More
@@ -252,12 +252,6 b" needs_setuptools = set(('develop', 'release', 'bdist_egg', 'bdist_rpm'," | |||||
252 | 'bdist', 'bdist_dumb', 'bdist_wininst', 'bdist_wheel', |
|
252 | 'bdist', 'bdist_dumb', 'bdist_wininst', 'bdist_wheel', | |
253 | 'egg_info', 'easy_install', 'upload', 'install_egg_info', |
|
253 | 'egg_info', 'easy_install', 'upload', 'install_egg_info', | |
254 | )) |
|
254 | )) | |
255 | if sys.platform == 'win32': |
|
|||
256 | # Depend on setuptools for install on *Windows only* |
|
|||
257 | # If we get script-installation working without setuptools, |
|
|||
258 | # then we can back off, but until then use it. |
|
|||
259 | # See Issue #369 on GitHub for more |
|
|||
260 | needs_setuptools.add('install') |
|
|||
261 |
|
255 | |||
262 | if len(needs_setuptools.intersection(sys.argv)) > 0: |
|
256 | if len(needs_setuptools.intersection(sys.argv)) > 0: | |
263 | import setuptools |
|
257 | import setuptools |
@@ -404,6 +404,16 b' class build_scripts_entrypt(build_scripts):' | |||||
404 | f.write(script_src.format(executable=sys.executable, |
|
404 | f.write(script_src.format(executable=sys.executable, | |
405 | mod=mod, func=func)) |
|
405 | mod=mod, func=func)) | |
406 |
|
406 | |||
|
407 | if sys.platform == 'win32': | |||
|
408 | # Write .cmd wrappers for Windows so 'ipython' etc. work at the | |||
|
409 | # command line | |||
|
410 | cmd_file = os.path.join(self.build_dir, name + '.cmd') | |||
|
411 | cmd = '@"{python}" "%~dp0\{script}" %*\r\n'.format( | |||
|
412 | python=sys.executable, script=name) | |||
|
413 | log.info("Writing %s wrapper script" % cmd_file) | |||
|
414 | with open(cmd_file, 'w') as f: | |||
|
415 | f.write(cmd) | |||
|
416 | ||||
407 | return outfiles, outfiles |
|
417 | return outfiles, outfiles | |
408 |
|
418 | |||
409 | class install_lib_symlink(Command): |
|
419 | class install_lib_symlink(Command): |
General Comments 0
You need to be logged in to leave comments.
Login now