Doc patch from issue 2282 (mention JAVAVERSION in users guide), thanks to Knut Arild...

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4214 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/doc/user/java.in b/doc/user/java.in
index 9768dabcb229231a2aaff676a40f1341eeec0c10..e1675c13a4a5c49b78a30537363e343ae5d56fe4 100644 (file)
--- 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 402d037fbd5e840f4958212eb28b2c251a0a0944..fddc646b98589f81dac63853a08cc11cb7249215 100644 (file)
--- 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>