summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/jar.py
diff options
context:
space:
mode:
authorDirk Baechle <dl9obn@darc.de>2011-07-07 21:48:00 (GMT)
committerDirk Baechle <dl9obn@darc.de>2011-07-07 21:48:00 (GMT)
commitb9b8b550ab11634969805c2d19ed5e3b8b6098d1 (patch)
treee3665aa04edaca230b5afd77ac268839464895ec /src/engine/SCons/Tool/jar.py
parent239b16579f6faf45298f90264395593aad8e0fde (diff)
downloadSCons-b9b8b550ab11634969805c2d19ed5e3b8b6098d1.zip
SCons-b9b8b550ab11634969805c2d19ed5e3b8b6098d1.tar.gz
SCons-b9b8b550ab11634969805c2d19ed5e3b8b6098d1.tar.bz2
Changes for issue #2730:
- temporarily disabling the detect routine for the Tools 'jar' and 'rmic' - added a simple testcase for each - changes to Announce.txt (typos) and CHANGES.txt
Diffstat (limited to 'src/engine/SCons/Tool/jar.py')
-rw-r--r--src/engine/SCons/Tool/jar.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/jar.py b/src/engine/SCons/Tool/jar.py
index 05cac49..9bae729 100644
--- a/src/engine/SCons/Tool/jar.py
+++ b/src/engine/SCons/Tool/jar.py
@@ -101,7 +101,13 @@ def generate(env):
env['JARSUFFIX'] = '.jar'
def exists(env):
- return env.Detect('jar')
+ # As reported by Jan Nijtmans in issue #2730, the simple
+ # return env.Detect('jar')
+ # doesn't always work during initialization. For now, we
+ # stop trying to detect an executable (analogous to the
+ # javac Builder).
+ # TODO: Come up with a proper detect() routine...and enable it.
+ return 1
# Local Variables:
# tab-width:4