diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 09:21:32 +0000 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 09:21:32 +0000 |
| commit | 340d57481935334465037d97c0db1555b70c0eb1 (patch) | |
| tree | 8396a9a52eed6e40268c1916bcfa8957dddef71c /engine/SCons/Tool/javah.py | |
| parent | 86baccee0a1dddf43f7eefe48e2d9e9037468b9c (diff) | |
Imported Upstream version 2.0.0upstream/2.0.0
Diffstat (limited to 'engine/SCons/Tool/javah.py')
| -rw-r--r-- | engine/SCons/Tool/javah.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engine/SCons/Tool/javah.py b/engine/SCons/Tool/javah.py index 6a4314c..e92c423 100644 --- a/engine/SCons/Tool/javah.py +++ b/engine/SCons/Tool/javah.py @@ -31,10 +31,9 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/javah.py 4720 2010/03/24 03:14:11 jars" +__revision__ = "src/engine/SCons/Tool/javah.py 5023 2010/06/14 22:05:46 scons" import os.path -import string import SCons.Action import SCons.Builder @@ -93,7 +92,7 @@ def emit_java_headers(target, source, env): target[0]._morph() tlist = [] for s in source: - fname = string.replace(s.attributes.java_classname, '.', '_') + '.h' + fname = s.attributes.java_classname.replace('.', '_') + '.h' t = target[0].File(fname) t.attributes.java_lookupdir = target[0] tlist.append(t) @@ -112,7 +111,7 @@ def JavaHOutFlagGenerator(target, source, env, for_signature): def getJavaHClassPath(env,target, source, for_signature): path = "${SOURCE.attributes.java_classdir}" - if env.has_key('JAVACLASSPATH') and env['JAVACLASSPATH']: + if 'JAVACLASSPATH' in env and env['JAVACLASSPATH']: path = SCons.Util.AppendPath(path, env['JAVACLASSPATH']) return "-classpath %s" % (path) |