summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-01-08 07:15:22 (GMT)
committerSteven Knight <knight@baldmt.com>2004-01-08 07:15:22 (GMT)
commit7e8d06e0299badbe0efcaa7b976e46a790758b93 (patch)
tree18ae00ea43c7efbdf4d388923ea584a73edf1976 /src/engine
parentd25f243c61f4691dcf6dc212437ca0f3ec2b7de0 (diff)
downloadSCons-7e8d06e0299badbe0efcaa7b976e46a790758b93.zip
SCons-7e8d06e0299badbe0efcaa7b976e46a790758b93.tar.gz
SCons-7e8d06e0299badbe0efcaa7b976e46a790758b93.tar.bz2
Fix .class suffix handling in JavaH.
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Tool/javah.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/javah.py b/src/engine/SCons/Tool/javah.py
index 93678e4..fe8c82d 100644
--- a/src/engine/SCons/Tool/javah.py
+++ b/src/engine/SCons/Tool/javah.py
@@ -39,6 +39,7 @@ import string
import SCons.Builder
import SCons.Node.FS
+import SCons.Tool.javac
def emit_java_headers(target, source, env):
"""Create and return lists of Java stub header files that will
@@ -71,8 +72,9 @@ def emit_java_headers(target, source, env):
classname = str(src)
if c_ and classname[:len(c_)] == c_:
classname = classname[len(c_):]
- if class_suffix and classname[:-len(class_suffix)] == class_suffix:
- classname = classname[-len(class_suffix):]
+ if class_suffix and classname[-len(class_suffix):] == class_suffix:
+ classname = classname[:-len(class_suffix)]
+ classname = SCons.Tool.javac.classname(classname)
s = src.rfile()
s.attributes.java_classdir = classdir
s.attributes.java_classname = classname