diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2011-09-10 10:58:07 +0200 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2011-09-10 10:58:07 +0200 |
| commit | 7d0cf46e8ad5acb1028a391255a9b84d2f6d3cdf (patch) | |
| tree | bcf7a54e7f8ad198e6d31adf0fffc0e0c74469e4 /engine/SCons/Tool/jar.py | |
| parent | de2237c3cf3dd7dcc0a914f78348fdb6d821c296 (diff) | |
| parent | 9dc7be6c34e2bda6d0d96a450bb8eee03b277ba3 (diff) | |
Merge commit 'upstream/2.1.0'
Diffstat (limited to 'engine/SCons/Tool/jar.py')
| -rw-r--r-- | engine/SCons/Tool/jar.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/engine/SCons/Tool/jar.py b/engine/SCons/Tool/jar.py index 21c5ce4..6ebd762 100644 --- a/engine/SCons/Tool/jar.py +++ b/engine/SCons/Tool/jar.py @@ -9,7 +9,7 @@ selection method. """ # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/jar.py 5134 2010/08/16 23:02:40 bdeegan" +__revision__ = "src/engine/SCons/Tool/jar.py 5357 2011/09/09 21:31:03 bdeegan" import SCons.Subst import SCons.Util @@ -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 |