Sat Jul 10 23:17:58 GMT Daylight Time 2010 david-sarah@jacaranda.org * zetuptoolz: don't write .exe files for scripts New patches: [zetuptoolz: don't write .exe files for scripts david-sarah@jacaranda.org**20100710221758 Ignore-this: c2762c4602968ff86d1040ee18f8d5c9 ] { hunk ./setuptools-0.6c15dev.egg/setuptools/command/easy_install.py 576 def install_wrapper_scripts(self, dist): if not self.exclude_scripts: - for args in get_script_args(dist): + for args in get_script_args(dist, script_dir=self.script_dir): self.write_script(*args) hunk ./setuptools-0.6c15dev.egg/setuptools/command/easy_install.py 1567 return executable -def get_script_args(dist, executable=sys_executable, wininst=False): +def get_script_args(dist, executable=sys_executable, wininst=False, script_dir=None): """Yield write_script() argument tuples for a distribution's entrypoints""" spec = str(dist.as_requirement()) header = get_script_header("", executable, wininst) hunk ./setuptools-0.6c15dev.egg/setuptools/command/easy_install.py 1584 ")\n" ) % locals() if sys.platform=='win32' or wininst: - # On Windows/wininst, add a .py extension and an .exe launcher + # On Windows/wininst, add a .py extension. if group=='gui_scripts': hunk ./setuptools-0.6c15dev.egg/setuptools/command/easy_install.py 1586 - ext, launcher = '-script.pyw', 'gui.exe' + ext = '.pyw' old = ['.pyw'] new_header = re.sub('(?i)python.exe','pythonw.exe',header) else: hunk ./setuptools-0.6c15dev.egg/setuptools/command/easy_install.py 1590 - ext, launcher = '-script.py', 'cli.exe' + ext = '.py' old = ['.py','.pyc','.pyo'] new_header = re.sub('(?i)pythonw.exe','python.exe',header) hunk ./setuptools-0.6c15dev.egg/setuptools/command/easy_install.py 1599 else: hdr = header yield (name+ext, hdr+script_text, 't', [name+x for x in old]) - yield ( - name+'.exe', resource_string('setuptools', launcher), - 'b') # write in binary mode - yield (name+'.exe.manifest', _launcher_manifest % (name,), 't') + + # If there is already an .exe launcher from a previous install, + # also rewrite the -script.py[w]. + if script_dir and os.path.exists(os.path.join(script_dir, name+'.exe')): + yield (name+'-script'+ext, hdr+script_text, 't') else: # On other platforms, we assume the right thing to do is to # just write the stub with no extension. hunk ./setuptools-0.6c15dev.egg/setuptools/command/easy_install.py 1609 yield (name, header+script_text) -_launcher_manifest = """ - - - - - - - - - - - - -""" - - - - - - - - - - - - - - - - - - - - - - - def rmtree(path, ignore_errors=False, onerror=auto_chmod): """Recursively delete a directory tree. } Context: [upcase_since_on_welcome terrellrussell@gmail.com**20100708193903] [server_version_on_welcome_page.dpatch.txt freestorm77@gmail.com**20100605191721 Ignore-this: b450c76dc875f5ac8cca229a666cbd0a - The storage server version is 0 for all storage nodes in the Welcome Page ] [NEWS: add NEWS snippets about two recent patches zooko@zooko.com**20100708162058 Ignore-this: 6c9da6a0ad7351a960bdd60f81532899 ] [directory_html_top_banner.dpatch freestorm77@gmail.com**20100622205301 Ignore-this: 1d770d975e0c414c996564774f049bca The div tag with the link "Return to Welcome page" on the directory.xhtml page is not correct ] [tahoe_css_toolbar.dpatch freestorm77@gmail.com**20100622210046 Ignore-this: 5b3ebb2e0f52bbba718a932f80c246c0 CSS modification to be correctly diplayed with Internet Explorer 8 The links on the top of page directory.xhtml are not diplayed in the same line as display with Firefox. ] [runnin_test_tahoe_css.dpatch freestorm77@gmail.com**20100622214714 Ignore-this: e0db73d68740aad09a7b9ae60a08c05c Runnin test for changes in tahoe.css file ] [runnin_test_directory_xhtml.dpatch freestorm77@gmail.com**20100622201403 Ignore-this: f8962463fce50b9466405cb59fe11d43 Runnin test for diretory.xhtml top banner ] [stringutils.py: tolerate sys.stdout having no 'encoding' attribute. david-sarah@jacaranda.org**20100626040817 Ignore-this: f42cad81cef645ee38ac1df4660cc850 ] [quickstart.html: python 2.5 -> 2.6 as recommended version david-sarah@jacaranda.org**20100705175858 Ignore-this: bc3a14645ea1d5435002966ae903199f ] [SFTP: don't call .stopProducing on the producer registered with OverwriteableFileConsumer (which breaks with warner's new downloader). david-sarah@jacaranda.org**20100628231926 Ignore-this: 131b7a5787bc85a9a356b5740d9d996f ] [docs/how_to_make_a_tahoe-lafs_release.txt: trivial correction, install.html should now be quickstart.html. david-sarah@jacaranda.org**20100625223929 Ignore-this: 99a5459cac51bd867cc11ad06927ff30 ] [setup: in the Makefile, refuse to upload tarballs unless someone has passed the environment variable "BB_BRANCH" with value "trunk" zooko@zooko.com**20100619034928 Ignore-this: 276ddf9b6ad7ec79e27474862e0f7d6 ] [trivial: tiny update to in-line comment zooko@zooko.com**20100614045715 Ignore-this: 10851b0ed2abfed542c97749e5d280bc (I'm actually committing this patch as a test of the new eager-annotation-computation of trac-darcs.) ] [docs: about.html link to home page early on, and be decentralized storage instead of cloud storage this time around zooko@zooko.com**20100619065318 Ignore-this: dc6db03f696e5b6d2848699e754d8053 ] [docs: update about.html, especially to have a non-broken link to quickstart.html, and also to comment out the broken links to "for Paranoids" and "for Corporates" zooko@zooko.com**20100619065124 Ignore-this: e292c7f51c337a84ebfeb366fbd24d6c ] [TAG allmydata-tahoe-1.7.0 zooko@zooko.com**20100619052631 Ignore-this: d21e27afe6d85e2e3ba6a3292ba2be1 ] Patch bundle hash: ef3c4a6a5315001d2d22e9232d9eee1dcc835753