Fix .class suffix handling in JavaH.

2 files changed, 7 insertions, 2 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 222e0eb..73f9d4f 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -112,6 +112,9 @@ RELEASE 0.95 - XXX
   - Fix the env.Action() method so it returns the correct type of
     Action for its argument(s).
 
+  - Fix specifying .class files as input to JavaH with the .class suffix
+    when they weren't generated using the Java Builder.
+
   From Vincent Risi:
 
   - Add support for the bcc32, ilink32 and tlib Borland tools.
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