From 2d1467917b498e9ae827ff5f0571dd84b7978c86 Mon Sep 17 00:00:00 2001
From: Gary Oberbrunner <garyo@oberbrunner.com>
Date: Fri, 29 May 2009 02:07:18 +0000
Subject: Doc patch from issue 2282 (mention JAVAVERSION in users guide),
 thanks to Knut Arild Erstad.

---
 doc/user/java.in  | 20 ++++++++++++++++++++
 doc/user/java.xml | 20 ++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/doc/user/java.in b/doc/user/java.in
index 9768dab..e1675c1 100644
--- a/doc/user/java.in
+++ b/doc/user/java.in
@@ -219,6 +219,26 @@
       <scons_output_command>scons -Q -c classes</scons_output_command>
     </scons_output>
 
+    <para>
+
+    To ensure correct handling of <filename>.class</filename>
+    dependencies in all cases, you need to tell &SCons; which Java
+    version is being used.  This is needed because Java 1.5 changed
+    the <filename>.class</filename> file names for nested anonymous
+    inner classes.  Use the <varname>JAVAVERSION</varname> construction
+    variable to specify the version in use.  With Java 1.6, the
+    one-liner example can then be defined like this:
+
+    </para> 
+
+    <sconstruct>
+      Java('classes', 'src', JAVAVERSION='1.6')
+    </sconstruct>
+
+    <para>
+    See <varname>JAVAVERSION</varname> in the man page for more information.
+    </para>
+
   </section>
 
   <section>
diff --git a/doc/user/java.xml b/doc/user/java.xml
index 402d037..fddc646 100644
--- a/doc/user/java.xml
+++ b/doc/user/java.xml
@@ -155,6 +155,26 @@
       Removed classes/AdditionalClass3.class
     </screen>
 
+    <para>
+
+    To ensure correct handling of <filename>.class</filename>
+    dependencies in all cases, you need to tell &SCons; which Java
+    version is being used.  This is needed because Java 1.5 changed
+    the <filename>.class</filename> file names for nested anonymous
+    inner classes.  Use the <varname>JAVAVERSION</varname> construction
+    variable to specify the version in use.  With Java 1.6, the
+    one-liner example can then be defined like this:
+
+    </para> 
+
+    <programlisting>
+      Java('classes', 'src', JAVAVERSION='1.6')
+    </programlisting>
+
+    <para>
+    See <varname>JAVAVERSION</varname> in the man page for more information.
+    </para>
+
   </section>
 
   <section>
-- 
cgit v0.12