summaryrefslogtreecommitdiff
path: root/engine/SCons/Tool/javac.py
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2012-08-20 23:14:14 +0200
committerLuca Falavigna <dktrkranz@debian.org>2012-08-20 23:14:14 +0200
commit8e4021080603581eb79c62453b8c4686f5dcf252 (patch)
treeb9d9941e87efc666f0cdb1b09bc759323df17e5f /engine/SCons/Tool/javac.py
parente3e69e56dd121d112255763c3173494abe4a7390 (diff)
parentde88ed62712f996f44628e2e83af1026181175d8 (diff)
Merge tag 'upstream/2.2.0'
Upstream version 2.2.0
Diffstat (limited to 'engine/SCons/Tool/javac.py')
-rw-r--r--engine/SCons/Tool/javac.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/engine/SCons/Tool/javac.py b/engine/SCons/Tool/javac.py
index 5a43b25..b682cbf 100644
--- a/engine/SCons/Tool/javac.py
+++ b/engine/SCons/Tool/javac.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# 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__ = "src/engine/SCons/Tool/javac.py 5357 2011/09/09 21:31:03 bdeegan"
+__revision__ = "src/engine/SCons/Tool/javac.py issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo"
import os
import os.path
@@ -150,13 +150,15 @@ class pathopt(object):
if path and not SCons.Util.is_List(path):
path = [path]
if self.default:
- path = path + [ env[self.default] ]
+ default = env[self.default]
+ if default:
+ if not SCons.Util.is_List(default):
+ default = [default]
+ path = path + default
if path:
- return [self.opt, os.pathsep.join(path)]
- #return self.opt + " " + os.pathsep.join(path)
+ return [self.opt, os.pathsep.join(map(str, path))]
else:
return []
- #return ""
def Java(env, target, source, *args, **kw):
"""