Add support for JavaH.

5 files changed, 156 insertions, 19 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 6c6bcfb..1cd8565 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -48,7 +48,7 @@ RELEASE 0.14 - XXX
   - Parse the source .java files for class names (including inner class
     names) to figure out the target .class files that will be created.
 
-  - Fix Java support with Repositories and SConscriptChdir(0).
+  - Make Java support work with Repositories and SConscriptChdir(0).
 
   - Pass Nodes, not strings, to Builder emitter functions.
 
@@ -57,7 +57,7 @@ RELEASE 0.14 - XXX
 
   From Steven Knight:
 
-  - Add support for Java (javac and jar).
+  - Add Java support (javac, javah and jar).
 
   - Propagate the external SYSTEMROOT environment variable into ENV on
     Win32 systems, so external commands that use sockets will work.
diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in
index c028989..03b2c04 100644
--- a/src/engine/MANIFEST.in
+++ b/src/engine/MANIFEST.in
@@ -58,8 +58,9 @@ SCons/Tool/gnulink.py
 SCons/Tool/gs.py
 SCons/Tool/hpcc.py
 SCons/Tool/hplink.py
-SCons/Tool/javac.py
 SCons/Tool/jar.py
+SCons/Tool/javac.py
+SCons/Tool/javah.py
 SCons/Tool/icc.py
 SCons/Tool/ifl.py
 SCons/Tool/ilink.py
diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index 8f2f63c..25d7462 100644
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -223,7 +223,7 @@ def tool_list(platform, env):
         
     other_tools = FindAllTools(['BitKeeper', 'CVS',
                                 'dvipdf', 'dvips', 'gs',
-                                'jar', 'javac',
+                                'jar', 'javac', 'javah',
                                 'latex', 'lex', 'midl',
                                 'pdflatex', 'pdftex', 'Perforce',
                                 'RCS', 'SCCS',
diff --git a/src/engine/SCons/Tool/javac.py b/src/engine/SCons/Tool/javac.py
index 8606c02..be600f1 100644
--- a/src/engine/SCons/Tool/javac.py
+++ b/src/engine/SCons/Tool/javac.py
@@ -33,6 +33,7 @@ selection method.
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+import os
 import os.path
 import re
 import string
@@ -225,55 +226,66 @@ else:
         """
         return os.path.split(file)
 
-def emit_java_files(target, source, env):
+def classname(path):
+    """Turn a string (path name) into a Java class name."""
+    return string.replace(os.path.normpath(path), os.sep, '.')
+
+def emit_java_classes(target, source, env):
     """Create and return lists of source java files
     and their corresponding target class files.
     """
-    env['_JAVACLASSDIR'] = target[0]
-    env['_JAVASRCDIR'] = source[0].rdir()
     java_suffix = env.get('JAVASUFFIX', '.java')
     class_suffix = env.get('JAVACLASSSUFFIX', '.class')
-    
+
     slist = []
     js = _my_normcase(java_suffix)
     def visit(arg, dirname, names, js=js, dirnode=source[0].rdir()):
         java_files = filter(lambda n, js=js:
-                            _my_normcase(n[-len(js):]) == js,
+                                   _my_normcase(n[-len(js):]) == js,
                             names)
         mydir = dirnode.Dir(dirname)
         java_paths = map(lambda f, d=mydir: d.File(f), java_files)
         arg.extend(java_paths)
     os.path.walk(source[0].rdir().get_abspath(), visit, slist)
-       
+
     tlist = []
     for file in slist:
         pkg_dir, classes = parse_java(file.get_abspath())
         if pkg_dir:
             for c in classes:
-                tlist.append(target[0].Dir(pkg_dir).File(c+class_suffix))
+                t = target[0].Dir(pkg_dir).File(c+class_suffix)
+                t.attributes.java_classdir = target[0]
+                t.attributes.java_classname = classname(pkg_dir + os.sep + c)
+                tlist.append(t)
         elif classes:
             for c in classes:
-                tlist.append(target[0].File(c+class_suffix))
+                t = target[0].File(c+class_suffix)
+                t.attributes.java_classdir = target[0]
+                t.attributes.java_classname = classname(c)
+                tlist.append(t)
         else:
             # This is an odd end case:  no package and no classes.
             # Just do our best based on the source file name.
-            tlist.append(target[0].File(str(file)[:-len(java_suffix)] + class_suffix))
-            
+            base = str(file)[:-len(java_suffix)]
+            t = target[0].File(base + class_suffix)
+            t.attributes.java_classdir = target[0]
+            t.attributes.java_classname = classname(base)
+            tlist.append(t)
+
     return tlist, slist
 
 JavaBuilder = SCons.Builder.Builder(action = '$JAVACCOM',
-                                    emitter = emit_java_files,
-                                    target_factory = SCons.Node.FS.default_fs.Dir,
-                                    source_factory = SCons.Node.FS.default_fs.Dir)
+                    emitter = emit_java_classes,
+                    target_factory = SCons.Node.FS.default_fs.Dir,
+                    source_factory = SCons.Node.FS.default_fs.Dir)
 
 def generate(env):
     """Add Builders and construction variables for javac to an Environment."""
-
     env['BUILDERS']['Java'] = JavaBuilder
 
     env['JAVAC']            = 'javac'
     env['JAVACFLAGS']       = ''
-    env['JAVACCOM']         = '$JAVAC $JAVACFLAGS -d $_JAVACLASSDIR -sourcepath $_JAVASRCDIR $SOURCES'
+    env['JAVACCOM']         = '$JAVAC $JAVACFLAGS -d ${TARGET.attributes.java_classdir} -sourcepath ${SOURCE.dir.rdir()} $SOURCES'
     env['JAVACLASSSUFFIX']  = '.class'
     env['JAVASUFFIX']       = '.java'
 
diff --git a/src/engine/SCons/Tool/javah.py b/src/engine/SCons/Tool/javah.py
new file mode 100644
index 0000000..45fa4af
--- /dev/null
+++ b/src/engine/SCons/Tool/javah.py
@@ -0,0 +1,124 @@
+"""SCons.Tool.javah
+
+Tool-specific initialization for javah.
+
+There normally shouldn't be any need to import this module directly.
+It will usually be imported through the generic SCons.Tool.Tool()
+selection method.
+
+"""
+
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# 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__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os.path
+import re
+import string
+
+import SCons.Builder
+import SCons.Node.FS
+
+def emit_java_headers(target, source, env):
+    """Create and return lists of Java stub header files that will
+    be created from a set of class files.
+    """
+    class_suffix = env.get('JAVACLASSSUFFIX', '.class')
+    classdir = env.get('JAVACLASSDIR')
+
+    if not classdir:
+        try:
+            s = source[0]
+        except IndexError:
+            classdir = '.'
+        else:
+            try:
+                classdir = s.attributes.java_classdir
+            except:
+                pass
+    classdir = SCons.Node.FS.default_fs.Dir(classdir).rdir()
+    if str(classdir) == '.':
+        c_ = None
+    else:
+        c_ = str(classdir) + os.sep
+
+    slist = []
+    for src in source:
+        try:
+            classname = src.attributes.java_classname
+        except AttributeError:
+            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):]
+        s = src.rfile()
+        s.attributes.java_classdir = classdir
+        s.attributes.java_classname = classname
+        slist.append(s)
+
+    if target[0].__class__ is SCons.Node.FS.File:
+        tlist = target
+    else:
+        if not isinstance(target[0], SCons.Node.FS.Dir):
+            target[0].__class__ = SCons.Node.FS.Dir
+            target[0]._morph()
+        File = SCons.Node.FS.default_fs.File
+        tlist = []
+        for s in source:
+            fname = string.replace(s.attributes.java_classname, '.', '_') + '.h'
+            t = target[0].File(fname)
+            t.attributes.java_lookupdir = target[0]
+            tlist.append(t)
+
+    return tlist, source
+
+def JavaHOutFlagGenerator(target, source, env, for_signature):
+    try:
+        t = target[0]
+    except AttributeError, TypeError:
+        t = target
+    try:
+        return '-d ' + str(t.attributes.java_lookupdir)
+    except AttributeError:
+        return '-o ' + str(t)
+
+JavaHBuilder = SCons.Builder.Builder(action = '$JAVAHCOM',
+                     emitter = emit_java_headers,
+                     src_suffix = '$JAVACLASSSUFFIX',
+                     target_factory = SCons.Node.FS.default_fs.Entry,
+                     source_factory = SCons.Node.FS.default_fs.File)
+
+def generate(env):
+    """Add Builders and construction variables for javah to an Environment."""
+    env['BUILDERS']['JavaH'] = JavaHBuilder
+
+    env['_JAVAHOUTFLAG']    = JavaHOutFlagGenerator
+    env['JAVAH']            = 'javah'
+    env['JAVAHFLAGS']       = ''
+    env['JAVAHCOM']         = '$JAVAH $JAVAHFLAGS $_JAVAHOUTFLAG -classpath ${SOURCE.attributes.java_classdir} ${SOURCES.attributes.java_classname}'
+    env['JAVACLASSSUFFIX']  = '.class'
+
+def exists(env):
+    return env.Detect('javah')