diff options
author | Anatoly Techtonik <techtonik@gmail.com> | 2011-04-07 11:09:18 (GMT) |
---|---|---|
committer | Anatoly Techtonik <techtonik@gmail.com> | 2011-04-07 11:09:18 (GMT) |
commit | 2d738d1672cdbb497ace9f50dcaed8b9632508e4 (patch) | |
tree | bb765f474cb9443485a78c6886aef0d2c2d29483 | |
parent | 3bac1423f80210d6c5303b4d61cf8a9bcb8f36f9 (diff) | |
download | SCons-2d738d1672cdbb497ace9f50dcaed8b9632508e4.zip SCons-2d738d1672cdbb497ace9f50dcaed8b9632508e4.tar.gz SCons-2d738d1672cdbb497ace9f50dcaed8b9632508e4.tar.bz2 |
Revert App Paths patch. `cmd.exe` doesn't use App Paths and
it will cause a lot ot confusion for command line users,
because `scons` is still can be invoked with `start`.
See http://scons.tigris.org/issues/show_bug.cgi?id=1883#desc12
-rw-r--r-- | src/script/scons-post-install.py | 91 | ||||
-rw-r--r-- | src/setup.cfg | 1 | ||||
-rw-r--r-- | src/setup.py | 5 |
3 files changed, 0 insertions, 97 deletions
diff --git a/src/script/scons-post-install.py b/src/script/scons-post-install.py deleted file mode 100644 index a6a6035..0000000 --- a/src/script/scons-post-install.py +++ /dev/null @@ -1,91 +0,0 @@ -#!/usr/bin/env python -# -# scons-post-install - SCons post install script for Windows -# -# A script for configuring "App Paths" registry key so that SCons could -# be run from any directory the same way Python is. -# - -# -# SCons - a Software Constructor -# -# __COPYRIGHT__ -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -import os -import sys -import imp - -try: - # Before Python 3.0, the 'winreg' module was named '_winreg' - sys.modules['winreg'] = \ - imp.load_module('winreg', *imp.find_module('_winreg')) -except ImportError: - # No '_winreg' module: either 3.x or not Windows - pass - -scons_bat_path = os.path.join(sys.prefix, 'Scripts', 'scons.bat') - -app_paths_key = r'SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\SCons.bat' - -def install(): - if sys.platform == 'win32': - try: - import winreg - except ImportError: - pass - else: - print 'Writing "App Paths" registry entry for %s' % scons_bat_path - winreg.SetValue( - winreg.HKEY_LOCAL_MACHINE, - app_paths_key, - winreg.REG_SZ, - scons_bat_path) - print 'Done.' - - -def remove(): - if sys.platform == 'win32': - try: - import winreg - except ImportError: - pass - else: - # print 'Remove "App Paths" registry entry' - winreg.DeleteKey(winreg.HKEY_LOCAL_MACHINE, app_paths_key) - - -if len(sys.argv) > 1: - if sys.argv[1] == '-install': - install() - elif sys.argv[1] == '-remove': - remove() - -sys.exit(0) - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/src/setup.cfg b/src/setup.cfg index a234e22..f04ca1b 100644 --- a/src/setup.cfg +++ b/src/setup.cfg @@ -3,4 +3,3 @@ group = Development/Tools [bdist_wininst] title = SCons - a software construction tool -#install-script = scons-post-install.py diff --git a/src/setup.py b/src/setup.py index 1e04cb4..4cf32c4 100644 --- a/src/setup.py +++ b/src/setup.py @@ -378,11 +378,6 @@ scripts = [ 'script/scons.bat', ] -#if is_win32: -# scripts = scripts + [ -# 'script/scons-post-install.py' -# ] - arguments = { 'name' : "scons", 'version' : Version, |